Changeset 10390 in orxonox.OLD

Timestamp:

Jan 26, 2007, 6:59:26 PM (17 years ago)

Author:

snellen

Message:

made cameraman xml-loadable (hopefully)

Location:

trunk/src/world_entities

Files:

• cameraman.cc (modified) (3 diffs)
• cameraman.h (modified) (2 diffs)

trunk/src/world_entities/cameraman.cc

@@ -21 +21 @@
 #include <string>
 #include "script_class.h"
+#include "loading/load_param_xml.h"
 
 ObjectListDefinition(CameraMan);
@@ -28 +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("togglFade", Executor0<CameraMan, lua_State*>(&CameraMan::togglFade))
+                        ->addMethod("getCurrCameraCoorX", Executor0ret<CameraMan, lua_State*,float>(&CameraMan::getCurrCameraCoorX))
+                        ->addMethod("getCurrCameraCoorY", Executor0ret<CameraMan, lua_State*,float>(&CameraMan::getCurrCameraCoorY))
+                        ->addMethod("getCurrCameraCoorZ", Executor0ret<CameraMan, lua_State*,float>(&CameraMan::getCurrCameraCoorZ))
                        );
 
 
-CameraMan::CameraMan()
+CameraMan::CameraMan(const TiXmlElement* root)
 {
   this->registerObject(this, CameraMan::_objectList);
@@ -43 +48 @@
   State::setCamera(currentCam, currentCam->getTarget());
   this->fadeToBlack=new BlackScreen();
+  
+  if (root != NULL)
+    this->loadParams(root);
 }
 
 
-void CameraMan::createCam()
+void CameraMan::loadParams(const TiXmlElement* root)
+{
+  BaseObject::loadParams(root);
+  
+  LOAD_PARAM_START_CYCLE(root, object);
+  {
+    this->createCam(root);
+  }
+  LOAD_PARAM_END_CYCLE(object);
+
+  
+  
+
+}
+
+
+void CameraMan::createCam(const TiXmlElement* root)
 {
  // Camera* newCamera=new Camera();
-  this->cameras.push_back(new Camera());
+  this->cameras.push_back(new Camera(root));
   cameras[cameras.size()-1]->target->detach();
   cameras[cameras.size()-1]->setClipRegion(nearClip, farClip);

trunk/src/world_entities/cameraman.h

@@ -19 +19 @@
   public:
     std::vector<Camera*> cameras;
-    CameraMan();
+    CameraMan(const TiXmlElement* root = NULL);
     void setCam(int CameraNo);
-    void createCam();
+    void createCam(const TiXmlElement* root);
     void moveCam(int x, int y, int z,  int camNo);
     void moveCurrCam(int x, int y, int z);
@@ -32 +32 @@
     void setClipRegion(float nearClip, float farClip);
     void togglFade();
+    
+    /// LOADING
+    virtual void loadParams(const TiXmlElement* root);
+    
+    /// Polling (to be used in scripts)
+    float getCurrCameraCoorX(){ return this->currentCam->getAbsCoorX(); }
+    float getCurrCameraCoorY(){ return this->currentCam->getAbsCoorY(); }
+    float getCurrCameraCoorZ(){ return this->currentCam->getAbsCoorZ(); }
 
 };