Changeset 8783 in orxonox.OLD

Timestamp:

Jun 26, 2006, 2:00:31 PM (18 years ago)

Author:

patrick

Message:

merged the script engine branche back to trunk

Location:

trunk/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/lang/class_list.cc (modified) (1 diff)
• lib/script_engine/script.cc (modified) (2 diffs)
• world_entities/npcs/generic_npc.cc (modified) (2 diffs)
• world_entities/npcs/generic_npc.h (modified) (1 diff)
• world_entities/script_trigger.cc (modified) (4 diffs)
• world_entities/script_trigger.h (modified) (4 diffs)
• world_entities/space_ships/helicopter.cc (modified) (1 diff)
• world_entities/space_ships/helicopter.h (modified) (1 diff)

trunk/src/defs/class_id.h

@@ -252 +252 @@
   CL_SCRIPT                     =    0x00000651,
   CL_SCRIPT_CLASS               =    0x00000652,
-  CL_SCRIPT_TRIGGER             =    0x00000652,
+  CL_SCRIPT_TRIGGER             =    0x00000653,
 
 

trunk/src/lib/lang/class_list.cc

@@ -235 +235 @@
 BaseObject* ClassList::getObject(const std::string& objectName, const std::string& className)
 {
+
   ClassList* cl = ClassList::getClassList(className);
   if (cl != NULL)

trunk/src/lib/script_engine/script.cc

@@ -114 +114 @@
  void Script::addObject(const std::string& className, const std::string& objectName)
  {
-   //printf("Script %p: I am about to add %s of class %s\n",this,objectName.c_str(),className.c_str());
+  // printf("Script %p: I am about to add %s of class %s\n",this,objectName.c_str(),className.c_str());
 
    BaseObject* scriptClass = ClassList::getObject(className, CL_SCRIPT_CLASS);
-   //printf("The script class for %s is at %p \n",className.c_str(),scriptClass);
+  // printf("The script class for %s is at %p \n",className.c_str(),scriptClass);
    WorldObject tmpObj;
    if (scriptClass != NULL)
@@ -128 +128 @@
 
      BaseObject* object = ClassList::getObject(objectName, className);
-     //printf("%s is at %p \n",objectName.c_str(),object);
+    // printf("%s is at %p \n",objectName.c_str(),object);
      if (object != NULL && !objectIsAdded(objectName))
      {

trunk/src/world_entities/npcs/generic_npc.cc

@@ -125 +125 @@
  * @param coordinate: coordinate to go to
  */
-bool GenericNPC::walkTo(const Vector& coordinate, float time)
+float GenericNPC::walkTo(const Vector& coordinate, const Quaternion& dir)
 {
 
@@ -136 +136 @@
  * @param coordinate: coordinate to go to
  */
-bool GenericNPC::walkTo(float x, float y, float z, float time)
+float GenericNPC::walkTo(float x, float y, float z, float qu, float qx, float qy, float qz)
 {
 

trunk/src/world_entities/npcs/generic_npc.h

@@ -38 +38 @@
   void playSound(int i);
 
-  bool walkTo(const Vector& coordinate, float time);
-  bool walkTo(float x, float y, float z, float time);
+  float walkTo(const Vector& coordinate, const Quaternion& dir);
+  float walkTo(float x, float y, float z, float qu, float qx, float qy, float qz);
+  float walkTo(float x, float y, float qu, float qx, float qy, float qz);
+
+  float runTo(const Vector& coordinate, const Quaternion& dir);
+  float runTo(float x, float y, float z, float qu, float qx, float qy, float qz);
+  float runTo(float x, float y, float qu, float qx, float qy, float qz);
+
+  float crouchTo(const Vector& coordinate, const Quaternion& dir);
+  float crouchTo(float x, float y, float z, float qu, float qx, float qy, float qz);
+  float crouchTo(float x, float y, float qu, float qx, float qy, float qz);
+
 
   void destroy();

trunk/src/world_entities/script_trigger.cc

@@ -21 +21 @@
 #include "state.h"
 
+
+CREATE_SCRIPTABLE_CLASS(ScriptTrigger, CL_SCRIPT_TRIGGER,
+                            addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
+                                ->addMethod("getAbsCoorX", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorX))
+                                ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
+                                ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
+                       );
 
 
@@ -40 +47 @@
   scriptIsOk = false;
   triggerLasts = false;
+  addToScript = false;
+  
+  if(root != NULL)
+  {
+    
   loadParams(root);
-
+  
+  if(addToScript)
+  {
+    script->addObject( "ScriptTrigger", this->getName());
+  }
+  
+  }
 }
 
@@ -60 +78 @@
 void ScriptTrigger::loadParams(const TiXmlElement* root)
 {
-  if(root != NULL)
-  {
+
     WorldEntity ::loadParams(root);
 
@@ -97 +114 @@
         .describe("True if the script should only be called once")
         .defaultValues("");
-  }
-
+    LoadParam(root, "addtoscript", this, ScriptTrigger, setAddToScript)
+        .describe("True if this scripttrigger should be aviable in the script")
+        .defaultValues("");
 }
 

trunk/src/world_entities/script_trigger.h

@@ -14 +14 @@
 #include "script_manager.h"
 #include "script.h"
+#include "script_class.h"
 
 class ScriptTrigger : public WorldEntity
@@ -42 +43 @@
     void setFunction(const std::string& function){ this->functionName = function;}
     void setDebugDraw(const bool draw) { this->doDebugDraw = draw; }
+    void setAddToScript(const bool add) { this->addToScript = add; }
 
     ///DRAWING
@@ -57 +59 @@
     std::string  functionName;
     bool         doDebugDraw;
-
+    bool         addToScript;
     //for internal use
     bool         scriptCalled;
@@ -66 +68 @@
 };
 
+
 #endif

trunk/src/world_entities/space_ships/helicopter.cc

@@ -36 +36 @@
 CREATE_FACTORY(Helicopter, CL_HELICOPTER);
 #include "script_class.h"
-//CREATE_SCRIPTABLE_CLASS(Helicopter, CL_HELICOPTER, NULL);
-
+CREATE_SCRIPTABLE_CLASS(Helicopter, CL_HELICOPTER,
+                        addMethod("moveUp", ExecutorLua1<Helicopter,bool>(&Helicopter::moveUp))
+                            ->addMethod("moveDown", ExecutorLua1<Helicopter,bool>(&Helicopter::moveDown))
+                            ->addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
+                            ->addMethod("getAbsCoorX", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorX))
+                            ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
+                            ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
+                            
+                       );
 
 /**

trunk/src/world_entities/space_ships/helicopter.h

@@ -83 +83 @@
 };
 
-CREATE_SCRIPTABLE_CLASS(Helicopter, CL_HELICOPTER,
-                        addMethod("moveUp", ExecutorLua1<Helicopter,bool>(&Helicopter::moveUp))
-                        ->addMethod("moveDown", ExecutorLua1<Helicopter,bool>(&Helicopter::moveDown))
-                        ->addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
-                        ->addMethod("getAbsCoorX", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorX))
-                        ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
-                        ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
-                            
-                        );
-
-
 #endif /* _HELICOPTERS_H */