Changeset 6537 for code/branches/gamestate/data

Timestamp:

Mar 16, 2010, 1:49:16 PM (14 years ago)

Author:

rgrieder

Message:

Linked every GUI sheet to exactly one InputState.
Also added util/TriBool that has states {true, false, Dontcare}.

Location:

code/branches/gamestate/data/gui/scripts

Files:

• BasicGUI.lua (modified) (3 diffs)
• DecisionPopup.lua (modified) (1 diff)
• InGameMenu.lua (modified) (1 diff)
• InfoPopup.lua (modified) (3 diffs)
• InitialiseGUI.lua (modified) (3 diffs)

code/branches/gamestate/data/gui/scripts/BasicGUI.lua

@@ -8 +8 @@
 end
 
--- useless?
+-- useless, even wrong? P is the class, not the object..
 P.overlay = nil
 
 -- constructor of the GUI
-function P:new(_filename, _visible, _gui)
+function P:new(_filename, _gui, _visible)
     local newElement = {
         filename = _filename,
@@ -23 +23 @@
 end
 
+-- Override this function if you need to
 function P:init()
--- this function is empty and intended for inheriting GUIs to use
+end
+
+-- Override this function if you need to
+-- But don't forget to stick to the naming convention ("GUI_" .. self.filename)
+function P:createInputState()
+    self.inputState = guiMgr:createInputState("GUI_" .. self.filename)
 end
 
@@ -41 +47 @@
 function P:load()
     self.window = winMgr:loadWindowLayout(self.filename .. ".layout")
+    self:createInputState()
     self:init()
     return self

code/branches/gamestate/data/gui/scripts/DecisionPopup.lua

@@ -7 +7 @@
 else
     _G[_REQUIREDNAME] = P
-end
-
-function P:init()
 end
 

code/branches/gamestate/data/gui/scripts/InGameMenu.lua

@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-
-function P:init()
-end
-
 
 -- events for ingamemenu

code/branches/gamestate/data/gui/scripts/InfoPopup.lua

@@ -8 +8 @@
 else
     _G[_REQUIREDNAME] = P
-end
-
-function P:init()
 end
 
@@ -23 +20 @@
 end
 
-function P.setText( text )
+function P.setText(text)
     winMgr:getWindow("orxonox/InfoPopup_text"):setText( text )
 end
@@ -39 +36 @@
 -- events for ingamemenu
 function P.close(e)
-    hideGUI("InfoPopup")
+    hideGUI(P.filename)
 end
 

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

@@ +1 @@
+winMgr   = CEGUI.WindowManager:getSingleton()
+guiMgr   = orxonox.GUIManager:getInstance()
+inputMgr = orxonox.InputManager:getInstance()
+
 local schemeMgr = CEGUI.SchemeManager:getSingleton()
-winMgr = CEGUI.WindowManager:getSingleton()
-local logger = CEGUI.Logger:getSingleton()
-local system = CEGUI.System:getSingleton()
-local cursor = CEGUI.MouseCursor:getSingleton()
+local system    = CEGUI.System:getSingleton()
+local cursor    = CEGUI.MouseCursor:getSingleton()
 
 schemeMgr:loadScheme("TaharezLookSkin.scheme")
@@ -87 +89 @@
     else
         if nrOfActiveSheets == 0 then
-            orxonox.InputManager:getInstance():enterState("guiMouseOnly")
+            --orxonox.InputManager:getInstance():enterState("guiMouseOnly")
             orxonox.HumanController:pauseControl()
         end
     end
+    orxonox.InputManager:getInstance():enterState(currentGUI.inputState)
+
     nrOfActiveSheets = nrOfActiveSheets + 1
     table.insert(activeSheets, filename)
@@ -161 +165 @@
     bHidePrevious[filename] = nil
     if nrOfActiveSheets == 0 then
-        orxonox.InputManager:getInstance():leaveState("guiMouseOnly")
+        --orxonox.InputManager:getInstance():leaveState("guiMouseOnly")
         orxonox.HumanController:resumeControl()
         hideCursor()
     end
+    orxonox.InputManager:getInstance():leaveState(currentGUI.inputState)
 end