Changeset 10394 in orxonox.OLD

Timestamp:

Jan 26, 2007, 9:02:57 PM (17 years ago)

Author:

snellen

Message:

CameraMan gets created by the gameworld

Location:

trunk/src

Files:

• story_entities/game_world_data.cc (modified) (3 diffs)
• story_entities/game_world_data.h (modified) (1 diff)
• world_entities/cameraman.cc (modified) (4 diffs)
• world_entities/cameraman.h (modified) (1 diff)

trunk/src/story_entities/game_world_data.cc

@@ -102 +102 @@
     localCamera->setName ("GameWorld-Camera");
   State::setCamera(localCamera, localCamera->getTarget());
-  CameraMan* camMan = new CameraMan();
-  State::setCameraman(camMan);
+  //CameraMan* camMan = new CameraMan();
+  //State::setCameraman(camMan);
   LightManager::getInstance();
 
@@ -132 +132 @@
   this->loadGUI(root);
   this->loadWorldEntities(root);
+  this->loadCameras(root);
   this->loadScene(root);
 
@@ -146 +147 @@
   this->unloadWorldEntities();
   this->unloadScene();
-
+  this->unloadCameras();
+
+  return ErrorMessage();
+}
+
+/**
+ * @brief creates the cameras
+ * @param root reference to the xml root element
+ */
+ErrorMessage GameWorldData::loadCameras(const TiXmlElement* root)
+{
+  const TiXmlElement* element = root->FirstChildElement("CameraMan");
+  if( element != NULL)
+  {
+    printf("found CameraMan tag  \n");
+    CameraMan* camMan = new CameraMan(element);
+    State::setCameraman(camMan);
+  }
+  return ErrorMessage();
+}
+
+
+/**
+ * @brief unloads the camera
+ */
+ErrorMessage GameWorldData::unloadCameras()
+{
+  CameraMan* camMan = State::getCameraman() ;
+  if(camMan != NULL){
+    delete  camMan;
+    State::setCameraman(NULL);
+   }
   return ErrorMessage();
 }

trunk/src/story_entities/game_world_data.h

@@ -48 +48 @@
     virtual ErrorMessage loadWorldEntities(const TiXmlElement* root);
     virtual ErrorMessage loadScene(const TiXmlElement* root);
+    virtual ErrorMessage loadCameras(const TiXmlElement* root);
 
     virtual ErrorMessage unloadGUI();
     virtual ErrorMessage unloadWorldEntities();
     virtual ErrorMessage unloadScene();
+    virtual ErrorMessage unloadCameras();
+
 
   public:

trunk/src/world_entities/cameraman.cc

@@ -11 +11 @@
 ### File Specific:
    main-programmer: Filip Gospodinov
-   co-programmer:
+   co-programmer: Silvan Nellen
 */
 
@@ -28 +28 @@
 CREATE_SCRIPTABLE_CLASS(CameraMan,
                         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("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("togglFade", Executor0<CameraMan, lua_State*>(&CameraMan::togglFade))
@@ -69 +69 @@
 void CameraMan::createCam(const TiXmlElement* root)
 {
+  printf("create Camera\n");
   //Camera* newCamera=new Camera(root);
   this->cameras.push_back(new Camera(root));
@@ -132 +133 @@
 
 
+void CameraMan::changeTarget(const std::string& camName,const std::string& className, const std::string& objectName)
+{
+  BaseObject* object = ObjectListBase::getBaseObject(className, objectName);
+  BaseObject* newCam = ObjectListBase::getBaseObject("Camera", camName);
+  if( object != NULL && object->isA(PNode::staticClassID()))
+    dynamic_cast<Camera*>(newCam)->lookAt(dynamic_cast<PNode*>(object));
+}
+
 void CameraMan::changeCurrTarget(const std::string& className, const std::string& objectName)
 {

trunk/src/world_entities/cameraman.h

@@ -26 +26 @@
     void moveCurrCam(int x, int y, int z);
     void changeTarget(int camNo, const std::string& className,const std::string& objectName);
+    void changeTarget(const std::string& camName,const std::string& className, const std::string& objectName);
     void changeCurrTarget(const std::string& className, const std::string& objectName);
     void atachCurrTarget(PNode* target);