Changeset 10400 in orxonox.OLD for trunk

Timestamp:

Jan 26, 2007, 11:11:01 PM (18 years ago)

Author:

snellen

Message:

update

Location:

trunk/src

Files:

• story_entities/game_world_data.cc (modified) (1 diff)
• world_entities/blackscreen.cc (modified) (1 diff)
• world_entities/cameraman.cc (modified) (2 diffs)

trunk/src/story_entities/game_world_data.cc

@@ -161 +161 @@
   if( element != NULL)
   {
-    printf("found CameraMan tag  \n");
     CameraMan* camMan = new CameraMan(element);
     State::setCameraman(camMan);

trunk/src/world_entities/blackscreen.cc

@@ -114 +114 @@
   glVertex3f(0., 100.0f,100.0f);
   glVertex3f(0., 100.0f,-100.0f);
-
+  
   glEnd();
 

trunk/src/world_entities/cameraman.cc

@@ -46 +46 @@
   currentCam=State::getCamera();
   this->cameras.push_back(currentCam);
+
   State::setCamera(currentCam, currentCam->getTarget());
   this->fadeToBlack=new BlackScreen();
+  this->fadeToBlack->setParent(this->currentCam);
+  this->fadeToBlack->setRelCoor(3., 0., 0.);
   
   if (root != NULL)
@@ -136 +139 @@
   BaseObject* object = ObjectListBase::getBaseObject(className, objectName);
   BaseObject* newCam = ObjectListBase::getBaseObject("Camera", camName);
-  if( object != NULL && object->isA(PNode::staticClassID()))
+  if( object != NULL && newCam != NULL && object->isA(PNode::staticClassID()))
     dynamic_cast<Camera*>(newCam)->lookAt(dynamic_cast<PNode*>(object));
 }