Changeset 8211 in orxonox.OLD

Timestamp:

Jun 7, 2006, 8:47:05 PM (18 years ago)

Author:

snellen

Message:

cleaned script trigger, added member: a pointer to the required script

Location:

branches/script_engine/src/lib/script_engine

Files:

• script_manager.cc (modified) (2 diffs)
• script_trigger.cc (modified) (7 diffs)
• script_trigger.h (modified) (4 diffs)

branches/script_engine/src/lib/script_engine/script_manager.cc

@@ -38 +38 @@
   //BaseObject::loadParams(root);
   {
+  LoadParamXML(root, "Scripts", this, ScriptManager, createScripts);
+
   LoadParamXML(root, "ScriptTriggers", this, ScriptManager, createTriggers);
-
-  LoadParamXML(root, "Scripts", this, ScriptManager, createScripts);
   } // make shure that the loading process is finished
 
@@ -55 +55 @@
   if(getScripts())
     for(std::list<BaseObject*>::const_iterator it = scripts->begin(); it != scripts->end(); it++ )
-  {
-    ClassList::removeFromClassList( (*it) );
-  }
+    {
+     ClassList::removeFromClassList( (*it) );
+    }
 
   this->scripts = NULL;

branches/script_engine/src/lib/script_engine/script_trigger.cc

@@ -7 +7 @@
 {
   scriptCalled = false;
-  callScript = false;
-  triggered = false;
+  scriptIsOk = false;
   loadParams(root);
 
@@ -24 +23 @@
   {
   WorldEntity ::loadParams(root);
-  
+
    { LoadParam(root, "file", this, ScriptTrigger, setScript)
         .describe("the fileName of the script, that should be triggered by this script trigger")
@@ -50 +49 @@
     timer = delay;
   }
- 
+
 }
 
@@ -57 +56 @@
 {
   BaseObject* targetEntity = ClassList::getObject(target, CL_WORLD_ENTITY);
-  
+
   if (targetEntity != NULL)
   {
@@ -71 +70 @@
 {
   BaseObject* parentEntity = ClassList::getObject(parent, CL_WORLD_ENTITY);
-  
+
   if (parentEntity != NULL)
   {
@@ -105 +104 @@
 void ScriptTrigger::executeAction()
 {
-     ScriptManager* scriptManager = ScriptManager::getInstance();
-     Script* script = scriptManager->getScriptByFile(this->scriptFile);
-     if(script != NULL)
+     if(scriptIsOk)
      {
      if(!(script->selectFunction(this->functionName,0)) )
@@ -115 +112 @@
      }
 }
+
+
+void ScriptTrigger::setScript(const std::string& file)
+{
+  ScriptManager* scriptManager = ScriptManager::getInstance();
+  script = scriptManager->getScriptByFile(file);
+  if(script != NULL)
+    scriptIsOk = true;
+
+}

branches/script_engine/src/lib/script_engine/script_trigger.h

@@ -8 +8 @@
 #include "vector.h"
 #include "script_manager.h"
+#include "script.h"
 
 class ScriptTrigger : public WorldEntity
@@ -17 +18 @@
     ///LOADING
     virtual void loadParams(const TiXmlElement* root);
-    
-    
+
+
     /// DO WORK
     virtual void tick(float timestep);
@@ -30 +31 @@
     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& script){ this->scriptFile = script; }
+    void setScript(const std::string& file);
     void setFunction(const std::string& function){ this->functionName = function; }
 
@@ -40 +41 @@
     float        radius;
     float        delay;
-    std::string  scriptFile;
+    Script*      script;
     std::string  functionName;
 
     //for internal use
     bool         scriptCalled;
-    bool         callScript;
-    bool         triggered;
-    float        timer;
+    bool         scriptIsOk;
 
 };