Changeset 8978 in orxonox.OLD

Timestamp:

Jul 1, 2006, 2:48:17 PM (18 years ago)

Author:

snellen

Message:

perpared possibility to add the script object to the lua script itself (so that all objects can be added from within the script ), prepared possibility to create triggers form within a script

Location:

branches/single_player_map/src

Files:

• lib/script_engine/script.cc (modified) (4 diffs)
• lib/script_engine/script.h (modified) (2 diffs)
• world_entities/script_trigger.cc (modified) (3 diffs)
• world_entities/script_trigger.h (modified) (1 diff)

branches/single_player_map/src/lib/script_engine/script.cc

@@ -24 +24 @@
 
 #include "class_list.h"
+// uncommet this when the std:string and the const bug is fixed
+//CREATE_SCRIPTABLE_CLASS(Script, CL_SCRIPT,
+//                               addMethod("addObject", ExecutorLua2<Script,std::string,std::string>(&Script::addObject))
+//                               ):
 
 Script::Script(const TiXmlElement* root)
@@ -73 +77 @@
 bool Script::loadFile(const std::string& filename)
  {
-
+   this->setName(filename);
    std::string filedest(ResourceManager::getInstance()->getDataDir());
    filedest += "scripts/" + filename;
@@ -93 +97 @@
      {
       currentFile = filename;
+      //this->addThisScript();
       return true;
      }
@@ -323 +328 @@
  }
 
+
+void Script::addThisScript()
+{
+  BaseObject* scriptClass = ClassList::getObject("Script", CL_SCRIPT_CLASS);
+   if (scriptClass != NULL)
+   {
+     static_cast<ScriptClass*>(scriptClass)->registerClass(this);
+     static_cast<ScriptClass*>(scriptClass)->insertObject(this, this, false);
+   }
+}
+
  int Script::reportError(int error)
  {

branches/single_player_map/src/lib/script_engine/script.h

@@ -31 +31 @@
     void loadFileNoRet(const std::string& filename) { loadFile(filename); };
     bool loadFile(const std::string& filename);
-    void addObject(const std::string& className, const std::string& objectName);
+    void addObject( const std::string& className,const std::string& objectName);
 
     /// QUERRYING
@@ -61 +61 @@
 
   private:
-
+    void addThisScript();
     int  reportError(int error);                      //!< Get errormessage from the lua stack and print it.
     bool registerStandartClasses();                   //!< Register all the classes that the script might need

branches/single_player_map/src/world_entities/script_trigger.cc

@@ -14 +14 @@
 */
 
-
 #include "script_trigger.h"
 #include "class_list.h"
@@ -23 +22 @@
 
 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))
+                          //Position
+                     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))
+                     //Set values
+                    // ->addMethod("setTarget", ExecutorLua1<ScriptTrigger, std::string >(&ScriptTrigger::setTarget))
+                    // ->addMethod("setTriggerParent", ExecutorLua1<ScriptTrigger, std::string >(&ScriptTrigger::setTriggerParent))
+                     ->addMethod("setTriggerLasts", ExecutorLua1<ScriptTrigger, bool >(&ScriptTrigger::setTriggerLasts))
+                     ->addMethod("setInvert", ExecutorLua1<ScriptTrigger, bool >(&ScriptTrigger::setInvert))
+                     ->addMethod("setRadius", ExecutorLua1<ScriptTrigger, float >(&ScriptTrigger::setRadius))
+                     //->addMethod("setScript", ExecutorLua1<ScriptTrigger, std::string >(&ScriptTrigger::setScript))
+                     //->addMethod("setFunction", ExecutorLua1<ScriptTrigger, std::string >(&ScriptTrigger::setFunction))
+                     ->addMethod("setDebugDraw", ExecutorLua1<ScriptTrigger, bool >(&ScriptTrigger::setInvert))
                        );
 
@@ -92 +101 @@
     LoadParam(root, "radius", this, ScriptTrigger, setRadius)
         .describe("the fileName of the script, that should be triggered by this script trigger")
-        .defaultValues(0);
-    LoadParam(root, "delay", this, ScriptTrigger, setDelay)
-        .describe("the delay after which the funtion sould be triggered")
         .defaultValues(0);
     LoadParam(root, "worldentity", this, ScriptTrigger, setTarget)

branches/single_player_map/src/world_entities/script_trigger.h

@@ -38 +38 @@
     void setInvert(const bool inv) { this->invert = invert; }
     void setRadius(const float radius) { if(radius>0) this->radius = radius; }
-    void setDelay(const float time){if(delay>0) this->delay = delay; }
     void setScript(const std::string& file);
     void setFunction(const std::string& function){ this->functionName = function;}