[Orxonox-commit 5382] r10045 - in code/branches/ScriptableController: data/gui/scripts src/orxonox src/orxonox/controllers

[smerkli at orxonox.net]

Author: smerkli
Date: 2014-05-06 16:02:07 +0200 (Tue, 06 May 2014)
New Revision: 10045

Modified:
   code/branches/ScriptableController/data/gui/scripts/testscript.lua
   code/branches/ScriptableController/src/orxonox/CMakeLists.txt
   code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc
   code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h
Log:
Fixed the lua stuff, can now call ScriptController functions from lua.


Modified: code/branches/ScriptableController/data/gui/scripts/testscript.lua
===================================================================
--- code/branches/ScriptableController/data/gui/scripts/testscript.lua	2014-05-06 09:07:07 UTC (rev 10044)
+++ code/branches/ScriptableController/data/gui/scripts/testscript.lua	2014-05-06 14:02:07 UTC (rev 10045)
@@ -7,7 +7,20 @@
 z = 3.3
 
 
-orxonox.ScriptController:moveToPosition(x, y, z)
+local ctrl = orxonox.ScriptController:getScriptController()
+--orxonox.ScriptController:moveToPosition(x, y, z)
+--ctrl.moveToPosition(x,y,z)
 
+local docks = orxonox.Dock:getNumberOfActiveDocks()
+local docklist = {}
+for i = 0, docks-1 do
+  table.insert(docklist, orxonox.Dock:getActiveDockAtIndex(i))
+end
+local dock = docklist[1]
+if dock ~= nil then
+    dock:dock()
+end
 
+--orxonox.execute("setPause 1")
 
+

Modified: code/branches/ScriptableController/src/orxonox/CMakeLists.txt
===================================================================
--- code/branches/ScriptableController/src/orxonox/CMakeLists.txt	2014-05-06 09:07:07 UTC (rev 10044)
+++ code/branches/ScriptableController/src/orxonox/CMakeLists.txt	2014-05-06 14:02:07 UTC (rev 10045)
@@ -63,6 +63,7 @@
     controllers/HumanController.h
     infos/PlayerInfo.h
     sound/SoundManager.h
+    controllers/ScriptController.h
   PCH_FILE
     OrxonoxPrecompiledHeaders.h
   LINK_LIBRARIES

Modified: code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc
===================================================================
--- code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc	2014-05-06 09:07:07 UTC (rev 10044)
+++ code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc	2014-05-06 14:02:07 UTC (rev 10045)
@@ -29,6 +29,7 @@
 #include "ScriptController.h"
 #include "core/CoreIncludes.h"
 #include "worldentities/ControllableEntity.h"
+#include "core/LuaState.h"
 #include <cmath>
 
 namespace orxonox
@@ -63,6 +64,22 @@
         return this->controlled->getPosition();
     }
 
+    ScriptController* ScriptController::getScriptController()
+    {
+      orxout() << "Great success!" << std::endl;
+      for(ObjectList<ScriptController>::iterator it = 
+        ObjectList<ScriptController>::begin(); 
+        it != ObjectList<ScriptController>::end(); ++it)
+      { 
+        // TODO: do some selection here. Currently just returns the first one
+        return *it; 
+      
+      }
+      return NULL;
+    }
+
+
+
     void ScriptController::moveToPosition_beta(float x, float y, float z )
     {
 

Modified: code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h
===================================================================
--- code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h	2014-05-06 09:07:07 UTC (rev 10044)
+++ code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h	2014-05-06 14:02:07 UTC (rev 10045)
@@ -58,11 +58,12 @@
             void moveToPosition_beta(float x, float y, float z);
 
            
-            const Vector3& getPosition();
+            static ScriptController* getScriptController();
             
               /* virtual void tick(float dt);*/ 
 
             // tolua_end
+            const Vector3& getPosition();
 
         private:
         	std::string luasrc;		// name of the LUA-sourcefile that shall be executed->see XMLPort-function