Changeset 10403 in orxonox.OLD for trunk/src/world_entities/cameraman.cc

Timestamp:

Jan 27, 2007, 12:21:10 AM (17 years ago)

Author:

patrick

Message:

fading now works

File:

• trunk/src/world_entities/cameraman.cc (modified) (5 diffs)

trunk/src/world_entities/cameraman.cc

@@ -29 +29 @@
                         addMethod("changeCurrTarget", Executor2<CameraMan, lua_State*,const std::string&,const std::string&>(&CameraMan::changeCurrTarget))
                         ->addMethod("changeTarget", Executor3<CameraMan, lua_State*, const std::string&, const std::string&,const std::string&>(&CameraMan::changeTarget))
-                        ->addMethod("setCam", Executor1<CameraMan, lua_State*, const std::string&>(&CameraMan::setCam)) 
+                        ->addMethod("setCam", Executor1<CameraMan, lua_State*, const std::string&>(&CameraMan::setCam))
                         ->addMethod("togglFade", Executor0<CameraMan, lua_State*>(&CameraMan::togglFade))
                         ->addMethod("getCurrCameraCoorX", Executor0ret<CameraMan, lua_State*,float>(&CameraMan::getCurrCameraCoorX))
@@ -44 +44 @@
   this->farClip = 1000.0;
 
-  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.);
-  
+
+  this->setCam( State::getCamera());
+
   if (root != NULL)
     this->loadParams(root);
@@ -60 +56 @@
 {
   BaseObject::loadParams(root);
-  
+
   LOAD_PARAM_START_CYCLE(root, object);
   {
@@ -83 +79 @@
   if (cameraNo<cameras.size())
   {
-  currentCam=cameras[cameraNo];
+    this->setCam( cameras[cameraNo]);
+  }
+}
+
+void CameraMan::setCam(const std::string& camName)
+{
+  BaseObject* object = ObjectListBase::getBaseObject("Camera", camName);
+
+  if(object != NULL)
+  {
+    Camera* currentCam = dynamic_cast<Camera*>(object) ;
+
+    this->setCam(currentCam);
+    return;
+  }
+  printf("ERROR CAMERAMANAGER: Couldn't set camera : %s \n", camName.c_str());
+}
+
+
+void CameraMan::setCam(Camera* camera)
+{
+  if( camera == NULL)
+  {
+    PRINTF(0)("trying to add a zero camera! uiuiui!\n");
+  }
+  this->currentCam = camera;
+
   State::setCamera(currentCam, currentCam->getTarget());
   OrxSound::SoundEngine::getInstance()->setListener(currentCam);
 
+  // check if it is already added
+  if( ! this->cameraIsInVector(currentCam) )
+    this->cameras.push_back(currentCam);
+
+  this->fadeToBlack->setRelCoor(0., 0., 0.);
   this->fadeToBlack->setParent(this->currentCam);
-  this->fadeToBlack->setRelCoor(3., 0., 0.);
-  }
-
-}
-
-void CameraMan::setCam(const std::string& camName)
-{
-  BaseObject* object = ObjectListBase::getBaseObject("Camera", camName);
-  
-  if(object != NULL)
-  {
-    
-    currentCam = dynamic_cast<Camera*>(object) ;
-    
-    if( ! this->cameraIsInVector(currentCam) )
-      this->cameras.push_back(currentCam);
-    
-    State::setCamera(currentCam, currentCam->getTarget());
-    OrxSound::SoundEngine::getInstance()->setListener(currentCam);
-    this->fadeToBlack->setParent(this->currentCam);
-    this->fadeToBlack->setRelCoor(3., 0., 0.);
-    return;
-  }
-  printf("ERROR CAMERAMANAGER: Couldn't set camera : %s \n", camName.c_str());
-  
-}
+}
+
 
 void CameraMan::moveCurrCam(int x, int y, int z)
 {
-currentCam->target->trans(x,y,z);
+  currentCam->target->trans(x,y,z);
 }
 
@@ -123 +126 @@
 void CameraMan::moveCam(int x, int y, int z, int camNo)
 {
-cameras[camNo]->target->trans(x,y,z);
+  cameras[camNo]->target->trans(x,y,z);
 }