Changeset 3527 in orxonox.OLD for orxonox

Timestamp:

Mar 13, 2005, 8:49:01 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: trackManager: now the TrackManager knows his path also backwards.

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (3 diffs)
• track_manager.cc (modified) (2 diffs)
• track_manager.h (modified) (1 diff)

orxonox/trunk/src/story_entities/world.cc

@@ -221 +221 @@
             // Create SkySphere
             skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
-            this->localPlayer->addChild(this->skySphere);
+            this->localCamera->addChild(this->skySphere);
+            this->skySphere->setMode(MOVEMENT);
 
             /*monitor progress*/
@@ -230 +231 @@
             env->setName ("env");
             this->spawn(env);
-            this->trackManager->setBindSlave(env);
 
             Vector* es = new Vector (50, 2, 0);
@@ -249 +249 @@
         case DEBUG_WORLD_1:
           {
-            /*
-            this->testCurve = new UPointCurve();
-            this->testCurve->addNode(Vector( 0, 0, 0));
-            this->testCurve->addNode(Vector(10, 0, 5));
-            this->testCurve->addNode(Vector(20, -5,-5));
-            this->testCurve->addNode(Vector(30, 5, 10));
-            this->testCurve->addNode(Vector(40, 0,-10));
-            this->testCurve->addNode(Vector(50, 0,-10));
-            */
-
             this->nullParent = NullParent::getInstance ();
             this->nullParent->setName ("NullParent");

orxonox/trunk/src/track_manager.cc

@@ -46 +46 @@
   this->curve = NULL;
   this->children = NULL;
+
+  this->history = NULL;
+
   this->condFunc = &TrackElement::random;
 }
@@ -645 +648 @@
       && this->currentTrackElem->children)
     {
-      if (this->currentTrackElem->jumpTime > 0)
+      if (this->currentTrackElem->jumpTime != 0.0)
         this->jumpTo(this->localTime + this->currentTrackElem->jumpTime);
+      // jump to the next TrackElement and also set the history of the new Element to the old one.
+      TrackElement* tmpHistoryElem = this->currentTrackElem;
       this->currentTrackElem = this->currentTrackElem->children[this->choosePath(this->currentTrackElem)];
+      this->currentTrackElem->history = tmpHistoryElem;
     }
   if (this->bindSlave)

orxonox/trunk/src/track_manager.h

@@ -48 +48 @@
   int childCount;            //!< The number of Children This TrackElement has.
   TrackElement** children;   //!< A TrackElement can have a Tree of following TrackElements.
+
+  // runtime
+  TrackElement* history;     //!< a pointer to the last TrackElement we were on. This is if you want to walk the path backwards again.
 
   // CONDITION FUNCTIONS and STUFF