Changeset 10197 in orxonox.OLD

Timestamp:

Jan 8, 2007, 11:54:17 PM (17 years ago)

Author:

gfilip

Message:

override

Location:

branches/camera/src/world_entities

Files:

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

branches/camera/src/world_entities/cameraman.cc

@@ -1 +1 @@
 #include "shell_command.h"
 #include "cameraman.h"
-#include "camera.h"
+
 #include "state.h"
 
@@ -9 +9 @@
 cameraman::cameraman()
 {
-  currentCam=State::getCameraNode();
+  currentCam=State::getCamera();
   cameras[0]=currentCam;
   camAmount=1;
@@ -20 +20 @@
 if (camAmount<6)
 {
-  PNode* newCamera=new Camera();
+  Camera* newCamera=new Camera();
   cameras[camAmount]=newCamera;
 }
@@ -28 +28 @@
 {
   if (cameraNo<camAmount)
+  {
   currentCam=cameras[cameraNo];
+  State::setCamera(currentCam, currentCam->getTargetNode());
+  }
 
 }

branches/camera/src/world_entities/cameraman.h

@@ -3 +3 @@
 
 #include "p_node.h"
+#include "camera.h"
 
 class cameraman {
 
   private:
-    PNode* currentCam;
+    Camera* currentCam;
     int camNo;
     int camAmount;
@@ -17 +18 @@
     void setCam(int CameraNo);
     void createCam();
-    PNode* cameras[6];
+    Camera* cameras[6];
+    void moveCam(int x, int y, int z, int speed, int camNo);
+    void moveCurrCam(int x, int y, int z, int speed);
+