Changeset 1653 for code/branches/gui/src/core/input/InputManager.h

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/core/input/InputManager.h (modified) (1 diff)

code/branches/gui/src/core/input/InputManager.h

@@ -102 +102 @@
         void setWindowExtents(const int width, const int height);
 
-        SimpleInputState*   createSimpleInputState  (const std::string& name, int priority);
-        ExtendedInputState* createExtendedInputState(const std::string& name, int priority);
-        InputState*         createInputState(const std::string& type, const std::string &name, int priority);
+        template <class T>
+        T* createInputState(const std::string& name, int priority)
+        {
+            T* state = new T;
+            if (_configureInputState(state, name, priority))
+                return state;
+            else
+            {
+                delete state;
+                return 0;
+            }
+        }
+
         bool destroyState          (const std::string& name);
         InputState* getState       (const std::string& name);