Changeset 10035 for code/branches

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

Files:

• data/gui/scripts/testscript.lua (added)
• data/levels/levelTry.oxw (modified) (2 diffs)
• src/orxonox/controllers/ControllerDirector.cc (modified) (3 diffs)
• src/orxonox/controllers/testscript.lua (added)

code/branches/ScriptableController/data/levels/levelTry.oxw

@@ -1 +1 @@
 <!-- First levelFile of mkronig and samuezu. It was copied from dockingToASpaceStation.oxw and modified a little bit -->
 <LevelInfo
- name = "Fancy orxout tests"
+ name = "levelTry"
  description = "Docking into a spacestation."
  tags = "showcase"
@@ -81 +81 @@
     <ControllerDirector position="0,0,0">
         <events>
-            <party>
+            <takeControl>
                 <EventListener event="takeControl" />
-            </party>
+            </takeControl>
 
         </events>

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 @@
 
     }
+*/