Changeset 10393 in orxonox.OLD

Timestamp:

Jan 26, 2007, 7:36:16 PM (17 years ago)

Author:

snellen

Message:

made cameraman xml-loadable second try, added method setCamera(const std::string& camera)

Location:

trunk/src/world_entities

Files:

• cameraman.cc (modified) (5 diffs)
• cameraman.h (modified) (2 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*, int, const std::string&,const std::string&>(&CameraMan::changeTarget))
-                        ->addMethod("setCamera", Executor1<CameraMan, lua_State*, int>(&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))
@@ -60 +60 @@
   LOAD_PARAM_START_CYCLE(root, object);
   {
-    this->createCam(root);
+    this->createCam(object);
   }
   LOAD_PARAM_END_CYCLE(object);
 
-  
-  
-
 }
 
@@ -72 +69 @@
 void CameraMan::createCam(const TiXmlElement* root)
 {
- // Camera* newCamera=new Camera();
+  //Camera* newCamera=new Camera(root);
   this->cameras.push_back(new Camera(root));
   cameras[cameras.size()-1]->target->detach();
@@ -93 +90 @@
 }
 
+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.);
+  
+  }
+
+}
+
 
 
@@ -160 +177 @@
 
 
+bool CameraMan::cameraIsInVector(Camera* camera)
+{
+
+  for(std::vector<Camera*>::const_iterator it = cameras.begin(); it != cameras.end(); it++ )
+  {
+    if( (*it) == camera)
+    {
+      return true;
+    }
+  }
+  return false;
+
+
+}
+
+
 //how to get a class fkt pointer
 

trunk/src/world_entities/cameraman.h

@@ -21 +21 @@
     CameraMan(const TiXmlElement* root = NULL);
     void setCam(int CameraNo);
+    void setCam(const std::string& camName);
     void createCam(const TiXmlElement* root);
     void moveCam(int x, int y, int z,  int camNo);
@@ -36 +37 @@
     virtual void loadParams(const TiXmlElement* root);
     
-    /// Polling (to be used in scripts)
+    /// POLLING
     float getCurrCameraCoorX(){ return this->currentCam->getAbsCoorX(); }
     float getCurrCameraCoorY(){ return this->currentCam->getAbsCoorY(); }
     float getCurrCameraCoorZ(){ return this->currentCam->getAbsCoorZ(); }
+    bool cameraIsInVector(Camera* camera);
 
 };