Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5851 in orxonox.OLD


Ignore:
Timestamp:
Dec 1, 2005, 5:09:42 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: cut player out of the Player class

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/spaceshipcontrol/src/story_entities/world.cc

    r5819 r5851  
    320320          {
    321321            localPlayer = (Player*) created;
    322             CDEngine::getInstance()->setPlayer(localPlayer);
    323322          }
    324323          if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox")) sky = (SkyBox*) created;
     
    380379
    381380  //        TrackManager::getInstance()->setBindSlave(env);
    382   PNode* tn = TrackManager::getInstance()->getTrackNode();
    383   tn->addChild(this->localPlayer);
     381//  PNode* tn = TrackManager::getInstance()->getTrackNode();
     382//  tn->addChild(this->localPlayer);
    384383
    385384  //localCamera->setParent(TrackNode::getInstance());
    386   tn->addChild(this->localCamera);
    387   localCamera->lookAt(tn);
     385//  tn->addChild(this->localCamera);
     386//  localCamera->lookAt(tn);
    388387  localCamera->setClipRegion(1, 10000.0);
    389   this->localPlayer->setParentMode(PNODE_ALL);
     388//  this->localPlayer->setParentMode(PNODE_ALL);
    390389  TrackManager::getInstance()->condition(1, LEFTRIGHT, this->localPlayer);
    391390
     
    573572
    574573
    575         this->localPlayer = new Player ();
    576         this->localPlayer->setName ("player");
    577         this->spawn (this->localPlayer);
    578         this->localPlayer->setRelCoor(Vector(5,0,0));
     574//        this->localPlayer = new Player ();
     575//        this->localPlayer->setName ("player");
     576//        this->spawn (this->localPlayer);
     577//        this->localPlayer->setRelCoor(Vector(5,0,0));
    579578        /*monitor progress*/
    580579        this->glmis->step();
     
    614613        this->glmis->step();
    615614
    616         this->pilotNode = new PilotNode();
    617         this->spawn(this->pilotNode);
    618         this->pilotNode->setAbsCoor(Vector(150, -35, 5));
    619         this->pilotNode->addChild(this->localPlayer);
    620         this->pilotNode->addChild(this->localCamera);
    621         this->localCamera->lookAt(this->localPlayer);
     615//        this->pilotNode = new PilotNode();
     616//        this->spawn(this->pilotNode);
     617//        this->pilotNode->setAbsCoor(Vector(150, -35, 5));
     618//        this->pilotNode->addChild(this->localPlayer);
     619//        this->pilotNode->addChild(this->localCamera);
     620//        this->localCamera->lookAt(this->localPlayer);
    622621
    623622        EventHandler::getInstance()->subscribe(this->pilotNode, ES_GAME, KeyMapper::PEV_UP);
Note: See TracChangeset for help on using the changeset viewer.