Changeset 10482 in orxonox.OLD

Timestamp:

Jan 29, 2007, 2:48:59 PM (17 years ago)

Author:

snellen

Message:

cleanup in cameramanager… continued

Location:

trunk/src/world_entities

Files:

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

trunk/src/world_entities/cameraman.cc

@@ -150 +150 @@
 }
 
-void CameraMan::atachCurrTarget(PNode* target)
-{
-  currentCam->target->atach(target);
-  currentCam->setViewMode(Camera::ViewNormal);
-  State::setCamera(this->currentCam,  dynamic_cast<CameraTarget*>(target));
-
-}
 
 void CameraMan::atachCurrCameraToWorldEntity(const std::string& className, const std::string& targetEntity)
@@ -164 +157 @@
   if(object != NULL && object->isA(PNode::staticClassID()))
   {
-   this->atachCurrTarget(dynamic_cast<PNode*>(object));
+   this->atachTarget(this->currentCam, dynamic_cast<PNode*>(object));
    return;
   }
@@ -233 +226 @@
   if( object != NULL && targetCam != NULL && object->isA(PNode::staticClassID()) )
   {
-    dynamic_cast<Camera*>(targetCam)->target->atach(dynamic_cast<PNode*>(object));
-    dynamic_cast<Camera*>(targetCam)->setViewMode(Camera::ViewNormal);
-    State::setCamera(dynamic_cast<Camera*>(targetCam),  dynamic_cast<CameraTarget*>(object));
+    this->atachTarget(dynamic_cast<Camera*>(targetCam), dynamic_cast<PNode*>( object ));
     return;
   }
@@ -304 +295 @@
 
 
+void CameraMan::atachTarget(Camera* cam ,PNode* target)
+{
+  cam->target->atach(target);
+  cam->setViewMode(Camera::ViewNormal);
+  State::setCamera( cam,  dynamic_cast<CameraTarget*>(target));
+
+}
+
 //how to get a class fkt pointer
 

trunk/src/world_entities/cameraman.h

@@ -42 +42 @@
     void moveCurrCam(int x, int y, int z);
     void changeCurrTarget(const std::string& className, const std::string& objectName);
-    void atachCurrTarget(PNode* target);
     void atachCurrCameraToWorldEntity(const std::string& className, const std::string& targetEntity);
     void detachCurrCamera();
@@ -62 +61 @@
   private:
     bool cameraIsInVector(Camera* camera);
+    void atachTarget(Camera* cam, PNode* pnode);