[Orxonox-commit 1481] r6199 - in code/branches/presentation2: data/gui/scripts src/orxonox src/orxonox/controllers

[scheusso at orxonox.net]

Author: scheusso
Date: 2009-12-02 15:12:29 +0100 (Wed, 02 Dec 2009)
New Revision: 6199

Modified:
   code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua
   code/branches/presentation2/src/orxonox/CMakeLists.txt
   code/branches/presentation2/src/orxonox/controllers/HumanController.h
Log:
hide controller overlay when in gui mode


Modified: code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua	2009-12-02 14:06:43 UTC (rev 6198)
+++ code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua	2009-12-02 14:12:29 UTC (rev 6199)
@@ -83,6 +83,7 @@
     else
         if nrOfActiveSheets == 0 then
             orxonox.InputManager:getInstance():enterState("guiMouseOnly")
+            orxonox.HumanController:pauseControl()
         end
     end
     nrOfActiveSheets = nrOfActiveSheets + 1
@@ -156,6 +157,7 @@
     bHidePrevious[filename] = nil
     if nrOfActiveSheets == 0 then
         orxonox.InputManager:getInstance():leaveState("guiMouseOnly")
+        orxonox.HumanController:resumeControl()
         hideCursor()
     end
 end

Modified: code/branches/presentation2/src/orxonox/CMakeLists.txt
===================================================================
--- code/branches/presentation2/src/orxonox/CMakeLists.txt	2009-12-02 14:06:43 UTC (rev 6198)
+++ code/branches/presentation2/src/orxonox/CMakeLists.txt	2009-12-02 14:12:29 UTC (rev 6199)
@@ -56,6 +56,7 @@
   TOLUA_FILES
     LevelManager.h
     MoodManager.h
+    controllers/HumanController.h
     pickup/BaseItem.h
     pickup/PickupInventory.h
     sound/SoundManager.h

Modified: code/branches/presentation2/src/orxonox/controllers/HumanController.h
===================================================================
--- code/branches/presentation2/src/orxonox/controllers/HumanController.h	2009-12-02 14:06:43 UTC (rev 6198)
+++ code/branches/presentation2/src/orxonox/controllers/HumanController.h	2009-12-02 14:12:29 UTC (rev 6199)
@@ -34,10 +34,13 @@
 #include "tools/interfaces/Tickable.h"
 #include "Controller.h"
 
+// tolua_begin
 namespace orxonox
 {
-    class _OrxonoxExport HumanController : public Controller, public Tickable
-    {
+    class _OrxonoxExport HumanController 
+// tolua_end
+        : public Controller, public Tickable
+    { // tolua_export
         public:
             HumanController(BaseObject* creator);
             virtual ~HumanController();
@@ -74,8 +77,8 @@
             static void addBots(unsigned int amount);
             static void killBots(unsigned int amount = 0);
 
-            static void pauseControl();
-            static void resumeControl();
+            static void pauseControl(); // tolua_export
+            static void resumeControl(); // tolua_export
             virtual void doPauseControl() {};
             virtual void doResumeControl() {};
 
@@ -88,7 +91,7 @@
         protected:
             static HumanController* localController_s;
             bool controlPaused_;
-    };
-}
+    }; // tolua_export
+} // tolua_export
 
 #endif /* _HumanController_H__ */