Changeset 10035 for code/branches/ScriptableController/src/orxonox

Timestamp:

Apr 17, 2014, 2:27:35 PM (11 years ago)

Author:

mkronig

Message:

changes on controllerDirector and added some new lua scripts

Location:

code/branches/ScriptableController/src/orxonox/controllers

Files:

• ControllerDirector.cc (modified) (3 diffs)
• testscript.lua (added)

code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc

@@ -11 +11 @@
 #include "interfaces/PlayerTrigger.h"
 #include "worldentities/pawns/Pawn.h"
-#include "LuaState.h"
+#include "core/LuaState.h"
 
 
@@ -51 +51 @@
     void ControllerDirector::takeControl(Controller * controller, BaseObject * trigger) {
 
-        preparationToTakeControl(trigger);
-        setNewController(controller);
-        LuaState test = new Luastate();
-        test.doFile("/tmp/my.lua");
+       // preparationTo(trigger);
+       // setNewController(controller);
+        LuaState * test = new LuaState();
+        orxout()<<"test takecontrol."<< endl;
+        test->doFile("testscript.lua");
         
     } 
 
         
-    bool ControllerDirector::preparationToTakeControl(BaseObject * trigger) {
+    /*bool ControllerDirector::preparationToTakeControl(BaseObject * trigger) {
 
             this->pTrigger_ = orxonox_cast<PlayerTrigger*>(trigger);
@@ -98 +99 @@
 
     }
+*/