Changeset 3539 in orxonox.OLD

Timestamp:

Mar 14, 2005, 12:35:46 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: a little enhancement in trackmanager to turn the tracknode into the moving direction. since i have no real up-vector, it doensnt turn right into the moving direction. but almost

Location:

orxonox/trunk/src

Files:

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

orxonox/trunk/src/story_entities/world.cc

@@ -235 +235 @@
             this->spawn(env);
 
+            /*
             Vector* es = new Vector (50, 2, 0);
             Quaternion* qs = new Quaternion ();
@@ -240 +241 @@
             pr->setName("primitive");
             this->spawn(pr, this->localPlayer, es, qs, ROTATION);
-            
+            */
+
 
             /*monitor progress*/
@@ -246 +248 @@
 
             //      trackManager->setBindSlave(env);
-            TrackNode::getInstance()->addChild(myPlayer);
+            TrackNode* tn = TrackNode::getInstance();
+            tn->addChild(myPlayer);
+
+            //Vector v(1.0, 0.0, 0.0);
+            //Quaternion* q = new Quaternion(90.0, v);
+            //this->relDirection = this->relDirection * q;
+            
+            //tn->setAbsDir(q);
+
             //localCamera->setParent(TrackNode::getInstance());
             this->localPlayer->addChild (this->localCamera);

orxonox/trunk/src/track_manager.cc

@@ -661 +661 @@
       Vector tmp = this->calcPos();
       Quaternion quat = Quaternion(this->calcDir(), Vector(this->currentTrackElem->curve->calcAcc((localTime-this->currentTrackElem->startingTime)/this->currentTrackElem->duration).x,1,this->currentTrackElem->curve->calcAcc((localTime-this->currentTrackElem->startingTime)/this->currentTrackElem->duration).z)); 
+
+      Vector v(0.0, 1.0, 0.0);
+      Quaternion q(-90.0, v);
+      //this->relDirection = this->relDirection * q;
+      quat = quat * q;
+
       this->bindSlave->setAbsCoor(&tmp);
       this->bindSlave->setAbsDir(&quat);