Changeset 10096 in orxonox.OLD for branches/playability/src/world_entities/space_ships

Timestamp:

Dec 19, 2006, 2:52:29 PM (18 years ago)

Author:

bknecht

Message:

connected the track with the worldentities and the spaceship

File:

• branches/playability/src/world_entities/space_ships/space_ship.cc (modified) (3 diffs)

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

@@ -55 +55 @@
 #include "util/loading/load_param.h"
 #include "time.h"
+
+#include "track/track.h"
 
 
@@ -477 +479 @@
   else
     this->secWeaponMan.releaseFire();
+    
+  // Tracktick
+  if(this->entityTrack)
+    this->entityTrack->tick(time);
 
 
@@ -760 +766 @@
         this->travelNode->updateNode(0.01f);
 
-        this->setParent(this->travelNode);
+        //this->setParent(this->travelNode);
         this->setRelCoor(0,0,0);
 
-        State::getCameraNode()->setParentSoft(this->travelNode);
+        //State::getCameraNode()->setParentSoft(this->travelNode);
+        State::getCameraNode()->setParentSoft(this);
         State::getCameraNode()->setRelCoorSoft(-0.01, 40, 0);
-        State::getCameraTargetNode()->setParentSoft(this->travelNode);
+        //State::getCameraTargetNode()->setParentSoft(this->travelNode);
+        State::getCameraTargetNode()->setParentSoft(this);
         State::getCameraTargetNode()->setRelCoorSoft(0,0,0);