Changeset 8485 in orxonox.OLD for branches/script_engine/src/world_entities/script_trigger.cc

Timestamp:

Jun 15, 2006, 5:33:25 PM (19 years ago)

Author:

snellen

Message:

helicopter scripted

File:

• branches/script_engine/src/world_entities/script_trigger.cc (modified) (4 diffs)

branches/script_engine/src/world_entities/script_trigger.cc

@@ -20 +20 @@
   this->toList(OM_COMMON);
 
+  returnCount = 1;
+  actionFinished = false;
   doDebugDraw = false;
+  invert = false;
   scriptCalled = false;
   scriptIsOk = false;
+  triggerLasts = false;
   loadParams(root);
 
@@ -71 +75 @@
         .describe("True if the script shoul only be called once")
         .defaultValues("");
+    LoadParam(root, "invert", this, ScriptTrigger, setInvert)
+        .describe("")
+        .defaultValues("");
+    LoadParam(root, "triggerlasts", this, ScriptTrigger, setTriggerLasts)
+        .describe("")
+        .defaultValues("");
     LoadParam(root, "debugdraw", this, ScriptTrigger, setDebugDraw)
         .describe("True if the script should only be called once")
@@ -118 +128 @@
 void ScriptTrigger::tick(float timestep)
 {
-
-  if( this->distance(target) < radius)
+  if(actionFinished) return;
+
+  if(triggerLasts && scriptCalled)
+  {
+    executeAction(timestep);
+    return;
+  }
+  
+  
+  if( !invert && this->distance(target) < radius)
  {
   if(!callOnce)
    {
-    executeAction();
+    executeAction(timestep);
+    scriptCalled = true;
    }
   else if(callOnce && !scriptCalled)
   {
-   executeAction();
+   executeAction(timestep);
    scriptCalled = true;
   }
+  
+ }
+ else if( invert && this->distance(target) > radius)
+ {
+   if(!callOnce)
+   {
+     executeAction(timestep);
+   }
+   else if(callOnce && !scriptCalled)
+   {
+     executeAction(timestep);
+     scriptCalled = true;
+   }
+   
  }
  //else
@@ -137 +170 @@
 
 
-void ScriptTrigger::executeAction()
+void ScriptTrigger::executeAction(float timestep)
 {
      if(scriptIsOk)
      {
-       testScriptingFramework();
-     if(!(script->selectFunction(this->functionName,0)) )
+       //testScriptingFramework();
+     if(!(script->selectFunction(this->functionName,returnCount)) )
        printf("Error ScriptTrigger: Selection of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
+     
+     script->pushParam( timestep, this->functionName);
+     
      if( !(script->executeFunction()) )
        printf("Error ScriptTrigger: Execution of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
      }
+     
+     actionFinished = script->getReturnedBool();
 }