Changeset 10045 for code/branches

Timestamp:

May 6, 2014, 4:02:07 PM (11 years ago)

Author:

smerkli

Message:

Fixed the lua stuff, can now call ScriptController functions from lua.

Location:

code/branches/ScriptableController

Files:

• data/gui/scripts/testscript.lua (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/controllers/ScriptController.cc (modified) (2 diffs)
• src/orxonox/controllers/ScriptController.h (modified) (1 diff)

code/branches/ScriptableController/data/gui/scripts/testscript.lua

@@ -8 +8 @@
 
 
-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")
 
 
-

code/branches/ScriptableController/src/orxonox/CMakeLists.txt

@@ -64 +64 @@
     infos/PlayerInfo.h
     sound/SoundManager.h
+    controllers/ScriptController.h
   PCH_FILE
     OrxonoxPrecompiledHeaders.h

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

@@ -30 +30 @@
 #include "core/CoreIncludes.h"
 #include "worldentities/ControllableEntity.h"
+#include "core/LuaState.h"
 #include <cmath>
 
@@ -64 +65 @@
     }
 
+    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 )
     {

code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h

@@ -59 +59 @@
 
            
-            const Vector3& getPosition();
+            static ScriptController* getScriptController();
             
               /* virtual void tick(float dt);*/ 
 
             // tolua_end
+            const Vector3& getPosition();
 
         private: