Changeset 3520 in orxonox.OLD for orxonox/branches/trackManager

Timestamp:

Mar 12, 2005, 5:51:31 PM (21 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: the ship now rotates with the trackNode,
for this to work I had to make a fix in pNode.cc &&→II (would not have made sense otherwise)

Location:

orxonox/branches/trackManager/src

Files:

• lib/coord/p_node.cc (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)
• world_entities/environment.cc (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)

orxonox/branches/trackManager/src/lib/coord/p_node.cc

@@ -372 +372 @@
         }
       
-      if( this->mode == ROTATION && this->mode == ALL)
+      if( this->mode == ROTATION || this->mode == ALL)
         {
           if( this->bAbsDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)

orxonox/branches/trackManager/src/story_entities/world.cc

@@ -212 +212 @@
             trackManager->setBindSlave(TrackNode::getInstance());
             trackManager->condition(1, NEAREST, myPlayer);
-            TrackNode::getInstance()->addChild(myPlayer);
+            myPlayer->setParent(TrackNode::getInstance());
             TrackNode::getInstance()->addChild(localCamera);
 

orxonox/branches/trackManager/src/world_entities/environment.cc

@@ -29 +29 @@
 Environment::Environment () : WorldEntity()
 {
-  this->model = new OBJModel("../data/models/fighter.obj");
+  this->model = new OBJModel("../data/models/reaplow.obj");
 }
 

orxonox/branches/trackManager/src/world_entities/player.cc

@@ -30 +30 @@
 {
 
-  this->model = new OBJModel("../data/models/reaplow.obj");
+  this->model = new OBJModel("../data/models/fighter.obj", .3);
   /*
   objectList = glGenLists(1);