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

Timestamp:

Jan 17, 2007, 9:11:34 PM (18 years ago)

Author:

bknecht

Message:

some modification for the track

Location:

branches/playability/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• space_ships/space_ship.cc (modified) (2 diffs)
• world_entity.cc (modified) (1 diff)

branches/playability/src/world_entities/WorldEntities.am

@@ -82 +82 @@
                 world_entities/environments/building.cc \
                 world_entities/environments/mapped_water.cc \
+                world_entities/environments/rotor.cc \
                 \
                 world_entities/elements/image_entity.cc \
@@ -203 +204 @@
                 environments/building.h \
                 environments/mapped_water.h \
+                environments/rotor.h \
                 \
                 elements/image_entity.h \

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

@@ -823 +823 @@
         this->travelNode->setAbsCoor(this->getAbsCoor());
         this->travelNode->updateNode(0.01f);
-
+        
         this->setParent(this->travelNode);
+        
+        // If track exists put travelNode on trackNode of track
+        if (this->entityTrack)
+           this->travelNode->setParent(this->entityTrack->getTrackNode());
+           
+        
+        
         this->setRelCoor(0,0,0);
 
         State::getCameraNode()->setParentSoft(this->travelNode);
-        //State::getCameraNode()->setParentSoft(this);
+        //State::getCameraNode()->setParentSoft(this->entityTrack->getTrackNode());
         //State::getCameraNode()->setRelCoorSoft(-0.01, 40, 0);
         State::getCameraTargetNode()->setParentSoft(this->travelNode);
-        //State::getCameraTargetNode()->setParentSoft(this);
+        //State::getCameraTargetNode()->setParentSoft(this->entityTrack->getTrackNode());
         //State::getCameraTargetNode()->setRelCoorSoft(0,0,0);
         this->setCameraMode(Camera::ViewTop);
@@ -1004 +1011 @@
 
     //this moves camera and ship along the travel path.
-    this->travelNode->shiftCoor(Vector(this->cameraSpeed * dt, 0, 0));
+    if (!this->entityTrack)
+       this->travelNode->shiftCoor(Vector(this->cameraSpeed * dt, 0, 0));
 
     break;

branches/playability/src/world_entities/world_entity.cc

@@ -682 +682 @@
       this->models[0]->draw();
     }
+    
+    if (this->entityTrack)
+       this->entityTrack->drawGraph(0.02);
 
     //     if( this->aabbNode != NULL)