Changeset 8205 in orxonox.OLD

Timestamp:

Jun 7, 2006, 5:06:47 PM (18 years ago)

Author:

snellen

Message:

ScriptTrigger now loads its parameters

Location:

branches/script_engine/src/lib/script_engine

Files:

• script_trigger.cc (modified) (4 diffs)
• script_trigger.h (modified) (3 diffs)

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

@@ -23 +23 @@
   WorldEntity ::loadParams(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 +29 @@
         .describe("the function of the script, that should be triggered by this script trigger")
         .defaultValues("");
-    LoadParam(root, "abs-coor", this, ScriptTrigger, setAbsCoord)
+    LoadParam(root, "abs-coor", this, ScriptTrigger, setAbsCoor)
         .describe("where this script trigger should be located")
         .defaultValues("");
@@ -38 +38 @@
         .describe("the delay after which the funtion sould be triggered")
         .defaultValues(0);
-    LoadParam(root, "worldentity", this, ScriptTrigger, setTargetName)
+    LoadParam(root, "worldentity", this, ScriptTrigger, setTarget)
         .describe("The name of the target as it is in the *.oxw file")
         .defaultValues("");
-    LoadParam(root, "worldentityisparent", this, ScriptTrigger, setIsParent)
+    LoadParam(root, "triggerparent", this, ScriptTrigger, setTriggerParent)
         .describe("The name of the target as it is in the *.oxw file")
         .defaultValues("");
 
-    }*/
+    }
  timer = delay;
 }
@@ -61 +61 @@
   {
     PRINTF(2)("Target %s for %s::%s does not Exist\n", target.c_str(), this->getClassName(), this->getName());
+  }
+}
+
+void ScriptTrigger::setTriggerParent(const std::string& parent)
+{
+  BaseObject* parentEntity = ClassList::getObject(parent, CL_WORLD_ENTITY);
+  
+  if (parentEntity != NULL)
+  {
+    this->setParent(dynamic_cast<WorldEntity*>(parentEntity));
+  }
+  else
+  {
+    PRINTF(2)("Parent %s for %s::%s does not Exist\n", parent.c_str(), this->getClassName(), this->getName());
   }
 }

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

@@ -22 +22 @@
     void setTarget(const std::string& targetName);
     void setTarget(WorldEntity* target) { if(target!=NULL) this->target=target; }
+    
+    void setTriggerParent(const std::string& name);
  
-    void setCallOnce(bool call) { this->callOnce = call;}
-    void setRadius(float radius) { if(radius>0) this->radius = radius;}
-    void setDelay(float time){if(delay>0) this->delay = delay;}
-    void setScript(std::string& script){this->scriptFile = script;}
-    void setFunction(std::string& function){this->functionName = function;}
+    void setCallOnce(const bool call) { this->callOnce = call;}
+    void setRadius(const float radius) { if(radius>0) this->radius = radius;}
+    void setDelay(const float time){if(delay>0) this->delay = delay;}
+    void setScript(const std::string& script){this->scriptFile = script;}
+    void setFunction(const std::string& function){this->functionName = function;}
 
     std::string getTargetName();
@@ -33 +35 @@
   private:
 
-    std::string  parentName;
     WorldEntity* target;
-    bool         worldEntityIsParent;
     bool         callOnce;
-    bool         scriptCalled;
     float        radius;
     float        delay;
@@ -43 +42 @@
     std::string  functionName;
 
-    bool callScript;
-    bool triggered;
-    float timer;
+    
+    bool         scriptCalled;
+    bool         callScript;
+    bool         triggered;
+    float        timer;
 
 };