Changeset 3371 in orxonox.OLD

Timestamp:

Jan 7, 2005, 3:07:12 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: now env moves along the Path. but the Path does not decide for different tracks

Location:

orxonox/branches/trackManager/src

Files:

• p_node.cc (modified) (1 diff)
• track_manager.cc (modified) (4 diffs)
• track_manager.h (modified) (3 diffs)
• world.cc (modified) (12 diffs)

orxonox/branches/trackManager/src/p_node.cc

@@ -226 +226 @@
 */
 void PNode::setAbsDir (Quaternion* absDir)
-{}
+{
+  this->bAbsDirChanged = true;
+  this->absDirection = *absDir;
+}
 
 

orxonox/branches/trackManager/src/track_manager.cc

@@ -19 +19 @@
 #include "track_manager.h"
 #include <stdarg.h>
-
+#include "p_node.h"
 
 using namespace std;
@@ -111 +111 @@
   this->maxTime = 0;
   this->trackElemCount = 1;
+  this->bindSlave = NULL;
 }
 
@@ -440 +441 @@
 void TrackManager::tick(float dt)
 {
+  dt /= 1000;
+  printf("LocalTime is: %f, timestep is: %f\n", this->localTime, dt);
   if (this->localTime <= this->firstTrackElem->duration)
     this->jumpTo(this->localTime);
+  printf("LocalTime is: %f, timestep is: %f\n", this->localTime, dt);
   this->localTime += dt;
   if (this->localTime > this->currentTrackElem->startingTime + this->currentTrackElem->duration && this->currentTrackElem->childCount > 0)
     this->currentTrackElem = this->currentTrackElem->children[0];
+  if (this->bindSlave)
+    {
+      Vector tmp = this->calcPos();
+      Quaternion quat = Quaternion(this->calcDir(), Vector(0,1,0)); 
+      this->bindSlave->setAbsCoor(&tmp);
+      this->bindSlave->setAbsDir(&quat);
+    }
 }
 
@@ -471 +482 @@
 }
 
+/**
+   \brief Sets the PNode, that should be moved along the Tack
+   \param bindSlave the PNode to set
+*/
+void TrackManager::setBindSlave(PNode* bindSlave)
+{
+  if (!this->bindSlave)
+    this->bindSlave = bindSlave;
+}
 
 

orxonox/branches/trackManager/src/track_manager.h

@@ -14 +14 @@
 #include "stdincl.h"
 
+class PNode;
 
 //! condition for choosing a certain Path. \todo implement a useful way.
@@ -104 +105 @@
   float maxTime;                      //!< The maximal time the track has.
   int trackElemCount;                 //!< The count of TrackElements that exist.
+  PNode* bindSlave;
   
   void initChildren(unsigned int childCount);
@@ -134 +136 @@
   void choosePath(int graphID);
 
+  void setBindSlave(PNode* bindSlave);
+
   // DEBUG //
   void drawGraph(float dt) const;

orxonox/branches/trackManager/src/world.cc

@@ -175 +175 @@
       trackManager->addPoint(Vector(30,0,5));
       trackManager->addPoint(Vector(40,0,5));
-      trackManager->setDuration(.5);
+      trackManager->setDuration(2);
       trackManager->setSavePoint();
       trackManager->addPoint(Vector(50,10,10));
@@ -182 +182 @@
       trackManager->addPoint(Vector(80,0,-10));
       trackManager->addPoint(Vector(90,0,-10));
-      trackManager->setDuration(.5);
+      trackManager->setDuration(5);
       trackManager->setSavePoint();
       trackManager->addPoint(Vector(110,0,5));
@@ -189 +189 @@
       trackManager->addPoint(Vector(140,0,-10));
       trackManager->addPoint(Vector(150,0,-10));
-      trackManager->setDuration(.5);
+      trackManager->setDuration(3);
       int fork11, fork12, fork13, fork14;
       trackManager->fork(4, &fork11, &fork12, &fork13, &fork14);
@@ -195 +195 @@
       trackManager->addPoint(Vector(170, 0, -15));
       trackManager->addPoint(Vector(180, 0, -15));
+      trackManager->setDuration(3);
       trackManager->workOn(fork12);
       trackManager->addPoint(Vector(170, 0, 10));
@@ -200 +201 @@
       trackManager->addPoint(Vector(190,2,5));
       trackManager->addPoint(Vector(200,2,5));
+      trackManager->setDuration(7);
       int fork21, fork22;
       trackManager->fork(2, &fork21, &fork22);
@@ -208 +210 @@
       trackManager->addPoint(Vector(250, 0, 0));
       trackManager->addPoint(Vector(260, 0, 5));
+      trackManager->setDuration(3);
       trackManager->join(2, fork12, fork11);
       trackManager->workOn(fork22);
@@ -214 +217 @@
       trackManager->addPoint(Vector(240, 0, 10));
       trackManager->addPoint(Vector(250, 0, 5));
+      trackManager->setDuration(6);
       trackManager->workOn(fork13);
       trackManager->addPoint(Vector(200,-10,5));
       trackManager->addPoint(Vector(250,-10,5));
-      printf("fork14: %d\n", fork14);
+      trackManager->setDuration(3);
       trackManager->workOn(fork14);
       trackManager->addPoint(Vector(200,15,0));
       trackManager->addPoint(Vector(210,0,10));
-
+      trackManager->setDuration(1);
 
 
@@ -273 +277 @@
             this->spawn (myPlayer);
             this->localPlayer = myPlayer;           
-
             // bind input
             Orxonox *orx = Orxonox::getInstance ();
@@ -290 +293 @@
             env->setName ("env");
             this->spawn(env, es, qs);
-
+            trackManager->setBindSlave(env);
 
             break;
@@ -541 +544 @@
   trackManager->drawGraph(.01);
   trackManager->debug(2);
-  delete trackManager;
   
   /*
@@ -651 +653 @@
           t = loc->part;
           
-          if( t >= tracklen )
+          if( t >= traclen )
             {
               printf("An entity is out of the game area\n");
@@ -882 +884 @@
       this->update ();
       this->localCamera->timeSlice(dt);
+      this->trackManager->tick(dt);
     }
   this->lastFrame = currentFrame;