Changeset 5851 in orxonox.OLD

Timestamp:

Dec 1, 2005, 5:09:42 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: cut player out of the Player class

File:

• branches/spaceshipcontrol/src/story_entities/world.cc (modified) (4 diffs)

branches/spaceshipcontrol/src/story_entities/world.cc

@@ -320 +320 @@
           {
             localPlayer = (Player*) created;
-            CDEngine::getInstance()->setPlayer(localPlayer);
           }
           if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox")) sky = (SkyBox*) created;
@@ -380 +379 @@
 
   //        TrackManager::getInstance()->setBindSlave(env);
-  PNode* tn = TrackManager::getInstance()->getTrackNode();
-  tn->addChild(this->localPlayer);
+//  PNode* tn = TrackManager::getInstance()->getTrackNode();
+//  tn->addChild(this->localPlayer);
 
   //localCamera->setParent(TrackNode::getInstance());
-  tn->addChild(this->localCamera);
-  localCamera->lookAt(tn);
+//  tn->addChild(this->localCamera);
+//  localCamera->lookAt(tn);
   localCamera->setClipRegion(1, 10000.0);
-  this->localPlayer->setParentMode(PNODE_ALL);
+//  this->localPlayer->setParentMode(PNODE_ALL);
   TrackManager::getInstance()->condition(1, LEFTRIGHT, this->localPlayer);
 
@@ -573 +572 @@
 
 
-        this->localPlayer = new Player ();
-        this->localPlayer->setName ("player");
-        this->spawn (this->localPlayer);
-        this->localPlayer->setRelCoor(Vector(5,0,0));
+//        this->localPlayer = new Player ();
+//        this->localPlayer->setName ("player");
+//        this->spawn (this->localPlayer);
+//        this->localPlayer->setRelCoor(Vector(5,0,0));
         /*monitor progress*/
         this->glmis->step();
@@ -614 +613 @@
         this->glmis->step();
 
-        this->pilotNode = new PilotNode();
-        this->spawn(this->pilotNode);
-        this->pilotNode->setAbsCoor(Vector(150, -35, 5));
-        this->pilotNode->addChild(this->localPlayer);
-        this->pilotNode->addChild(this->localCamera);
-        this->localCamera->lookAt(this->localPlayer);
+//        this->pilotNode = new PilotNode();
+//        this->spawn(this->pilotNode);
+//        this->pilotNode->setAbsCoor(Vector(150, -35, 5));
+//        this->pilotNode->addChild(this->localPlayer);
+//        this->pilotNode->addChild(this->localCamera);
+//        this->localCamera->lookAt(this->localPlayer);
 
         EventHandler::getInstance()->subscribe(this->pilotNode, ES_GAME, KeyMapper::PEV_UP);