*miscHEADmaster

4 files changed, 15 insertions, 14 deletions

diff --git a/Source/modules/asura-core/Input/InputDevice.h b/Source/modules/asura-core/Input/InputDevice.h
index 2b3ff9b..42dfe43 100644
--- a/Source/modules/asura-core/Input/InputDevice.h
+++ b/Source/modules/asura-core/Input/InputDevice.h
@@ -16,6 +16,7 @@
 namespace_begin(AsuraEngine)
 namespace_begin(Input)
 
+// �Ӳ���ϵͳ�������
 class InputDevice ASURA_FINAL
 {
 public: 
@@ -35,7 +36,7 @@ public:
 	LRESULT OnInput(HWND window, UINT message, WPARAM wParam, LPARAM lParam);
 	LRESULT OnDeviceChange(LPCWSTR name, bool add);
 
-	static bool ConvertPositionToClientAreaCoord(HWND activeWindow, POINT position, AEMath::Vector2f& newPos);
+	static bool ConvertPositionToClientAreaCoord(HWND activeWindow, POINT position, Vector2f& newPos);
 
 #elif ASURA_RUNNER 
 
@@ -52,7 +53,7 @@ protected:
 
 	bool UpdateState();
 
-	MouseState m_Mouse;
+	MouseState    m_Mouse;
 	KeyboardState m_Keyboard;
 	JoystickState m_Joysticks;
 
diff --git a/Source/modules/asura-core/Input/InputEvent.h b/Source/modules/asura-core/Input/InputEvent.h
index c643b75..fc7b9f6 100644
--- a/Source/modules/asura-core/Input/InputEvent.h
+++ b/Source/modules/asura-core/Input/InputEvent.h
@@ -32,7 +32,7 @@ struct InputEvent
 	LRESULT OnInput(HWND window, UINT message, WPARAM wParam, LPARAM lParam);
 	LRESULT OnDeviceChange(LPCWSTR name, bool add);
 
-	static bool ConvertPositionToClientAreaCoord(HWND activeWindow, POINT position, AEMath::Vector2f& newPos);
+	static bool ConvertPositionToClientAreaCoord(HWND activeWindow, POINT position, Vector2f& newPos);
 
 #elif ASURA_RUNNER 
 	
diff --git a/Source/modules/asura-core/Input/InputManager.cpp b/Source/modules/asura-core/Input/InputManager.cpp
index cec1b36..03200f5 100644
--- a/Source/modules/asura-core/Input/InputManager.cpp
+++ b/Source/modules/asura-core/Input/InputManager.cpp
@@ -82,12 +82,12 @@ bool InputManager::GetKeyUp(int key)
 }
 
 
-const AEMath::Vector2f& InputManager::GetMouseDelta()
+const Vector2f& InputManager::GetMouseDelta()
 {
 	return m_MouseDelta;
 }
 
-const AEMath::Vector2f& InputManager::GetMousePosition()
+const Vector2f& InputManager::GetMousePosition()
 {
 	return m_MousePos;
 }
@@ -114,11 +114,11 @@ void InputManager::SetKeyState(int key, bool state)
 	m_CurrentKeyState[key] = state;
 }
 
-void InputManager::SetMouseDelta(const AEMath::Vector2f& delta)
+void InputManager::SetMouseDelta(const Vector2f& delta)
 {
 }
 
-void InputManager::SetMousePosition(const AEMath::Vector2f& pos)
+void InputManager::SetMousePosition(const Vector2f& pos)
 {
 }
 
diff --git a/Source/modules/asura-core/Input/InputManager.h b/Source/modules/asura-core/Input/InputManager.h
index 3c44745..4071b66 100644
--- a/Source/modules/asura-core/Input/InputManager.h
+++ b/Source/modules/asura-core/Input/InputManager.h
@@ -40,15 +40,15 @@ public:
 	bool GetKeyDown(int key); 
 	bool GetKeyUp(int key);
 
-	const AEMath::Vector2f& GetMouseDelta();
-	const AEMath::Vector2f& GetMousePosition();
+	const Vector2f& GetMouseDelta();
+	const Vector2f& GetMousePosition();
 
 	float GetJoystickPosition();
 	void  setJoystickPosition(); 
 
 	void SetKeyState(int key, bool state); 
-	void SetMouseDelta(const AEMath::Vector2f& delta);
-	void SetMousePosition(const AEMath::Vector2f& pos); 
+	void SetMouseDelta(const Vector2f& delta);
+	void SetMousePosition(const Vector2f& pos); 
 	void SetMouseButton(int button, bool enabled);
 
 	void ProcessInput(); 
@@ -62,8 +62,8 @@ private:
 
 	std::vector<InputAxis> m_Axis;
 
-	AEMath::Vector2f m_MouseDelta;
-	AEMath::Vector2f m_MousePos;
+	Vector2f m_MouseDelta;
+	Vector2f m_MousePos;
 
 	bool m_MousePresent;
 
@@ -72,7 +72,7 @@ private:
 	std::string m_InputString; 
 	std::string m_CompositionString; 
 
-	AEMath::Vector2f m_TextFieldCursorPos;
+	Vector2f m_TextFieldCursorPos;
 	bool m_TextFieldInput; 
 
 	bool m_EatKeyPressOnTextFieldFocus;