Changeset 6199

Timestamp:

Dec 2, 2009, 3:12:29 PM (14 years ago)

Author:

scheusso

Message:

hide controller overlay when in gui mode

Location:

code/branches/presentation2

Files:

• data/gui/scripts/InitialiseGUI.lua (modified) (2 diffs)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/controllers/HumanController.h (modified) (3 diffs)

code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua

@@ -84 +84 @@
         if nrOfActiveSheets == 0 then
             orxonox.InputManager:getInstance():enterState("guiMouseOnly")
+            orxonox.HumanController:pauseControl()
         end
     end
@@ -157 +158 @@
     if nrOfActiveSheets == 0 then
         orxonox.InputManager:getInstance():leaveState("guiMouseOnly")
+        orxonox.HumanController:resumeControl()
         hideCursor()
     end

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

@@ -57 +57 @@
     LevelManager.h
     MoodManager.h
+    controllers/HumanController.h
     pickup/BaseItem.h
     pickup/PickupInventory.h

code/branches/presentation2/src/orxonox/controllers/HumanController.h

@@ -35 +35 @@
 #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);
@@ -75 +78 @@
             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() {};
@@ -89 +92 @@
             static HumanController* localController_s;
             bool controlPaused_;
-    };
-}
+    }; // tolua_export
+} // tolua_export
 
 #endif /* _HumanController_H__ */