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

Timestamp:

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

Author:

bknecht

Message:

connected the track with the worldentities and the spaceship

Location:

branches/playability/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (3 diffs)
• world_entity.cc (modified) (3 diffs)
• world_entity.h (modified) (1 diff)

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);
 

branches/playability/src/world_entities/world_entity.cc

@@ -168 +168 @@
 void WorldEntity::addTrack(const TiXmlElement* root)
 {
+     
+  this->entityTrack = new Track();
+  this->setParent(this->entityTrack->getTrackNode());
+  this->entityTrack->getTrackNode()->setParentMode(PNODE_ALL);
   LOAD_PARAM_START_CYCLE(root, element);
   {
@@ -174 +178 @@
   }
   LOAD_PARAM_END_CYCLE(element);
+  
+
 }
 
@@ -635 +641 @@
 */
 void WorldEntity::tick(float time)
-{}
+{
+}
 
 

branches/playability/src/world_entities/world_entity.h

@@ -221 +221 @@
   bool                    bOnGround;                       //!< true if this entity is standing on the ground
 
-
-  Track*                  entityTrack;                     //!< this is the track this entity follows (or NULL if none)
-
 protected:
   Vector                  velocity;                        //!< speed of the entity
+  Track*                  entityTrack;                     //!< this is the track this entity follows (or NULL if none)
 
 };