Changeset 10388 in orxonox.OLD for trunk/src

Timestamp:

Jan 26, 2007, 6:32:54 PM (18 years ago)

Author:

snellen

Message:

made camera and cameraman scriptable

Location:

trunk/src/world_entities

Files:

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

trunk/src/world_entities/camera.cc

@@ -22 +22 @@
 #include "vector.h"
 #include "targets.h"
-
-
+#include "script_class.h"
 
 
 ObjectListDefinition(Camera);
 
+CREATE_SCRIPTABLE_CLASS(Camera,
+                        addMethod("setAbsCoor", Executor3<PNode, lua_State*,float,float,float>(&PNode::setAbsCoor))
+                        ->addMethod("getAbsCoorX", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorX))
+                        ->addMethod("getAbsCoorY", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorY))
+                        ->addMethod("getAbsCoorZ", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorZ))
+                       );
 
 /**

trunk/src/world_entities/cameraman.cc

@@ -20 +20 @@
 #include "sound_engine.h"
 #include <string>
+#include "script_class.h"
 
 ObjectListDefinition(CameraMan);
+
+
+CREATE_SCRIPTABLE_CLASS(CameraMan,
+                        addMethod("changeCurrTarget", Executor2<CameraMan, lua_State*,const std::string&,const std::string&>(&CameraMan::changeCurrTarget))
+                        ->addMethod("changeTarget", Executor3<CameraMan, lua_State*, int, const std::string&,const std::string&>(&CameraMan::changeTarget))
+                        ->addMethod("togglFade", Executor0<CameraMan, lua_State*>(&CameraMan::togglFade))
+                       );
 
 
@@ -75 +83 @@
 
 
-void CameraMan::changeTarget(int camNo, std::string className, std::string objectName)
+void CameraMan::changeTarget(int camNo,const std::string& className, const std::string& objectName)
 {
   BaseObject* object = ObjectListBase::getBaseObject(className, objectName);
@@ -83 +91 @@
 
 
-void CameraMan::changeCurrTarget(std::string className, std::string objectName)
+void CameraMan::changeCurrTarget(const std::string& className, const std::string& objectName)
 {
   BaseObject* object = ObjectListBase::getBaseObject(className, objectName);

trunk/src/world_entities/cameraman.h

@@ -24 +24 @@
     void moveCam(int x, int y, int z,  int camNo);
     void moveCurrCam(int x, int y, int z);
-    void changeTarget(int camNo, std::string className, std::string objectName);
-    void changeCurrTarget(std::string className, std::string objectName);
+    void changeTarget(int camNo, const std::string& className,const std::string& objectName);
+    void changeCurrTarget(const std::string& className, const std::string& objectName);
     void atachCurrTarget(PNode* target);
     void jumpCam(int x, int y, int z, int camNo);