Changeset 8173 in orxonox.OLD

Timestamp:

Jun 6, 2006, 9:34:13 AM (18 years ago)

Author:

snellen

Message:

scripttrigger: added delay

Location:

branches/script_engine/src/lib/script_engine

Files:

• script_trigger.cc (modified) (4 diffs)
• script_trigger.h (modified) (1 diff)

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

@@ -5 +5 @@
 {
  scriptCalled = false;
+ callScript = false;
+ triggered = false;
 }
 
@@ -14 +16 @@
 void ScriptTrigger::loadParams(const TiXmlElement* root)
 {
-   /* LoadParam(root, "file", this, ScriptTrigger, setScript)
+   /*{ LoadParam(root, "file", this, ScriptTrigger, setScript)
         .describe("the fileName of the script, that should be triggered by this script trigger")
         .defaultValues("");
@@ -29 +31 @@
         .describe("the delay after which the funtion sould be triggered")
         .defaultValues(0);
-    */
+    }*/
+ timer = delay;
 }
 
@@ -36 +39 @@
 void ScriptTrigger::tick(float timestep)
 {
+ //if(triggered)
+ //{
+  //timer -= timestep;
+  //if(timer < 0)
+   callScript = true;
+ //}
+ 
 
  if((this->getAbsDirV()-target->getAbsDirV()).len() < radius)
  {
-  if(!callOnce)
+  //triggered = true;
+  if(!callOnce && callScript)
    {
     executeAction();
    }
-  else if(callOnce && !scriptCalled)
+  else if(callOnce && !scriptCalled && callScript)
   {
    executeAction();

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

@@ -36 +36 @@
     std::string functionName;
 
+    bool callScript;
+    bool triggered;
+    float timer;
+
 };