[Orxonox-commit 5372] r10035 - in code/branches/ScriptableController: data/gui/scripts data/levels src/orxonox/controllers

[mkronig at orxonox.net]

Author: mkronig
Date: 2014-04-17 14:27:35 +0200 (Thu, 17 Apr 2014)
New Revision: 10035

Added:
   code/branches/ScriptableController/data/gui/scripts/testscript.lua
   code/branches/ScriptableController/src/orxonox/controllers/testscript.lua
Modified:
   code/branches/ScriptableController/data/levels/levelTry.oxw
   code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc
Log:
changes on controllerDirector and added some new lua scripts

Added: code/branches/ScriptableController/data/gui/scripts/testscript.lua
===================================================================
--- code/branches/ScriptableController/data/gui/scripts/testscript.lua	                        (rev 0)
+++ code/branches/ScriptableController/data/gui/scripts/testscript.lua	2014-04-17 12:27:35 UTC (rev 10035)
@@ -0,0 +1,5 @@
+k = 1.2
+
+
+orxonox.execute("orxout message test " .. k)
+

Modified: code/branches/ScriptableController/data/levels/levelTry.oxw
===================================================================
--- code/branches/ScriptableController/data/levels/levelTry.oxw	2014-04-17 12:24:12 UTC (rev 10034)
+++ code/branches/ScriptableController/data/levels/levelTry.oxw	2014-04-17 12:27:35 UTC (rev 10035)
@@ -1,6 +1,6 @@
 <!-- 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"
  screenshot = "emptylevel.png"
@@ -80,9 +80,9 @@
 <!-- ControllerDirector waits for the event takeControl to attach a new Controller -->
     <ControllerDirector position="0,0,0">
         <events>
-            <party>
+            <takeControl>
                 <EventListener event="takeControl" />
-            </party>
+            </takeControl>
 
         </events>
 

Modified: code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc
===================================================================
--- code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc	2014-04-17 12:24:12 UTC (rev 10034)
+++ code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc	2014-04-17 12:27:35 UTC (rev 10035)
@@ -10,7 +10,7 @@
 #include "infos/HumanPlayer.h"
 #include "interfaces/PlayerTrigger.h"
 #include "worldentities/pawns/Pawn.h"
-#include "LuaState.h"
+#include "core/LuaState.h"
 
 
 namespace orxonox
@@ -50,15 +50,16 @@
 
     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);
         this->player_ = NULL;
@@ -97,6 +98,7 @@
 
 
     }
+*/
        
     
 

Added: code/branches/ScriptableController/src/orxonox/controllers/testscript.lua
===================================================================
--- code/branches/ScriptableController/src/orxonox/controllers/testscript.lua	                        (rev 0)
+++ code/branches/ScriptableController/src/orxonox/controllers/testscript.lua	2014-04-17 12:27:35 UTC (rev 10035)
@@ -0,0 +1 @@
+print	('1: Hello World')