Changeset 8199 in orxonox.OLD

Timestamp:

Jun 7, 2006, 3:37:12 PM (18 years ago)

Author:

snellen

Message:

setTarget should work

Location:

branches/script_engine/src/lib/script_engine

Files:

• script.cc (modified) (2 diffs)
• script_trigger.cc (modified) (2 diffs)
• script_trigger.h (modified) (1 diff)

branches/script_engine/src/lib/script_engine/script.cc

@@ -24 +24 @@
   if (root != NULL)
     this->loadParams(root);
-
 }
 
@@ -37 +36 @@
 void Script::loadParams(const TiXmlElement* root)
 {
+  BaseObject::loadParams(root);
+  
   LOAD_PARAM_START_CYCLE(root, object);
   {

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

@@ -16 +16 @@
 void ScriptTrigger::loadParams(const TiXmlElement* root)
 {
+  WorldEntity::loadParams(root);
+  
    /*{ LoadParam(root, "file", this, ScriptTrigger, setScript)
         .describe("the fileName of the script, that should be triggered by this script trigger")
@@ -43 +45 @@
 
 
+void ScriptTrigger::setTarget(const std::string& target)
+{
+  BaseObject* targetEntity = ClassList::getObject(target, CL_WORLD_ENTITY);
+  
+  if (targetEntity != NULL)
+  {
+    this->setTarget(dynamic_cast<WorldEntity*>(targetEntity));
+  }
+  else
+  {
+    PRINTF(2)("Target %s for %s::%s does not Exist\n", taget.c_str(), this->getClassName(), this->getName());
+  }
+}
 
 void ScriptTrigger::tick(float timestep)

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

@@ -19 +19 @@
     virtual void executeAction();
 
-    void setTarget(WorldEntity* target){ if(target!=NULL) this->target=target;if(worldEntityIsParent)this->setParent(target);}
-    void setTargetName(std::string& name){this->targetName = name;}
+    
+    void setTarget(const std::string& targetName);
+    
+    void setTarget(WorldEntity* target) { if(target!=NULL) this->target=target;if(worldEntityIsParent)this->setParent(target); }
+    void setTargetName(std::string& name){ this->targetName = name; }
     void setCallOnce(bool call) { this->callOnce = call;}
     void setRadius(float radius) { if(radius>0) this->radius = radius;}