Changeset 10495 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jan 30, 2007, 1:54:25 AM (18 years ago)

Author:

bknecht

Message:

new cameraMan function to have more control over camera

Location:

trunk/src/world_entities

Files:

• camera.cc (modified) (4 diffs)
• cameraman.cc (modified) (2 diffs)
• cameraman.h (modified) (1 diff)

trunk/src/world_entities/camera.cc

@@ -26 +26 @@
 #include "state.h"
 
+#include "debug.h"
+
 
 ObjectListDefinition(Camera);
@@ -103 +105 @@
    {
     this->setParent(this->entityTrack->getTrackNode());
-    this->setRelCoor(0,0,0);
+    //this->setRelCoor(0,0,0);
    }
 }
@@ -215 +217 @@
   this->viewVector = (this->target->getAbsCoor() - this->getAbsCoor()).getNormalized();
   this->frustumPlane = Plane(this->viewVector, this->getAbsCoor() + this->viewVector * 0.1);
-  this->upVector =  this->getAbsDirV();
+  this->upVector = this->getAbsDirV();
 
   // iteration for fovy
@@ -223 +225 @@
 
   if(this->entityTrack)
+  {
+    //PRINTF(0)("tickytackytucky\n");
     this->entityTrack->tick(dt);
-
+    //this->setAbsCoor(this->entityTrack->getTrackNode()->getAbsCoor());
+  } 
 
 

trunk/src/world_entities/cameraman.cc

@@ -45 +45 @@
                         ->addMethod("jumpCurrCam", Executor3<CameraMan, lua_State*,float,float,float>(&CameraMan::jumpCurrCam))
                         ->addMethod("jumpCam", Executor4<CameraMan, lua_State*,const std::string&,float,float,float>(&CameraMan::jumpCam))
+                        //->addMethod("setViewMode", Executor2<CameraMan, lua_State*,const std::string&,const std::string&>(&CameraMan::setViewMode))
+                        ->addMethod("setRelCoor", Executor4<CameraMan, lua_State*,const std::string&,float,float,float>(&CameraMan::setRelCameraCoor))
                        );
 
@@ -89 +91 @@
 }
 
-
+/*void CameraMan::setViewMode(const std::string& cameraName, const std::string& viewMode)
+{
+     BaseObject* newCam = ObjectListBase::getBaseObject("Camera", cameraName);
+     switch (viewMode)
+     {
+         default:
+         case "ViewNormal":
+         {
+             dynamic_cast<Camera*>(newCam)->setViewMode(Camera::ViewNormal);
+             break;
+         }
+         case "ViewTop":
+         {
+              dynamic_cast<Camera*>(newCam)->setViewMode(Camera::ViewTop);
+              break;
+         }
+         case "ViewBehind":
+         {
+              dynamic_cast<Camera*>(newCam)->setViewMode(Camera::ViewBehind);
+              break;
+         }
+         case "ViewFront":
+         {
+              dynamic_cast<Camera*>(newCam)->setViewMode(Camera::ViewFront);
+              break;
+         }
+         case "ViewLeft":
+         {
+              dynamic_cast<Camera*>(newCam)->setViewMode(Camera::ViewLeft);
+              break;
+         }
+         case "ViewRight":
+         {
+              dynamic_cast<Camera*>(newCam)->setViewMode(Camera::ViewRight);
+         }
+     }
+}*/
+
+void CameraMan::setRelCameraCoor(const std::string& camName, float x, float y, float z)
+{
+     BaseObject* newCam = ObjectListBase::getBaseObject("Camera", camName);
+     dynamic_cast<Camera*>(newCam)->setRelCoor(x,y,z);
+     dynamic_cast<Camera*>(newCam)->target->setRelCoor(0,0,0);
+}
 
 

trunk/src/world_entities/cameraman.h

@@ -55 +55 @@
     void jumpCam(int x, int y, int z, int camNo);
     void jumpCam(const std::string& cameraName, float x, float y, float z);
+    void setRelCameraCoor(const std::string& cameraName, float x, float y, float z);
+    //void setViewMode(const std::string& camName, const std::string& viewMode);
     
     void changeSpeed(float speed);