Changeset 9245 in orxonox.OLD for branches

Timestamp:

Jul 6, 2006, 5:32:31 PM (18 years ago)

Author:

snellen

Message:

added setActivateOnCreation to scripttrigger

Location:

branches/scripting/src/world_entities

Files:

• script_trigger.cc (modified) (6 diffs)
• script_trigger.h (modified) (2 diffs)

branches/scripting/src/world_entities/script_trigger.cc

@@ -32 +32 @@
              ->addMethod("setTarget", ExecutorLua1<ScriptTrigger, const std::string&>(&ScriptTrigger::setTarget))
              ->addMethod("setTriggerParent", ExecutorLua1<ScriptTrigger, const std::string&>(&ScriptTrigger::setTriggerParent))
-             ->addMethod("setTriggerLasts", ExecutorLua1<ScriptTrigger, bool>(&ScriptTrigger::setTriggerLasts))
+             ->addMethod("setTriggerRemains", ExecutorLua1<ScriptTrigger, bool>(&ScriptTrigger::setTriggerRemains))
+             ->addMethod("setActiveOnCreation", ExecutorLua1<ScriptTrigger, bool>(&ScriptTrigger::setActiveOnCreation))
              ->addMethod("setInvert", ExecutorLua1<ScriptTrigger, bool>(&ScriptTrigger::setInvert))
              ->addMethod("setRadius", ExecutorLua1<ScriptTrigger, float>(&ScriptTrigger::setRadius))
@@ -59 +60 @@
   scriptCalled = false;
   scriptIsOk = false;
-  triggerLasts = true;
+  triggerRemains = true;
   addToScript = false;
+  this->activeOnCreation = false;
   
   if(root != NULL)
@@ -119 +121 @@
       .describe("")
       .defaultValues(false);
-  LoadParam(root, "triggerlasts", this, ScriptTrigger, setTriggerLasts)
+  LoadParam(root, "triggerRemains", this, ScriptTrigger, setTriggerRemains)
       .describe("")
       .defaultValues(true);
@@ -172 +174 @@
   if(scriptFinished) return;
 
-  if(triggerLasts && scriptCalled)
+  if(activeOnCreation)
+   {
+     executeAction(timestep);
+     return;
+   }
+   
+  if(triggerRemains && scriptCalled)
   {
     executeAction(timestep);
@@ -182 +190 @@
     executeAction(timestep);
     scriptCalled = true;
+    return;
   
   }
@@ -188 +197 @@
     executeAction(timestep); 
     scriptCalled = true;
+    return;
   }
  //else

branches/scripting/src/world_entities/script_trigger.h

@@ -35 +35 @@
     void setTarget(WorldEntity* target) { if(target!=NULL) this->target=target; }
     void setTriggerParent(const std::string& name);
-    void setTriggerLasts(const bool lasts) { this->triggerLasts = lasts; }
+    void setTriggerRemains(const bool lasts) { this->triggerRemains = lasts; }
+    void setActiveOnCreation(const bool avtive) { this->activeOnCreation = avtive; }
     void setInvert(const bool inv) { this->invert = invert; }
     void setDelay(float delay) { this->delay = delay; };
@@ -50 +51 @@
 
     WorldEntity* target;
-    bool         triggerLasts;
+    bool         triggerRemains;
+    bool         activeOnCreation;
     bool         invert;
     float        radius;