Changeset 10607 in orxonox.OLD

Timestamp:

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

Author:

snellen

Message:

Introduced new scripttrigger: space trigger

Location:

branches/scriptimprovements/src/world_entities/script_triggers

Files:

• script_trigger.cc (modified) (5 diffs)
• script_trigger.h (modified) (3 diffs)
• space_trigger.cc (added)
• space_trigger.h (added)
• tick_trigger.cc (added)
• tick_trigger.h (added)
• time_trigger.cc (added)
• time_trigger.h (added)

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

@@ -22 +22 @@
 ObjectListDefinition(ScriptTrigger);
 
-CREATE_SCRIPTABLE_CLASS(ScriptTrigger,
-            // Coordinates
-                        addMethod("setAbsCoor", Executor3<PNode, lua_State*,float,float,float>(&PNode::setAbsCoor))
-                            ->addMethod("getAbsCoorX", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorX))
-                            ->addMethod("getAbsCoorY", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorY))
-                            ->addMethod("getAbsCoorZ", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorZ))
-            //Properties
-                            ->addMethod("setName", Executor1<BaseObject, lua_State*, const std::string&>(&BaseObject::setName))
-                            ->addMethod("setTarget", Executor1<ScriptTrigger, lua_State*, const std::string&>(&ScriptTrigger::setTarget))
-                            ->addMethod("setTriggerParent", Executor1<ScriptTrigger, lua_State*, const std::string&>(&ScriptTrigger::setTriggerParent))
-                            ->addMethod("setTriggerRemains", Executor1<ScriptTrigger, lua_State*, bool>(&ScriptTrigger::setTriggerRemains))
-                            ->addMethod("setActiveOnCreation", Executor1<ScriptTrigger, lua_State*, bool>(&ScriptTrigger::setActiveOnCreation))
-                            ->addMethod("setInvert", Executor1<ScriptTrigger, lua_State*, bool>(&ScriptTrigger::setInvert))
-                            ->addMethod("setRadius", Executor1<ScriptTrigger, lua_State*, float>(&ScriptTrigger::setRadius))
-                            ->addMethod("setScript", Executor1<ScriptTrigger, lua_State*, const std::string&>(&ScriptTrigger::setScript))
-                            ->addMethod("setFunction", Executor1<ScriptTrigger, lua_State*, const std::string&>(&ScriptTrigger::setFunction))
-                            ->addMethod("setDebugDraw", Executor1<ScriptTrigger, lua_State*, bool>(&ScriptTrigger::setDebugDraw))
-                            ->addMethod("setAddToScript", Executor1<ScriptTrigger, lua_State*, bool>(&ScriptTrigger::setAddToScript))
-             );
+// CREATE_SCRIPTABLE_CLASS(ScriptTrigger,
+//             // Coordinates
+//                      addMethod("setAbsCoor", Executor3<PNode, lua_State*,float,float,float>(&PNode::setAbsCoor))
+//                          ->addMethod("getAbsCoorX", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorX))
+//                          ->addMethod("getAbsCoorY", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorY))
+//                          ->addMethod("getAbsCoorZ", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorZ))
+//             //Properties
+//                          ->addMethod("setName", Executor1<BaseObject, lua_State*, const std::string&>(&BaseObject::setName))
+//                          ->addMethod("setTarget", Executor1<ScriptTrigger, lua_State*, const std::string&>(&ScriptTrigger::setTarget))
+//                          ->addMethod("setTriggerParent", Executor1<ScriptTrigger, lua_State*, const std::string&>(&ScriptTrigger::setTriggerParent))
+//                          ->addMethod("setTriggerRemains", Executor1<ScriptTrigger, lua_State*, bool>(&ScriptTrigger::setTriggerRemains))
+//                          ->addMethod("setActiveOnCreation", Executor1<ScriptTrigger, lua_State*, bool>(&ScriptTrigger::setActiveOnCreation))
+//                          ->addMethod("setInvert", Executor1<ScriptTrigger, lua_State*, bool>(&ScriptTrigger::setInvert))
+//                          ->addMethod("setRadius", Executor1<ScriptTrigger, lua_State*, float>(&ScriptTrigger::setRadius))
+//                          ->addMethod("setScript", Executor1<ScriptTrigger, lua_State*, const std::string&>(&ScriptTrigger::setScript))
+//                          ->addMethod("setFunction", Executor1<ScriptTrigger, lua_State*, const std::string&>(&ScriptTrigger::setFunction))
+//                          ->addMethod("setDebugDraw", Executor1<ScriptTrigger, lua_State*, bool>(&ScriptTrigger::setDebugDraw))
+//                          ->addMethod("setAddToScript", Executor1<ScriptTrigger, lua_State*, bool>(&ScriptTrigger::setAddToScript))
+//              );
 
 
@@ -53 +53 @@
   this->toList(OM_COMMON);
 
-  radius = 10;
   returnCount = 1;
   scriptFinished = false;
   doDebugDraw = false;
-  invert = false;
+
   scriptCalled = false;
   scriptIsOk = false;
   executionStopped = false; // true when something goes wrong and the trigger has to be stopped
-  triggerRemains = true;
   addToScript = false;
   this->activeOnCreation = false;
-  target = NULL;
+
 
   if(root != NULL)
@@ -108 +106 @@
       .describe("where this script trigger should be located")
       .defaultValues("");
-  LoadParam(root, "radius", this, ScriptTrigger, setRadius)
-      .describe("the fileName of the script, that should be triggered by this script trigger")
-      .defaultValues(0);
   LoadParam(root, "delay", this, ScriptTrigger, setDelay)
       .describe("the delay after which the funtion sould be triggered")
       .defaultValues(0);
-  LoadParam(root, "worldentity", this, ScriptTrigger, setTarget)
-      .describe("The name of the target as it is in the *.oxw file")
-      .defaultValues("");
   LoadParam(root, "triggerparent", this, ScriptTrigger, setTriggerParent)
       .describe("The name of the parent as it is in the *.oxw file")
       .defaultValues("");
-  LoadParam(root, "invert", this, ScriptTrigger, setInvert)
-      .describe("")
-      .defaultValues(false);
-  LoadParam(root, "triggerRemains", this, ScriptTrigger, setTriggerRemains)
-      .describe("")
-      .defaultValues(true);
   LoadParam(root, "debugdraw", this, ScriptTrigger, setDebugDraw)
       .describe("")
@@ -136 +122 @@
 
 /**
- * Sets the target(a world entity) of the ScriptTrigger. If the distance between the target and this trigger is smaller than the radius, the script gets triggered.
- * @param target The worldentity that the script supervises.
- */
-void ScriptTrigger::setTarget(const std::string& target)
-{
-
-  WorldEntity* targetEntity = WorldEntity::objectList().getObject(target);
-  if (targetEntity != NULL)
-  {
-    this->setTarget(targetEntity);
-  }
-  else
-  {
-    PRINTF(2)("ERROR SCRTIPTTRIGGER : Target %s for %s::%s does not Exist\n", target.c_str(), this->getClassCName(), this->getCName());
-  }
-}
-
-/**
  * Sets the parent of the trigger.
- * @param parent The parrent.
+ * @param parent The parent.
  */
 void ScriptTrigger::setTriggerParent(const std::string& parent)
@@ -174 +142 @@
 void ScriptTrigger::tick(float timestep)
 {
-  if(scriptFinished) return;
-
-  if(activeOnCreation)
-   {
-     executeAction(timestep);
-     return;
-   }
-
- if(triggerRemains && scriptCalled)
-  {
-    executeAction(timestep);
-    return;
-  }
-
-  if( this->target != NULL)
-  {
-    if( !invert && this->distance(target) < radius)
-    {
-    //printf("Distance is %f \n", this->distance(target));
-    executeAction(timestep);
-    scriptCalled = true;
-    return;
-
-    }
-    else if( invert && this->distance(target) > radius)
-    {
-      executeAction(timestep);
-      scriptCalled = true;
-      return;
-    }
-  }
+
 }
 

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

@@ -33 +33 @@
 
     /// SET MEMBER
-    void setTarget(const std::string& targetName);
-    void setTarget(WorldEntity* target) { if(target!=NULL) this->target=target; }
-    void setTriggerParent(const std::string& name);
-    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; };
-    void setRadius(const float radius) { if(radius>0) this->radius = radius; }
     void setScript(const std::string& file);
     void setFunction(const std::string& function){ this->functionName = function;}
     void setDebugDraw(const bool draw) { this->doDebugDraw = draw; }
     void setAddToScript(const bool add) { this->addToScript = add; }
+    void setTriggerParent(const std::string& name);
 
     ///DRAWING
@@ -51 +47 @@
   private:
 
-    WorldEntity* target;
-    bool         triggerRemains;
     bool         activeOnCreation;
-    bool         invert;
-    float        radius;
     float        delay;
     Script*      script;
@@ -61 +53 @@
     bool         doDebugDraw;
     bool         addToScript;
+    
     //for internal use
     bool         scriptCalled;