Changeset 10406 in orxonox.OLD for trunk

Timestamp:

Jan 27, 2007, 3:27:50 PM (18 years ago)

Author:

snellen

Message:

NPC is now scriptabel, added method atachCurrCameraToWorldEntity to CameraMan and made it scriptable

Location:

trunk/src/world_entities

Files:

• cameraman.cc (modified) (2 diffs)
• cameraman.h (modified) (1 diff)
• npcs/npc.cc (modified) (1 diff)

trunk/src/world_entities/cameraman.cc

@@ -33 +33 @@
 CREATE_SCRIPTABLE_CLASS(CameraMan,
                         addMethod("changeCurrTarget", Executor2<CameraMan, lua_State*,const std::string&,const std::string&>(&CameraMan::changeCurrTarget))
+                        ->addMethod("atachCurrCameraToWorldEntity", Executor2<CameraMan, lua_State*,const std::string&,const std::string&>(&CameraMan::atachCurrCameraToWorldEntity))
                         ->addMethod("changeTarget", Executor3<CameraMan, lua_State*, const std::string&, const std::string&,const std::string&>(&CameraMan::changeTarget))
                         ->addMethod("setCam", Executor1<CameraMan, lua_State*, const std::string&>(&CameraMan::setCam))
@@ -163 +164 @@
 }
 
+void CameraMan::atachCurrCameraToWorldEntity(const std::string& className, const std::string& targetEntity)
+{
+  BaseObject* object = ObjectListBase::getBaseObject(className, targetEntity);
+  if(object != NULL) 
+   this->atachCurrTarget(dynamic_cast<PNode*>(object));
+}
+
+
 void CameraMan::jumpCam(int x, int y, int z, int camNo)
 {

trunk/src/world_entities/cameraman.h

@@ -33 +33 @@
     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 jumpCam(int x, int y, int z, int camNo);
     void jumpCurrCam(int x, int y, int z);

trunk/src/world_entities/npcs/npc.cc

@@ -41 +41 @@
 CREATE_FACTORY(NPC);
 
+
+#include "script_class.h"
+CREATE_SCRIPTABLE_CLASS(NPC,
+                        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))
+                        ->addMethod("setAbsCoor", Executor3<PNode, lua_State*,float,float,float>(&PNode::setAbsCoor))
+                        ->addMethod("setAbsDir", Executor4<PNode, lua_State*,float,float,float,float>(&PNode::setAbsDir))
+                       );
 
 NPC::NPC(const TiXmlElement* root)