Changeset 10614 in orxonox.OLD

Timestamp:

Mar 30, 2007, 11:35:30 AM (17 years ago)

Author:

snellen

Message:

addToScript schould work now

Location:

branches/scriptimprovements/src/world_entities/script_triggers

Files:

• script_trigger.cc (modified) (1 diff)
• script_trigger.h (modified) (4 diffs)
• space_trigger.cc (modified) (2 diffs)
• tick_trigger.cc (modified) (1 diff)

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

@@ -41 +41 @@
   executionStopped = false; // true when something goes wrong and the trigger has to be stopped
   addToScript = false;
-
-
-  if(root != NULL)
-  {
-
-    loadParams(root);
-
-    if(addToScript && scriptIsOk)
-    {
-      script->addObject( "ScriptTrigger", this->getName());
-    }
-
-  }
 
 }

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

@@ -11 +11 @@
 #include "world_entity.h"
 #include "loading/load_param.h"
-#include "vector.h"
 #include "script_manager.h"
 #include "script.h"
-#include "script_class.h"
+
 
 class ScriptTrigger : public WorldEntity
@@ -28 +27 @@
 
     /// DO WORK
-    virtual void tick(float timestep){}
+    virtual void tick(float timestep) = 0;
     virtual void executeAction(float timestep);
     void testScriptingFramework();
@@ -48 +47 @@
     std::string  functionName;
     bool         doDebugDraw;
-    bool         addToScript;
+   
     
     //for internal use
@@ -59 +58 @@
     bool         scriptIsOk;
     bool         scriptFinished;
+    bool         addToScript;
 
 };

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

@@ -30 +30 @@
                             ->addMethod("setName", Executor1<BaseObject, lua_State*, const std::string&>(&BaseObject::setName))
                             ->addMethod("setTarget", Executor1<SpaceTrigger, lua_State*, const std::string&>(&SpaceTrigger::setTarget))
-                            ->addMethod("setTriggerParent", Executor1<SpaceTrigger, lua_State*, const std::string&>(&SpaceTrigger::setTriggerParent))
+                            ->addMethod("setTriggerParent", Executor1<ScriptTrigger, lua_State*, const std::string&>(&ScriptTrigger::setTriggerParent))
                             ->addMethod("setTriggerRemains", Executor1<SpaceTrigger, lua_State*, bool>(&SpaceTrigger::setTriggerRemains))
                             ->addMethod("setInvert", Executor1<SpaceTrigger, lua_State*, bool>(&SpaceTrigger::setInvert))
                             ->addMethod("setRadius", Executor1<SpaceTrigger, lua_State*, float>(&SpaceTrigger::setRadius))
-                            ->addMethod("setScript", Executor1<SpaceTrigger, lua_State*, const std::string&>(&SpaceTrigger::setScript))
-                            ->addMethod("setFunction", Executor1<SpaceTrigger, lua_State*, const std::string&>(&SpaceTrigger::setFunction))
-                            ->addMethod("setDebugDraw", Executor1<SpaceTrigger, lua_State*, bool>(&SpaceTrigger::setDebugDraw))
-                            ->addMethod("setAddToScript", Executor1<SpaceTrigger, lua_State*, bool>(&SpaceTrigger::setAddToScript))
+                            ->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))
                        );
 
@@ -55 +55 @@
   triggerRemains = true;
  
+   if(root != NULL)
+  {
+    loadParams(root);
 
+    if(addToScript && scriptIsOk)
+    {
+      script->addObject( "SpaceTrigger", this->getName());
+    }
+
+  }
 
 }

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

@@ -45 +45 @@
   this->toList(OM_COMMON);
 
+  if(root != NULL)
+   {
+    loadParams(root);
+
+    if(addToScript && scriptIsOk)
+    {
+      script->addObject( "TickTrigger", this->getName());
+    }
+
+   }
+
 }