Changeset 10480 in orxonox.OLD for trunk/src/world_entities/cameraman.h

Timestamp:

Jan 29, 2007, 1:53:29 PM (17 years ago)

Author:

snellen

Message:

little cleanup and bugfix in cameraman.*

File:

• trunk/src/world_entities/cameraman.h (modified) (2 diffs)

trunk/src/world_entities/cameraman.h

@@ -22 +22 @@
     std::vector<Camera*> cameras;
     CameraMan(const TiXmlElement* root = NULL);
-    void setCam(int CameraNo);
+    void setCam(unsigned int CameraNo);
     void setCam(const std::string& camName);
     void setCam(Camera* camera);
 
+    /// LOADING
+    virtual void loadParams(const TiXmlElement* root);
     void createCameras(const TiXmlElement* camerasTag);
     void createCam(const TiXmlElement* root);
-    void moveCam(int x, int y, int z,  int camNo);
-    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);
-    void atachCurrCameraToWorldEntity(const std::string& className, const std::string& targetEntity);
-    void atachCameraToWorldEntity(const std::string& cameraName, const std::string& className, const std::string& targetEntity);
-    void detachCurrCamera();
-    void jumpCam(int x, int y, int z, int camNo);
-    void jumpCurrCam(float x, float y, float z);
-    void changeSpeed(float speed);
-    void setClipRegion(float nearClip, float farClip);
-    void togglFade();
-    void initFadeBlack();
-
-    void cameraInfo();
-
-    /// LOADING
-    virtual void loadParams(const TiXmlElement* root);
 
     /// POLLING
@@ -55 +37 @@
     const Camera* getCurrentCam() const { return this->currentCam; }
     Camera* getCurrentCam() { return this->currentCam; }
+
+    
+    /// Current camera
+    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();
+    void jumpCurrCam(float x, float y, float z);
+    void togglFade();
+    void initFadeBlack();
+    
+    /// Camera
+    void moveCam(int x, int y, int z,  int camNo);
+    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 atachCameraToWorldEntity(const std::string& cameraName, const std::string& className, const std::string& targetEntity);
+    void jumpCam(int x, int y, int z, int camNo);
+    
+    void changeSpeed(float speed);
+    void setClipRegion(float nearClip, float farClip);
+    void cameraInfo();
+    
+  private:
     bool cameraIsInVector(Camera* camera);
+    
 
 };