Changeset 10335 in orxonox.OLD

Timestamp:

Jan 24, 2007, 4:43:49 PM (17 years ago)

Author:

bknecht

Message:

track now works pretty good. I'm really pleased. Check it out, it doesn't crash anymore

Location:

branches/playability/src

Files:

• lib/math/curve.cc (modified) (1 diff)
• util/track/track.cc (modified) (3 diffs)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)

branches/playability/src/lib/math/curve.cc

@@ -288 +288 @@
 Vector BezierCurve::calcDir (float t)
 {
-  return this->dirCurve->calcPos(t);
+  return this->calcPos(t + 0.01) - this->calcPos(t);
+  //return this->dirCurve->calcPos(t);
 }
 

branches/playability/src/util/track/track.cc

@@ -71 +71 @@
   this->trackNode = new PNode(PNode::getNullParent(), PNODE_ALL);
   this->nodeCount = 0;
+  this->localTime = 0;
 }
 
@@ -197 +198 @@
 //   if (this->localTime <= this->maxTime)
      this->localTime += dt;
+     if(this->localTime >= this->duration)
+       this->localTime = 0;
 //   if (this->localTime > this->currentTrackElem->endTime
 //       && this->currentTrackElem->children)
@@ -216 +219 @@
        Vector tmp = this->calcPos();
        //Quaternion quat = Quaternion(this->calcDir(), Vector(this->curve->calcAcc(this->localTime/this->duration).x,1,this->curve->calcAcc(this->localTime/this->duration).z));
-       Quaternion quat = Quaternion(this->calcDir(), 0);
+       
 
        Vector v(0.0, 1.0, 0.0);
+       Quaternion quat = Quaternion(this->calcDir(), v);
        Quaternion q(-PI/2, v);
        quat = quat * q;

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -884 +884 @@
         registerEvent(KeyMapper::PEV_VIEW5);
 
-        State::getCamera()->setParentMode(PNODE_MOVEMENT);
+        State::getCamera()->setParentMode(PNODE_ALL);
 
         //this->updateTravelDistance();