Changeset 3586 in orxonox.OLD for orxonox/trunk/src/story_entities/world.cc

Timestamp:

Mar 17, 2005, 2:15:33 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: fixed movement bug (was in the lists), modified the player

File:

• orxonox/trunk/src/story_entities/world.cc (modified) (6 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -181 +181 @@
 
             //create helper for player
-            HelperParent* hp = new HelperParent ();
+            //HelperParent* hp = new HelperParent ();
             /* the player has to be added to this helper */
 
             // create a player
-            WorldEntity* myPlayer = new Player ();
-            myPlayer->setName ("player");
-            this->spawn (myPlayer);
-            this->localPlayer = myPlayer;
+            this->localPlayer = new Player ();
+            this->localPlayer->setName ("player");
+            this->spawn (this->localPlayer);
             /*monitor progress*/
             this->glmis->step();            
@@ -194 +193 @@
             // bind input
             Orxonox *orx = Orxonox::getInstance ();
-            orx->getLocalInput()->bind (myPlayer);
+            orx->getLocalInput()->bind (this->localPlayer);
             
             // bind camera
             this->localCamera = new Camera(this);
             this->localCamera->setName ("camera");
-            this->localCamera->bind (myPlayer);
+            this->localCamera->bind (this->localPlayer);
             /*monitor progress*/
             this->glmis->step();            
@@ -217 +216 @@
             this->spawn(env);
 
-            /*
-            Vector* es = new Vector (50, 2, 0);
-            Quaternion* qs = new Quaternion ();
-            WorldEntity* pr = new Primitive(PSPHERE);
-            pr->setName("primitive");
-            this->spawn(pr, this->localPlayer, es, qs, ROTATION);
-            */
-
+           
+            //Vector* es = new Vector (10, 5, 0);
+            //Quaternion* qs = new Quaternion ();
+            //WorldEntity* pr = new Primitive(PSPHERE);
+            //pr->setName("primitive");
+            //this->spawn(pr, this->localPlayer, es, qs, PNODE_ROTATE_AND_MOVE);
+           
 
             /*monitor progress*/
@@ -231 +229 @@
             //      trackManager->setBindSlave(env);
             PNode* tn = trackManager->getTrackNode();
-            tn->addChild(myPlayer);
+            tn->addChild(this->localPlayer);
 
             //localCamera->setParent(TrackNode::getInstance());
             tn->addChild (this->localCamera);
-            myPlayer->setMode(PNODE_ROTATE_AND_MOVE);
+            this->localPlayer->setMode(PNODE_ROTATE_AND_MOVE);
             //Vector* cameraOffset = new Vector (0, 5, -10);
             Vector* cameraOffset = new Vector (-10, 5, 0);
             this->localCamera->setRelCoor (cameraOffset);
-            trackManager->condition(2, NEAREST, myPlayer);
+            trackManager->condition(2, NEAREST, this->localPlayer);
 
             break;
@@ -267 +265 @@
             skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
             this->localPlayer->addChild(this->skySphere);
+
+            Vector* es = new Vector (20, 0, 0);
+            Quaternion* qs = new Quaternion ();
+            WorldEntity* pr = new Primitive(PSPHERE);
+            pr->setName("primitive");
+            this->spawn(pr, this->localPlayer, es, qs, PNODE_ROTATE_AND_MOVE);
 
             break;
@@ -721 +725 @@
       entity->setRelCoor (relCoor);
       entity->setRelDir (relDir);
+      entity->setMode(parentingMode);
       
       this->entities->add (entity);