Changeset 10608 in orxonox.OLD

Timestamp:

Mar 29, 2007, 5:50:50 PM (17 years ago)

Author:

snellen

Message:

space trigger should work now

Location:

branches/scriptimprovements/src/world_entities/script_triggers

Files:

• script_trigger.h (modified) (1 diff)
• space_trigger.cc (modified) (1 diff)

branches/scriptimprovements/src/world_entities/script_triggers/script_trigger.h

@@ -41 +41 @@
     void setAddToScript(const bool add) { this->addToScript = add; }
     void setTriggerParent(const std::string& name);
+    
+    inline void setScriptIsOk(bool ok){ scriptIsOk = ok ; }
+    inline void setScriptCalled(bool called){ scriptCalled = called; }
+    inline void setScriptFinished(bool finished){ scriptFinished = finished; }
+    
+    ///POLLING
 
+    inline bool getScriptIsOk(){ return scriptIsOk; }
+    inline bool getScriptCalled(){ return scriptCalled; }
+    inline bool getScriptFinished(){ return scriptFinished; }
+    
+    
     ///DRAWING
     void draw()const{if(doDebugDraw)this->debugDraw();};

branches/scriptimprovements/src/world_entities/script_triggers/space_trigger.cc

@@ -116 +116 @@
 void SpaceTrigger::tick(float timestep)
 {
+  if( this->getScriptFinished() ) return;
 
+  if(triggerRemains && this->getScriptCalled() )
+  {
+    executeAction(timestep);
+    return;
+  }
+
+  if( this->target != NULL)
+  {
+    if( !invert && this->distance(target) < radius)
+    {
+    //printf("Distance is %f \n", this->distance(target));
+      executeAction(timestep);
+      this->setScriptCalled(true);
+      return;
+
+    }
+    else if( invert && this->distance(target) > radius)
+    {
+      executeAction(timestep);
+      this->setScriptCalled(true);
+      return;
+    }
+  }
 }