Changeset 10497 in orxonox.OLD for trunk/src

Timestamp:

Jan 30, 2007, 6:17:43 AM (18 years ago)

Author:

bknecht

Message:

added some more scriptable functions to cameraManager

Location:

trunk/src/world_entities

Files:

• cameraman.cc (modified) (4 diffs)
• cameraman.h (modified) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)

trunk/src/world_entities/cameraman.cc

@@ -47 +47 @@
                         //->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))
+                        ->addMethod("setRelCoorSoft", Executor5<CameraMan, lua_State*,const std::string&,float,float,float,float>(&CameraMan::setRelCameraCoorSoft))
                        );
 
@@ -94 +95 @@
 {
      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);
-         }
+     
+     if (!strcmp(viewMode, "ViewNormal"))
+     {
+         dynamic_cast<Camera*>(newCam)->setViewMode(Camera::ViewNormal);
+     }
+     else if (!strcmp(viewMode, "ViewTop"))
+     {
+         dynamic_cast<Camera*>(newCam)->setViewMode(Camera::ViewTop);
+     }
+     else if (!strcmp(viewMode, "ViewBehind"))
+     {
+         dynamic_cast<Camera*>(newCam)->setViewMode(Camera::ViewBehind);
+     }
+     else if (!strcmp(viewMode, "ViewFront"))
+     {
+         dynamic_cast<Camera*>(newCam)->setViewMode(Camera::ViewFront);
+     }
+     else if (!strcmp(viewMode, "ViewLeft"))
+     {
+         dynamic_cast<Camera*>(newCam)->setViewMode(Camera::ViewLeft);
+     }
+     else if (!strcmp(viewMode, "ViewRight"))
+     {
+         dynamic_cast<Camera*>(newCam)->setViewMode(Camera::ViewRight);
      }
 }*/
@@ -136 +129 @@
 }
 
+void CameraMan::setRelCameraCoorSoft(const std::string& camName, float x, float y, float z, float bias)
+{
+     BaseObject* newCam = ObjectListBase::getBaseObject("Camera", camName);
+     dynamic_cast<Camera*>(newCam)->setRelCoorSoft(x,y,z,bias);
+     dynamic_cast<Camera*>(newCam)->target->setRelCoorSoft(0,0,0,bias);
+}
 
 void CameraMan::setCam(unsigned int cameraNo)
@@ -229 +228 @@
     fadeToBlack->toggleFade();
 }
+
 
 void CameraMan::initFadeBlack()

trunk/src/world_entities/cameraman.h

@@ -56 +56 @@
     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 setRelCameraCoorSoft(const std::string& cameraName, float x, float y, float z, float bias);
     //void setViewMode(const std::string& camName, const std::string& viewMode);
     

trunk/src/world_entities/space_ships/space_ship.cc

@@ -367 +367 @@
   //this->travelDistancePlus = Vector2D(38.0, 43.0);
   //this->travelDistanceMinus = Vector2D(-38.0, -43.0);
-  this->travelDistancePlus = Vector2D(500,500);
-  this->travelDistanceMinus = Vector2D(-500,-500);
+  this->travelDistancePlus = Vector2D(50,50);
+  this->travelDistanceMinus = Vector2D(-50,-50);
   this->isTravelDistanceInit = true;
   this->actionWidthPercentage = 1;