Changeset 1653 for code/branches/gui/src/orxonox/gui/GUIManager.cc

Timestamp:

Aug 5, 2008, 9:50:26 PM (16 years ago)

Author:

rgrieder

Message:

• getInstance is probably more suitable than getSingleton (as x3n has already done so in most of his classes) I changed it in Orxonox and GraphicsEngine. Maybe more to come.
• Removed derivation from BaseObject in InputState (templates work well too, don't need a factory at all)

File:

• code/branches/gui/src/orxonox/gui/GUIManager.cc (modified) (4 diffs)

code/branches/gui/src/orxonox/gui/GUIManager.cc

@@ -29 +29 @@
 /**
     @file
-    @brief Implementation of the GUIManager class.
+    @brief
+        Implementation of the GUIManager class.
 */
 
@@ -120 +121 @@
             {
                 // get the render window
-                renderWindow_ = GraphicsEngine::getSingleton().getRenderWindow();
+                renderWindow_ = GraphicsEngine::getInstance().getRenderWindow();
 
                 // Full screen viewport with Z order = 0 (top most). Don't yet feed a camera (so nothing gets rendered)
@@ -150 +151 @@
 
                 // register us as input handler
-                SimpleInputState* state = InputManager::getInstance().createSimpleInputState("gui", 30);
+                SimpleInputState* state = InputManager::getInstance().createInputState<SimpleInputState>("gui", 30);
                 state->setHandler(this);
                 state->setJoyStickHandler(new EmptyHandler());
@@ -159 +160 @@
             catch (CEGUI::Exception& ex)
             {
-#if CEGUI_VERSION_MINOR < 6
+#if CEGUI_VERSION_MAJOR == 0 && CEGUI_VERSION_MINOR < 6
                 throw GeneralException(ex.getMessage().c_str());
 #else