Switch input to lowercase namespace

src/input/EventDispatcher.cpp

@@ -26,7 +26,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "EventDispatcher.h"
 #include "Exceptions.h"
 
-namespace Crown
+namespace crown
 {
 
 void EventDispatcher::AddMouseListener(MouseListener* listener)
@@ -139,5 +139,5 @@ void EventDispatcher::TouchCancel(const TouchEvent& event)
 	}
 }
 
-} // namespace Crown
+} // namespace crown
 

src/input/EventDispatcher.h

@@ -30,7 +30,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "Keyboard.h"
 #include "Touch.h"
 
-namespace Crown
+namespace crown
 {
 
 class EventDispatcher : public MouseListener, public KeyboardListener, public TouchListener
@@ -92,5 +92,5 @@ private:
 	TouchListenerList mTouchListenerList;
 };
 
-} // namespace Crown
+} // namespace crown
 

src/input/InputManager.cpp

@@ -24,72 +24,21 @@ OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "InputManager.h"
-#include "Config.h"
-#include "Exceptions.h"
-#include "Device.h"
+#include "OS.h"
 
-#if defined(LINUX)
-	#include "X11InputManager.h"
-	#if defined (CROWN_USE_OPENGL)
-		#include "GLXRenderWindow.h"
-	#elif defined(CROWN_USE_OPENGLES)
-		#include "EGLRenderWindow.h"
-	#endif
-#elif defined(WINDOWS) && defined(CROWN_USE_OPENGL)
-	#include "WinInputManager.h"
-	#include "WGLRenderWindow.h"
-#elif defined(CROWN_OS_ANDROID)
-	#include "AndroidInputManager.h"
-	#include "EGLRenderWindow.h"
-#endif
-
-namespace Crown
+namespace crown
 {
 
-InputManager* InputManager::CreateInputManager(RenderWindow* window)
+void InputManager::EventLoop()
 {
-	InputManager* manager = NULL;
-	EventSource source;
-
-	if (window == NULL)
-	{
-		throw NullPointerException("InputManager::CreateInputManager: window == NULL");
-	}
-
-	#if defined(LINUX)
-		manager = new X11InputManager;
-		#if defined(CROWN_USE_OPENGL)
-			source.WindowHandle = static_cast<GLXRenderWindow*>(window)->GetXWindow();
-		#elif defined(CROWN_USE_OPENGLES)
-			source.WindowHandle = static_cast<EGLRenderWindow*>(window)->GetXWindow();
-		#endif
-	#elif defined(WINDOWS) && defined(CROWN_USE_OPENGL)
-		manager = new WinInputManager;
-		source.WindowHandle = (unsigned long)(static_cast<WGLRenderWindow*>(window)->GetWindowHandle());
-	#elif defined(CROWN_OS_ANDROID)
-		manager = new AndroidInputManager;
-		source.AndroidApp = GetDevice()->_GetAndroidApp();
-	#else
-		#error "No operating system selected."
-	#endif
-
-	if (manager)
-	{
-		manager->Init(source);
-	}
-
-	return manager;
+	//TODO do the hard job here...
 }
 
-void InputManager::DestroyInputManager(InputManager* manager)
+InputManager inputManager;
+InputManager* GetInputManager()
 {
-	if (manager == NULL)
-	{
-		throw NullPointerException("InputManager::DestroyInputManager: manager == NULL");
-	}
-
-	delete manager;
+	return &inputManager;
 }
 
-} // namespace Crown
+} // namespace crown
 

src/input/InputManager.h

@@ -27,68 +27,58 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "EventDispatcher.h"
 
-struct android_app;
-
-namespace Crown
+namespace crown
 {
 
-union EventSource
-{
-	unsigned long WindowHandle;
-	android_app* AndroidApp;
-};
-
 class Mouse;
 class Keyboard;
 class Touch;
 class MouseListener;
 class KeyboardListener;
 class TouchListener;
-class RenderWindow;
 
 class InputManager
 {
 
 public:
 
-	static InputManager* CreateInputManager(RenderWindow* window);
-	static void DestroyInputManager(InputManager* manager);
-
 	/**
 		Constructor.
 	*/
-	InputManager() : mMouse(NULL), mKeyboard(NULL), mTouch(NULL) {}
+	InputManager() : mMouse(NULL), mKeyboard(NULL), mTouch(NULL)
+	{
+	}
 
 	/**
 		Destructor.
 	*/
-	virtual ~InputManager() {}
+	~InputManager() {}
 
 	/**
 		Initializes the input manager.
 	*/
-	virtual void Init(const EventSource& source) = 0;
+	void Init();
 
 	/**
 		Returns whether the mouse is available.
 	@return
 		True if available, false otherwise
 	*/
-	virtual bool IsMouseAvailable() = 0;
+	bool IsMouseAvailable() {}
 
 	/**
 		Returns whether the keyboard is available.
 	@return
 		True if available, false otherwise
 	*/
-	virtual bool IsKeyboardAvailable() = 0;
+	bool IsKeyboardAvailable() {}
 
 	/**
 		Returns whether the touch is available.
 	@return
 		True if available, false otherwise
 	*/
-	virtual bool IsTouchAvailable() = 0;
+	bool IsTouchAvailable() {}
 
 	/**
 		Returns the handle to the mouse input device.
@@ -122,17 +112,17 @@ public:
 
 	inline void RegisterMouseListener(MouseListener* listener)
 	{
-		mEventDispatcher.AddMouseListener(listener);
+		//mEventDispatcher.AddMouseListener(listener);
 	}
 
 	inline void RegisterKeyboardListener(KeyboardListener* listener)
 	{
-		mEventDispatcher.AddKeyboardListener(listener);
+		//mEventDispatcher.AddKeyboardListener(listener);
 	}
 
 	inline void RegisterTouchListener(TouchListener* listener)
 	{
-		mEventDispatcher.AddTouchListener(listener);
+		//mEventDispatcher.AddTouchListener(listener);
 	}
 
 	inline EventDispatcher* GetEventDispatcher()
@@ -140,13 +130,18 @@ public:
 		return &mEventDispatcher;
 	}
 
+	void EventLoop();
+
 protected:
 
-	EventDispatcher mEventDispatcher;
-	Mouse* mMouse;
-	Keyboard* mKeyboard;
-	Touch* mTouch;
+	EventDispatcher		mEventDispatcher;
+
+	Mouse*				mMouse;
+	Keyboard*			mKeyboard;
+	Touch*				mTouch;
 };
 
-} // namespace Crown
+InputManager* GetInputManager();
+
+} // namespace crown
 

src/input/KeyCode.h

@@ -25,7 +25,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-namespace Crown
+namespace crown
 {
 
 /**
@@ -96,5 +96,5 @@ enum KeyCode
 
 typedef uchar Key;
 
-} // namespace Crown
+} // namespace crown
 

src/input/Keyboard.h

@@ -30,7 +30,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #define MAX_KEYCODES 256
 
-namespace Crown
+namespace crown
 {
 
 class InputManager;
@@ -129,5 +129,5 @@ protected:
 	KeyboardListener* mListener;
 };
 
-} // namespace Crown
+} // namespace crown
 

src/input/Mouse.h

@@ -28,7 +28,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "Point2.h"
 #include "Vec2.h"
 
-namespace Crown
+namespace crown
 {
 
 class InputManager;
@@ -164,5 +164,5 @@ protected:
 	MouseListener* mListener;
 };
 
-} // namespace Crown
+} // namespace crown
 

src/input/Touch.h

@@ -25,7 +25,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-namespace Crown
+namespace crown
 {
 
 class InputManager;