Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10400 in orxonox.OLD for trunk/src


Ignore:
Timestamp:
Jan 26, 2007, 11:11:01 PM (18 years ago)
Author:
snellen
Message:

update

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/story_entities/game_world_data.cc

    r10399 r10400  
    161161  if( element != NULL)
    162162  {
    163     printf("found CameraMan tag  \n");
    164163    CameraMan* camMan = new CameraMan(element);
    165164    State::setCameraman(camMan);
  • trunk/src/world_entities/blackscreen.cc

    r10379 r10400  
    114114  glVertex3f(0., 100.0f,100.0f);
    115115  glVertex3f(0., 100.0f,-100.0f);
    116 
     116 
    117117  glEnd();
    118118
  • trunk/src/world_entities/cameraman.cc

    r10398 r10400  
    4646  currentCam=State::getCamera();
    4747  this->cameras.push_back(currentCam);
     48
    4849  State::setCamera(currentCam, currentCam->getTarget());
    4950  this->fadeToBlack=new BlackScreen();
     51  this->fadeToBlack->setParent(this->currentCam);
     52  this->fadeToBlack->setRelCoor(3., 0., 0.);
    5053 
    5154  if (root != NULL)
     
    136139  BaseObject* object = ObjectListBase::getBaseObject(className, objectName);
    137140  BaseObject* newCam = ObjectListBase::getBaseObject("Camera", camName);
    138   if( object != NULL && object->isA(PNode::staticClassID()))
     141  if( object != NULL && newCam != NULL && object->isA(PNode::staticClassID()))
    139142    dynamic_cast<Camera*>(newCam)->lookAt(dynamic_cast<PNode*>(object));
    140143}
Note: See TracChangeset for help on using the changeset viewer.