Changeset 3565 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

Mar 15, 2005, 7:27:44 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: patched the pNode, now there exists the ability for advanced linkage-modes

Location:

orxonox/trunk/src/story_entities

Files:

• world.cc (modified) (5 diffs)
• world.h (modified) (1 diff)

orxonox/trunk/src/story_entities/world.cc

@@ -226 +226 @@
             this->skySphere->setName("SkySphere");
             this->localCamera->addChild(this->skySphere);
-            this->skySphere->setMode(MOVEMENT);
+            this->skySphere->setMode(PNODE_MOVEMENT);
 
             /*monitor progress*/
@@ -254 +254 @@
             //localCamera->setParent(TrackNode::getInstance());
             tn->addChild (this->localCamera);
+            myPlayer->setMode(PNODE_ROTATE_AND_MOVE);
             //Vector* cameraOffset = new Vector (0, 5, -10);
             Vector* cameraOffset = new Vector (-10, 5, 0);
@@ -305 +306 @@
   glEndList();
 
-  terrain = new Terrain(TERRAIN_BENSCH);
+  terrain = new Terrain(TERRAIN_DAVE);
   this->spawn(terrain);
   // LIGHT initialisation
@@ -584 +585 @@
       this->display ();
 
-      for( int i = 0; i < 5000000; i++) {}
+      //      for( int i = 0; i < 5000000; i++) {}
       /* \todo this is to slow down the program for openGl Software emulator computers, reimplement*/
     }
@@ -736 +737 @@
 void World::spawn(WorldEntity* entity, PNode* parentNode, 
                   Vector* relCoor, Quaternion* relDir, 
-                  parentingMode mode)
+                  int parentingMode)
 {
   this->nullParent = NullParent::getInstance();

orxonox/trunk/src/story_entities/world.h

@@ -54 +54 @@
   void spawn (WorldEntity* entity, Vector* absCoor, Quaternion* absDir);
   void spawn(WorldEntity* entity, PNode* parentNode, Vector* relCoor, Quaternion* relDir, 
-             parentingMode mode);
+             int parentingMode);