Removing Input mouse/key callbacks

CamelotClient/CamelotClient.cpp

@@ -30,9 +30,9 @@
 #include "CmRTTIType.h"
 #include "CmCursor.h"
 
-//#define DX11
+#define DX11
 //#define DX9
-#define GL
+//#define GL
 
 using namespace CamelotFramework;
 using namespace BansheeEditor;

CamelotClient/CmDebugCamera.cpp

@@ -18,8 +18,7 @@ namespace CamelotFramework
 	const float DebugCamera::ROTATION_SPEED = 0.5f; // Degrees/pixel
 
 	DebugCamera::DebugCamera(const HSceneObject& parent)
-		:Component(parent), mGoingForward(false), mGoingBack(false), mGoingLeft(false), mGoingRight(false), 
-		mFastMove(false), mCameraRotating(false), mPitch(0.0f), mYaw(0.0f)
+		:Component(parent), mPitch(0.0f), mYaw(0.0f)
 	{
 		mCamera = sceneObject()->getComponent<Camera>();
 		mCamera->setNearClipDistance(5);
@@ -29,76 +28,29 @@ namespace CamelotFramework
 
 		sceneObject()->setPosition(Vector3(0,0,0));
 		sceneObject()->lookAt(Vector3(0,0,-1));
-
-		gInput().onKeyDown.connect(boost::bind(&DebugCamera::keyDown, this, _1));
-		gInput().onKeyUp.connect(boost::bind(&DebugCamera::keyUp, this, _1));
-
-		gInput().onMouseDown.connect(boost::bind(&DebugCamera::mouseDown, this, _1, _2));
-		gInput().onMouseUp.connect(boost::bind(&DebugCamera::mouseUp, this, _1, _2));
-	}
-
-	void DebugCamera::keyDown(KeyCode keyCode)
-	{
-		if (keyCode == KC_W || keyCode == KC_UP) 
-			mGoingForward = true;
-		else if (keyCode == KC_S || keyCode== KC_DOWN) 
-			mGoingBack = true;
-		else if (keyCode == KC_A || keyCode == KC_LEFT) 
-			mGoingLeft = true;
-		else if (keyCode == KC_D || keyCode == KC_RIGHT) 
-			mGoingRight = true;
-		else if (keyCode == KC_LSHIFT) 
-			mFastMove = true;
-	}
-
-	void DebugCamera::keyUp(KeyCode keyCode)
-	{
-		if (keyCode == KC_W || keyCode == KC_UP) 
-			mGoingForward = false;
-		else if (keyCode == KC_S || keyCode== KC_DOWN) 
-			mGoingBack = false;
-		else if (keyCode == KC_A || keyCode == KC_LEFT) 
-			mGoingLeft = false;
-		else if (keyCode == KC_D || keyCode == KC_RIGHT) 
-			mGoingRight = false;
-		else if (keyCode == KC_LSHIFT) 
-			mFastMove = false;
-	}
-
-	void DebugCamera::mouseDown(const MouseEvent& event, MouseButton buttonID)
-	{
-		if(buttonID == MB_Right)
-		{
-			mCameraRotating = true;
-
-			Cursor::hide();
-		}
-	}
-
-	void DebugCamera::mouseUp(const MouseEvent& event, MouseButton buttonID)
-	{
-		if(buttonID == MB_Right)
-		{
-			mCameraRotating = false;
-
-			Cursor::show();
-		}
 	}
 
 	void DebugCamera::update()
 	{
+		bool goingForward = gInput().isKeyDown(KC_W) || gInput().isKeyDown(KC_UP);
+		bool goingBack = gInput().isKeyDown(KC_S) || gInput().isKeyDown(KC_DOWN);
+		bool goingLeft = gInput().isKeyDown(KC_A) || gInput().isKeyDown(KC_LEFT);
+		bool goingRight = gInput().isKeyDown(KC_D) || gInput().isKeyDown(KC_RIGHT);
+		bool fastMove = gInput().isKeyDown(KC_LSHIFT);
+		bool camRotating = gInput().isButtonDown(MB_Right);
+
 		Vector3 direction = Vector3::ZERO;
-		if (mGoingForward) direction += SO()->getForward();
-		if (mGoingBack) direction -= SO()->getForward();
-		if (mGoingRight) direction += SO()->getRight();
-		if (mGoingLeft) direction -= SO()->getRight();
+		if (goingForward) direction += SO()->getForward();
+		if (goingBack) direction -= SO()->getForward();
+		if (goingRight) direction += SO()->getRight();
+		if (goingLeft) direction -= SO()->getRight();
 
 		if (direction.squaredLength() != 0)
 		{
 			direction.normalize();
 
 			float multiplier = 1.0f;
-			if(mFastMove)
+			if(fastMove)
 				multiplier = FAST_MODE_MULTIPLIER;
 
 			mCurrentSpeed = Math::Clamp(mCurrentSpeed + ACCELERATION * gTime().getFrameDelta(), START_SPEED, TOP_SPEED);
@@ -116,7 +68,7 @@ namespace CamelotFramework
 			SO()->move(velocity * gTime().getFrameDelta());
 		}
 
-		if(mCameraRotating)
+		if(camRotating)
 		{
 			mYaw += Degree(gInput().getHorizontalAxis() * ROTATION_SPEED);
 			mPitch += Degree(gInput().getVerticalAxis() * ROTATION_SPEED);

CamelotClient/CmDebugCamera.h

@@ -12,24 +12,11 @@ namespace CamelotFramework
 	private:
 		float mCurrentSpeed;
 
-		bool mGoingForward;
-		bool mGoingBack;
-		bool mGoingLeft;
-		bool mGoingRight;
-		bool mFastMove;
-		bool mCameraRotating;
-
 		Degree mPitch;
 		Degree mYaw;
 
 		BS::HCamera mCamera;
 
-		void keyDown(CamelotFramework::KeyCode keyCode);
-		void keyUp(CamelotFramework::KeyCode keyCode);
-
-		void mouseDown(const CamelotFramework::MouseEvent& event, CamelotFramework::MouseButton buttonID);
-		void mouseUp(const CamelotFramework::MouseEvent& event, CamelotFramework::MouseButton buttonID);
-
 		static const float START_SPEED;
 		static const float TOP_SPEED;
 		static const float ACCELERATION;

CamelotCore/Include/CmInput.h

@@ -13,13 +13,6 @@ namespace CamelotFramework
 		Input();
 		~Input();
 
-		boost::signal<void(KeyCode)> onKeyDown;
-		boost::signal<void(KeyCode)> onKeyUp;
-
-		boost::signal<void(const MouseEvent&)> onMouseMoved;
-		boost::signal<void(const MouseEvent&, MouseButton)> onMouseDown;
-		boost::signal<void(const MouseEvent&, MouseButton)> onMouseUp;
-
 		void initClipRect(Rect& clipRect);
 		void registerInputHandler(InputHandlerPtr inputHandler);
 

CamelotCore/Source/CmInput.cpp

@@ -81,13 +81,11 @@ namespace CamelotFramework
 	void Input::keyDown(KeyCode keyCode)
 	{
 		mKeyState[keyCode] = true;
-		onKeyDown(keyCode);
 	}
 
 	void Input::keyUp(KeyCode keyCode)
 	{
 		mKeyState[keyCode] = false;
-		onKeyUp(keyCode);
 	}
 
 	void Input::mouseMoved(const MouseEvent& event)
@@ -98,8 +96,6 @@ namespace CamelotFramework
 				return;
 		}
 
-		onMouseMoved(event);
-
 		mMouseLastRel = Int2(-event.relCoords.x, -event.relCoords.y);
 	}
 
@@ -112,7 +108,6 @@ namespace CamelotFramework
 		}
 
 		mMouseButtonState[buttonID] = true;
-		onMouseDown(event, buttonID);
 	}
 
 	void Input::mouseUp(const MouseEvent& event, MouseButton buttonID)
@@ -124,7 +119,6 @@ namespace CamelotFramework
 		}
 
 		mMouseButtonState[buttonID] = false;
-		onMouseUp(event, buttonID);
 	}
 
 	float Input::getHorizontalAxis() const