summaryrefslogtreecommitdiff
path: root/source/modules/asura-core
diff options
context:
space:
mode:
Diffstat (limited to 'source/modules/asura-core')
-rw-r--r--source/modules/asura-core/Application.h22
-rw-r--r--source/modules/asura-core/Graphics/DrawInfo.h1
-rw-r--r--source/modules/asura-core/Graphics/DrawUtil.cpp0
-rw-r--r--source/modules/asura-core/Graphics/DrawUtil.h0
-rw-r--r--source/modules/asura-core/Graphics/GPUBuffer.h10
-rw-r--r--source/modules/asura-core/Graphics/GfxDevice.cpp20
-rw-r--r--source/modules/asura-core/Graphics/GfxDevice.h52
-rw-r--r--source/modules/asura-core/Graphics/GraphicsHelper.cpp0
-rw-r--r--source/modules/asura-core/Graphics/GraphicsHelper.h15
-rw-r--r--source/modules/asura-core/Graphics/Polygon2D.cpp0
-rw-r--r--source/modules/asura-core/Graphics/Polygon2D.h0
-rw-r--r--source/modules/asura-core/Graphics/VBO.cpp0
-rw-r--r--source/modules/asura-core/Graphics/VBO.h27
-rw-r--r--source/modules/asura-core/Input/InputAxis.cpp0
-rw-r--r--source/modules/asura-core/Input/InputAxis.h15
-rw-r--r--source/modules/asura-core/Input/InputDevice.cpp10
-rw-r--r--source/modules/asura-core/Input/InputDevice.h26
-rw-r--r--source/modules/asura-core/Input/InputEvent.cpp0
-rw-r--r--source/modules/asura-core/Input/InputEvent.h21
-rw-r--r--source/modules/asura-core/Input/InputManager.cpp124
-rw-r--r--source/modules/asura-core/Input/InputManager.h338
-rw-r--r--source/modules/asura-core/Input/JoystickState.h16
-rw-r--r--source/modules/asura-core/Input/Keys.h482
-rw-r--r--source/modules/asura-core/Input/MouseState.h16
-rw-r--r--source/modules/asura-core/application.h22
-rw-r--r--source/modules/asura-core/input/keys.h482
26 files changed, 635 insertions, 1064 deletions
diff --git a/source/modules/asura-core/Application.h b/source/modules/asura-core/Application.h
index ea5faa7..696d125 100644
--- a/source/modules/asura-core/Application.h
+++ b/source/modules/asura-core/Application.h
@@ -38,40 +38,28 @@ public:
virtual ~Application();
- ///
- /// ʼǰϵͳ
- ///
+ // ʼǰϵͳ
bool InitSubModules(uint flag = ASURA_MODULE_ALL);
- ///
- ///
- ///
+ //
virtual void Run(int argc, char* args[]);
- ///
- /// ˳runʱĴ
- ///
+ // ˳runʱĴ
virtual void OnExit();
protected:
- ///
- /// moduleapplicationӵmoduleȨ
- ///
+ // moduleapplicationӵmoduleȨ
void EnqueueModule(Module* module);
private:
- ///
/// ̵߳lua state handleӦѭСһ˵ֻҪ߳һlua_State̲߳Ҫ̼߳
/// lua̫ʹˡC++дȻעһصһ̴߳lua_Stateעắִк󷢻
/// ̵߳lua_Stateֻ֤һnativeʵ֮һlua_State󶨡
- ///
Luax::LuaxVM* m_VM;
- ///
- /// Asura libsᰴն˳ʼ˳ʱִ˳
- ///
+ // Asura libsᰴն˳ʼ˳ʱִ˳
std::queue<Module*> m_Modules;
};
diff --git a/source/modules/asura-core/Graphics/DrawInfo.h b/source/modules/asura-core/Graphics/DrawInfo.h
index f0e375b..9042f2f 100644
--- a/source/modules/asura-core/Graphics/DrawInfo.h
+++ b/source/modules/asura-core/Graphics/DrawInfo.h
@@ -6,6 +6,7 @@
namespace_begin(AsuraEngine)
namespace_begin(Graphics)
+///
struct DrawInfo
{
diff --git a/source/modules/asura-core/Graphics/DrawUtil.cpp b/source/modules/asura-core/Graphics/DrawUtil.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/source/modules/asura-core/Graphics/DrawUtil.cpp
diff --git a/source/modules/asura-core/Graphics/DrawUtil.h b/source/modules/asura-core/Graphics/DrawUtil.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/source/modules/asura-core/Graphics/DrawUtil.h
diff --git a/source/modules/asura-core/Graphics/GPUBuffer.h b/source/modules/asura-core/Graphics/GPUBuffer.h
index bb40055..0aa3c29 100644
--- a/source/modules/asura-core/Graphics/GPUBuffer.h
+++ b/source/modules/asura-core/Graphics/GPUBuffer.h
@@ -31,8 +31,7 @@ enum BufferDataType
};
///
-/// VRAM壬ֶ㻺vboebo֣ÿζڴԴϴݡframeworkrenderers
-///
+/// VRAM壬ֶ㻺vboebo֣ÿζڴԴϴݡframeworkrenderersй
///
ASURA_ABSTRACT class GPUBuffer
{
@@ -62,10 +61,9 @@ private:
GLenum m_Target;
GLuint m_Buffer;
- /// openglԴ滺岢ûж͵ҪֻglVertexAttribPointerʱָdrawcall ʱݸ
- /// ʼַʹbufferȡඥݣԲͬͿԱһbufferСΪ˱
- /// ӿڵļ࣬ڳʼbufferʱָͣڱ͵һ£Բͬ
- /// ͷͬbuffer
+ /// openglԴ滺岢ûж͵ҪֻglVertexAttribPointerʱָdrawcall ʱݸ
+ /// ʼַʹbufferȡඥݣԲͬͿԱһbufferСΪ˱ֽӿڵļ࣬
+ /// ʼbufferʱָͣڱ͵һ£Բͬͷͬbuffer
GLenum m_DataType;
GLuint m_Usage;
diff --git a/source/modules/asura-core/Graphics/GfxDevice.cpp b/source/modules/asura-core/Graphics/GfxDevice.cpp
index ef324e3..ea95f54 100644
--- a/source/modules/asura-core/Graphics/GfxDevice.cpp
+++ b/source/modules/asura-core/Graphics/GfxDevice.cpp
@@ -82,16 +82,6 @@ Color& GfxDevice::GetDrawColor()
return state.drawColor;
}
-Canvas* GfxDevice::GetActiveCanvas() const
-{
- return state.canvas;
-}
-
-void GfxDevice::SetActiveCanvas(Canvas* canvas)
-{
- state.canvas = canvas;
-}
-
void GfxDevice::SetViewport(const Recti v)
{
state.viewport = v;
@@ -136,16 +126,6 @@ void GfxDevice::DrawArrays(GLenum mode, GLint first, GLsizei count)
state.shader->OnUsed();
}
-void GfxDevice::SetMatrixMode (MatrixMode mode)
-{
- state.matrixMode = mode;
-}
-
-MatrixMode GfxDevice::GetMatrixMode ()
-{
- return state.matrixMode;
-}
-
void GfxDevice::PushMatrix ()
{
state.matrix[state.matrixMode].Push ();
diff --git a/source/modules/asura-core/Graphics/GfxDevice.h b/source/modules/asura-core/Graphics/GfxDevice.h
index 1f50b57..02c7392 100644
--- a/source/modules/asura-core/Graphics/GfxDevice.h
+++ b/source/modules/asura-core/Graphics/GfxDevice.h
@@ -42,47 +42,44 @@ public:
static GfxDevice& Get();
- int GetParam(GLParams param);
+ int GetParam(GLParams param);
- bool Init(const AEMath::Recti& viewport);
- bool Inited();
+ bool Init(const AEMath::Recti& viewport);
+ bool Inited();
- void SetViewport(const AEMath::Recti viewport);
+ void SetViewport(const AEMath::Recti viewport);
const AEMath::Recti& GetViewport();
- void SetMatrixMode(MatrixMode mode);
- MatrixMode GetMatrixMode();
+ void PushMatrix();
+ void PopMatrix();
- void PushMatrix();
- void PopMatrix();
+ void LoadIdentity();
+ void Rotate(float angle);
+ void Translate(float x, float y);
+ void Scale(float x, float y);
+ void Ortho(float l, float r, float b, float t, float n, float f);
- void LoadIdentity();
- void Rotate(float angle);
- void Translate(float x, float y);
- void Scale(float x, float y);
- void Ortho(float l, float r, float b, float t, float n, float f);
+ uint GetMatrixDepth();
+ uint GetMatrixIndex();
- uint GetMatrixDepth();
- uint GetMatrixIndex();
+ void DrawArrays(GLenum mode, GLint first, GLsizei count);
AEMath::Matrix44& GetMatrix(MatrixMode mode);
AEMath::Matrix44 GetMVPMatrix();
- void SetDrawColor(float r, float g, float b, float a);
- Color& GetDrawColor();
-
- void SetActiveCanvas(Canvas* = NULL);
- Canvas* GetActiveCanvas() const;
+ void SetDrawColor(float r, float g, float b, float a);
+ Color& GetDrawColor();
void SetActiveShader(Shader* = NULL);
Shader* GetActiveShader() const;
- void DrawArrays(GLenum mode, GLint first, GLsizei count);
+ void WipeError();
+ bool HasError();
+ GLenum GetError();
- void WipeError();
- bool HasError();
- GLenum GetError();
+ GET_SET(MatrixMode, MatrixMode, state.matrixMode);
+ GET_SET(Canvas*, ActiveCanvas, state.canvas);
private:
@@ -130,9 +127,14 @@ luaxport:
};
-// ȫ GfxDevice
extern GfxDevice g_Device;
+
+#define GL_CALL(x) do { x; /*GLAssert(); */} while(0)
+
+
+
+
namespace_end
namespace_end
diff --git a/source/modules/asura-core/Graphics/GraphicsHelper.cpp b/source/modules/asura-core/Graphics/GraphicsHelper.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/source/modules/asura-core/Graphics/GraphicsHelper.cpp
diff --git a/source/modules/asura-core/Graphics/GraphicsHelper.h b/source/modules/asura-core/Graphics/GraphicsHelper.h
new file mode 100644
index 0000000..b93756a
--- /dev/null
+++ b/source/modules/asura-core/Graphics/GraphicsHelper.h
@@ -0,0 +1,15 @@
+#ifndef _ASURA_GRAPHICS_HELPER_H_
+#define _ASURA_GRAPHICS_HELPER_H_
+
+#include <asura-utils/Classes.h>
+
+namespace_begin(AsuraEngine)
+namespace_begin(Graphics)
+
+
+
+
+namespace_end
+namespace_end
+
+#endif
diff --git a/source/modules/asura-core/Graphics/Polygon2D.cpp b/source/modules/asura-core/Graphics/Polygon2D.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/source/modules/asura-core/Graphics/Polygon2D.cpp
diff --git a/source/modules/asura-core/Graphics/Polygon2D.h b/source/modules/asura-core/Graphics/Polygon2D.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/source/modules/asura-core/Graphics/Polygon2D.h
diff --git a/source/modules/asura-core/Graphics/VBO.cpp b/source/modules/asura-core/Graphics/VBO.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/source/modules/asura-core/Graphics/VBO.cpp
diff --git a/source/modules/asura-core/Graphics/VBO.h b/source/modules/asura-core/Graphics/VBO.h
new file mode 100644
index 0000000..80f405f
--- /dev/null
+++ b/source/modules/asura-core/Graphics/VBO.h
@@ -0,0 +1,27 @@
+#ifndef _ASURA_ENGINE_VBO_H_
+#define _ASURA_ENGINE_VBO_H_
+
+#include <asura-utils/Classes.h>
+
+namespace_begin(AsuraEngine)
+namespace_begin(Graphics)
+
+struct VertexBufferData
+{
+
+};
+
+struct IndexBufferData
+{
+
+};
+
+class VBO
+{
+
+};
+
+namespace_end
+namespace_end
+
+#endif \ No newline at end of file
diff --git a/source/modules/asura-core/Input/InputAxis.cpp b/source/modules/asura-core/Input/InputAxis.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/source/modules/asura-core/Input/InputAxis.cpp
diff --git a/source/modules/asura-core/Input/InputAxis.h b/source/modules/asura-core/Input/InputAxis.h
new file mode 100644
index 0000000..3052f0b
--- /dev/null
+++ b/source/modules/asura-core/Input/InputAxis.h
@@ -0,0 +1,15 @@
+#ifndef _ASURA_ENGINE_INPUT_AXIS_H_
+#define _ASURA_ENGINE_INPUT_AXIS_H_
+
+#include <asura-utils/Classes.h>
+
+namespace_begin(AsuraEngine)
+namespace_begin(Input)
+
+class InputAxis {};
+
+
+namespace_end
+namespace_end
+
+#endif \ No newline at end of file
diff --git a/source/modules/asura-core/Input/InputDevice.cpp b/source/modules/asura-core/Input/InputDevice.cpp
index e69de29..0c9c42f 100644
--- a/source/modules/asura-core/Input/InputDevice.cpp
+++ b/source/modules/asura-core/Input/InputDevice.cpp
@@ -0,0 +1,10 @@
+#include "InputDevice.h"
+
+namespace_begin(AsuraEngine)
+namespace_begin(Input)
+
+
+
+
+namespace_end
+namespace_end \ No newline at end of file
diff --git a/source/modules/asura-core/Input/InputDevice.h b/source/modules/asura-core/Input/InputDevice.h
index 39f3d37..0ecce99 100644
--- a/source/modules/asura-core/Input/InputDevice.h
+++ b/source/modules/asura-core/Input/InputDevice.h
@@ -8,29 +8,35 @@
#include "../CoreConfig.h"
#include "KeyboardState.h"
+#include "MouseState.h"
+#include "JoystickState.h"
namespace_begin(AsuraEngine)
namespace_begin(Input)
-/// ͬƽ̨̳ಢʵhandleӿ
-ASURA_ABSTRACT class InputDevice : public Singleton<InputDevice>
+class InputDevice
{
-protected:
+public:
- void OnKeyDown(int key);
- void OnKeyUp(int key);
+ InputDevice();
+ virtual ~InputDevice();
- void OnMouseMove(const AEMath::Vector2f& position);
+protected:
- void OnMouseButtonDown(int key);
- void OnMouseButtonUp(int key);
+ virtual bool UpdateState();
- void OnMouseWheel();
+ MouseState m_Mouse;
+ KeyboardState m_Keyboard;
+ JoystickState m_Joysticks;
- void OnInputChar();
+private:
+
+ bool UpdateMousePosition();
};
+//bool ConvertPositionToClientAreaCoord();
+
namespace_end
namespace_end
diff --git a/source/modules/asura-core/Input/InputEvent.cpp b/source/modules/asura-core/Input/InputEvent.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/source/modules/asura-core/Input/InputEvent.cpp
diff --git a/source/modules/asura-core/Input/InputEvent.h b/source/modules/asura-core/Input/InputEvent.h
new file mode 100644
index 0000000..2c5b84b
--- /dev/null
+++ b/source/modules/asura-core/Input/InputEvent.h
@@ -0,0 +1,21 @@
+#ifndef _ASURA_ENGINE_INPUT_EVENT_H_
+#define _ASURA_ENGINE_INPUT_EVENT_H_
+
+#include <asura-utils/Classes.h>
+
+namespace_begin(AsuraEngine)
+namespace_begin(Input)
+
+struct InputEvent
+{
+ InputEvent();
+ ~InputEvent();
+
+};
+
+//InputEvent ConvertInputEvent();
+
+namespace_end
+namespace_end
+
+#endif \ No newline at end of file
diff --git a/source/modules/asura-core/Input/InputManager.cpp b/source/modules/asura-core/Input/InputManager.cpp
index e69de29..fe49c29 100644
--- a/source/modules/asura-core/Input/InputManager.cpp
+++ b/source/modules/asura-core/Input/InputManager.cpp
@@ -0,0 +1,124 @@
+#include "InputManager.h"
+
+namespace_begin(AsuraEngine)
+namespace_begin(Input)
+
+InputManager::InputManager()
+{
+}
+
+InputManager::~InputManager()
+{
+}
+
+void InputManager::Reset()
+{
+}
+
+bool InputManager::GetButton(const std::string& name)
+{
+}
+
+bool InputManager::GetButtonDown(const std::string& name)
+{
+}
+
+bool InputManager::GetButtonUp(const std::string& name)
+{
+}
+
+bool InputManager::HasAxisOrButton(const std::string& name)
+{
+}
+
+float InputManager::GetAxis(const std::string& name)
+{
+}
+
+float InputManager::GetAxisRaw(const std::string& name)
+{
+}
+
+bool InputManager::GetMouseButton(int mouseBut)
+{
+}
+
+bool InputManager::GetMouseButtonState(int mouseBut)
+{
+}
+
+bool InputManager::GetMouseButtonDown(int mouseBut)
+{
+}
+
+bool InputManager::GetMouseButtonUp(int mouseBut)
+{
+}
+
+
+bool InputManager::GetKey(int key)
+{
+}
+
+bool InputManager::GetKeyDown(int key)
+{
+}
+
+bool InputManager::GetKeyUp(int key)
+{
+}
+
+
+const AEMath::Vector2f& InputManager::GetMouseDelta()
+{
+}
+
+const AEMath::Vector2f& InputManager::GetMousePosition()
+{
+}
+
+
+float InputManager::GetJoystickPosition()
+{
+}
+
+void InputManager::setJoystickPosition()
+{
+}
+
+
+void InputManager::SetKeyState(int key, bool state)
+{
+ // This ignores keyRepeats (multiple keydown without a keyup event between)
+ if (state && !m_CurrentKeyState[key])
+ m_ThisFrameKeyDown[key] = true;
+ if (!state && m_CurrentKeyState[key])
+ m_ThisFrameKeyUp[key] = true;
+
+ m_CurrentKeyState[key] = state;
+}
+
+void InputManager::SetMouseDelta(const AEMath::Vector2f& delta)
+{
+}
+
+void InputManager::SetMousePosition(const AEMath::Vector2f& pos)
+{
+}
+
+void InputManager::SetMouseButton(int button, bool enabled)
+{
+}
+
+
+void InputManager::ProcessInput()
+{
+}
+
+void InputManager::SendInputEvents()
+{
+}
+
+
+namespace_end
+namespace_end \ No newline at end of file
diff --git a/source/modules/asura-core/Input/InputManager.h b/source/modules/asura-core/Input/InputManager.h
index dd11b2f..bbdafd8 100644
--- a/source/modules/asura-core/Input/InputManager.h
+++ b/source/modules/asura-core/Input/InputManager.h
@@ -1,23 +1,351 @@
-#ifndef __INPUT_MAMANGER_H__
-#define __INPUT_MAMANGER_H__
+#ifndef _ASURA_INPUT_MAMANGER_H_
+#define _ASURA_INPUT_MAMANGER_H_
+#include <asura-utils/Math/Vector2.hpp>
#include <asura-utils/Scripting/Portable.hpp>
#include <asura-utils/Singleton.hpp>
#include <asura-utils/Classes.h>
+#include <asura-utils/dynamic_bitset.h>
+
+#include <string>
+#include <vector>
+
+#include "InputAxis.h"
namespace_begin(AsuraEngine)
namespace_begin(Input)
-/// ߼
class InputManager : public Singleton<InputManager>
{
-public :
+public:
+
+ InputManager();
+ ~InputManager();
+
+ void Reset();
+
+ bool GetButton(const std::string& name);
+ bool GetButtonDown(const std::string& name);
+ bool GetButtonUp(const std::string& name);
+ bool HasAxisOrButton(const std::string& name);
+ float GetAxis(const std::string& name);
+ float GetAxisRaw(const std::string& name);
+
+ bool GetMouseButton(int mouseBut);
+ bool GetMouseButtonState(int mouseBut);
+ bool GetMouseButtonDown(int mouseBut);
+ bool GetMouseButtonUp(int mouseBut);
+
+ bool GetKey(int key);
+ bool GetKeyDown(int key);
+ bool GetKeyUp(int key);
+
+ const AEMath::Vector2f& GetMouseDelta();
+ const AEMath::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 SetMouseButton(int button, bool enabled);
+
+ void ProcessInput();
+ void SendInputEvents();
+
+private:
+
+ dynamic_bitset m_CurrentKeyState;
+ dynamic_bitset m_ThisFrameKeyDown;
+ dynamic_bitset m_ThisFrameKeyUp;
+
+ std::vector<InputAxis> m_Axis;
+
+ AEMath::Vector2f m_MouseDelta;
+ AEMath::Vector2f m_MousePos;
+ bool m_MousePresent;
-private :
+ std::vector<std::vector<float>> m_JoystickPos;
+
+ std::string m_InputString;
+ std::string m_CompositionString;
+
+ AEMath::Vector2f m_TextFieldCursorPos;
+ bool m_TextFieldInput;
+
+ bool m_EatKeyPressOnTextFieldFocus;
+ int m_IMECompositionMode;
+ bool m_IMEIsSelected;
+
+ int m_LastJoyNum, m_LastJoyAxis;
+ bool m_ShouldQuit;
+ bool m_SimulateMouseWithTouches;
};
+// keyboard keys
+enum {
+ /* The keyboard syms have been cleverly chosen to map to ASCII */
+ SDLK_UNKNOWN = 0,
+ SDLK_FIRST = 0,
+ SDLK_BACKSPACE = 8,
+ SDLK_TAB = 9,
+ SDLK_CLEAR = 12,
+ SDLK_RETURN = 13,
+ SDLK_PAUSE = 19,
+ SDLK_ESCAPE = 27,
+ SDLK_SPACE = 32,
+ SDLK_EXCLAIM = 33,
+ SDLK_QUOTEDBL = 34,
+ SDLK_HASH = 35,
+ SDLK_DOLLAR = 36,
+ SDLK_AMPERSAND = 38,
+ SDLK_QUOTE = 39,
+ SDLK_LEFTPAREN = 40,
+ SDLK_RIGHTPAREN = 41,
+ SDLK_ASTERISK = 42,
+ SDLK_PLUS = 43,
+ SDLK_COMMA = 44,
+ SDLK_MINUS = 45,
+ SDLK_PERIOD = 46,
+ SDLK_SLASH = 47,
+ SDLK_0 = 48,
+ SDLK_1 = 49,
+ SDLK_2 = 50,
+ SDLK_3 = 51,
+ SDLK_4 = 52,
+ SDLK_5 = 53,
+ SDLK_6 = 54,
+ SDLK_7 = 55,
+ SDLK_8 = 56,
+ SDLK_9 = 57,
+ SDLK_COLON = 58,
+ SDLK_SEMICOLON = 59,
+ SDLK_LESS = 60,
+ SDLK_EQUALS = 61,
+ SDLK_GREATER = 62,
+ SDLK_QUESTION = 63,
+ SDLK_AT = 64,
+ /*
+ Skip uppercase letters
+ */
+ SDLK_LEFTBRACKET = 91,
+ SDLK_BACKSLASH = 92,
+ SDLK_RIGHTBRACKET = 93,
+ SDLK_CARET = 94,
+ SDLK_UNDERSCORE = 95,
+ SDLK_BACKQUOTE = 96,
+ SDLK_a = 97,
+ SDLK_b = 98,
+ SDLK_c = 99,
+ SDLK_d = 100,
+ SDLK_e = 101,
+ SDLK_f = 102,
+ SDLK_g = 103,
+ SDLK_h = 104,
+ SDLK_i = 105,
+ SDLK_j = 106,
+ SDLK_k = 107,
+ SDLK_l = 108,
+ SDLK_m = 109,
+ SDLK_n = 110,
+ SDLK_o = 111,
+ SDLK_p = 112,
+ SDLK_q = 113,
+ SDLK_r = 114,
+ SDLK_s = 115,
+ SDLK_t = 116,
+ SDLK_u = 117,
+ SDLK_v = 118,
+ SDLK_w = 119,
+ SDLK_x = 120,
+ SDLK_y = 121,
+ SDLK_z = 122,
+ SDLK_DELETE = 127,
+ /* End of ASCII mapped keysyms */
+
+ /* International keyboard syms */
+ SDLK_WORLD_0 = 160, /* 0xA0 */
+ SDLK_WORLD_1 = 161,
+ SDLK_WORLD_2 = 162,
+ SDLK_WORLD_3 = 163,
+ SDLK_WORLD_4 = 164,
+ SDLK_WORLD_5 = 165,
+ SDLK_WORLD_6 = 166,
+ SDLK_WORLD_7 = 167,
+ SDLK_WORLD_8 = 168,
+ SDLK_WORLD_9 = 169,
+ SDLK_WORLD_10 = 170,
+ SDLK_WORLD_11 = 171,
+ SDLK_WORLD_12 = 172,
+ SDLK_WORLD_13 = 173,
+ SDLK_WORLD_14 = 174,
+ SDLK_WORLD_15 = 175,
+ SDLK_WORLD_16 = 176,
+ SDLK_WORLD_17 = 177,
+ SDLK_WORLD_18 = 178,
+ SDLK_WORLD_19 = 179,
+ SDLK_WORLD_20 = 180,
+ SDLK_WORLD_21 = 181,
+ SDLK_WORLD_22 = 182,
+ SDLK_WORLD_23 = 183,
+ SDLK_WORLD_24 = 184,
+ SDLK_WORLD_25 = 185,
+ SDLK_WORLD_26 = 186,
+ SDLK_WORLD_27 = 187,
+ SDLK_WORLD_28 = 188,
+ SDLK_WORLD_29 = 189,
+ SDLK_WORLD_30 = 190,
+ SDLK_WORLD_31 = 191,
+ SDLK_WORLD_32 = 192,
+ SDLK_WORLD_33 = 193,
+ SDLK_WORLD_34 = 194,
+ SDLK_WORLD_35 = 195,
+ SDLK_WORLD_36 = 196,
+ SDLK_WORLD_37 = 197,
+ SDLK_WORLD_38 = 198,
+ SDLK_WORLD_39 = 199,
+ SDLK_WORLD_40 = 200,
+ SDLK_WORLD_41 = 201,
+ SDLK_WORLD_42 = 202,
+ SDLK_WORLD_43 = 203,
+ SDLK_WORLD_44 = 204,
+ SDLK_WORLD_45 = 205,
+ SDLK_WORLD_46 = 206,
+ SDLK_WORLD_47 = 207,
+ SDLK_WORLD_48 = 208,
+ SDLK_WORLD_49 = 209,
+ SDLK_WORLD_50 = 210,
+ SDLK_WORLD_51 = 211,
+ SDLK_WORLD_52 = 212,
+ SDLK_WORLD_53 = 213,
+ SDLK_WORLD_54 = 214,
+ SDLK_WORLD_55 = 215,
+ SDLK_WORLD_56 = 216,
+ SDLK_WORLD_57 = 217,
+ SDLK_WORLD_58 = 218,
+ SDLK_WORLD_59 = 219,
+ SDLK_WORLD_60 = 220,
+ SDLK_WORLD_61 = 221,
+ SDLK_WORLD_62 = 222,
+ SDLK_WORLD_63 = 223,
+ SDLK_WORLD_64 = 224,
+ SDLK_WORLD_65 = 225,
+ SDLK_WORLD_66 = 226,
+ SDLK_WORLD_67 = 227,
+ SDLK_WORLD_68 = 228,
+ SDLK_WORLD_69 = 229,
+ SDLK_WORLD_70 = 230,
+ SDLK_WORLD_71 = 231,
+ SDLK_WORLD_72 = 232,
+ SDLK_WORLD_73 = 233,
+ SDLK_WORLD_74 = 234,
+ SDLK_WORLD_75 = 235,
+ SDLK_WORLD_76 = 236,
+ SDLK_WORLD_77 = 237,
+ SDLK_WORLD_78 = 238,
+ SDLK_WORLD_79 = 239,
+ SDLK_WORLD_80 = 240,
+ SDLK_WORLD_81 = 241,
+ SDLK_WORLD_82 = 242,
+ SDLK_WORLD_83 = 243,
+ SDLK_WORLD_84 = 244,
+ SDLK_WORLD_85 = 245,
+ SDLK_WORLD_86 = 246,
+ SDLK_WORLD_87 = 247,
+ SDLK_WORLD_88 = 248,
+ SDLK_WORLD_89 = 249,
+ SDLK_WORLD_90 = 250,
+ SDLK_WORLD_91 = 251,
+ SDLK_WORLD_92 = 252,
+ SDLK_WORLD_93 = 253,
+ SDLK_WORLD_94 = 254,
+ SDLK_WORLD_95 = 255, /* 0xFF */
+
+ /* Numeric keypad */
+ SDLK_KP0 = 256,
+ SDLK_KP1 = 257,
+ SDLK_KP2 = 258,
+ SDLK_KP3 = 259,
+ SDLK_KP4 = 260,
+ SDLK_KP5 = 261,
+ SDLK_KP6 = 262,
+ SDLK_KP7 = 263,
+ SDLK_KP8 = 264,
+ SDLK_KP9 = 265,
+ SDLK_KP_PERIOD = 266,
+ SDLK_KP_DIVIDE = 267,
+ SDLK_KP_MULTIPLY = 268,
+ SDLK_KP_MINUS = 269,
+ SDLK_KP_PLUS = 270,
+ SDLK_KP_ENTER = 271,
+ SDLK_KP_EQUALS = 272,
+
+ /* Arrows + Home/End pad */
+ SDLK_UP = 273,
+ SDLK_DOWN = 274,
+ SDLK_RIGHT = 275,
+ SDLK_LEFT = 276,
+ SDLK_INSERT = 277,
+ SDLK_HOME = 278,
+ SDLK_END = 279,
+ SDLK_PAGEUP = 280,
+ SDLK_PAGEDOWN = 281,
+
+ /* Function keys */
+ SDLK_F1 = 282,
+ SDLK_F2 = 283,
+ SDLK_F3 = 284,
+ SDLK_F4 = 285,
+ SDLK_F5 = 286,
+ SDLK_F6 = 287,
+ SDLK_F7 = 288,
+ SDLK_F8 = 289,
+ SDLK_F9 = 290,
+ SDLK_F10 = 291,
+ SDLK_F11 = 292,
+ SDLK_F12 = 293,
+ SDLK_F13 = 294,
+ SDLK_F14 = 295,
+ SDLK_F15 = 296,
+
+ /* Key state modifier keys */
+ SDLK_NUMLOCK = 300,
+ SDLK_CAPSLOCK = 301,
+ SDLK_SCROLLOCK = 302,
+ SDLK_RSHIFT = 303,
+ SDLK_LSHIFT = 304,
+ SDLK_RCTRL = 305,
+ SDLK_LCTRL = 306,
+ SDLK_RALT = 307,
+ SDLK_LALT = 308,
+ SDLK_RMETA = 309,
+ SDLK_LMETA = 310,
+ SDLK_RGUI = 309,
+ SDLK_LGUI = 310,
+ SDLK_LSUPER = 311, /* Left "Windows" key */
+ SDLK_RSUPER = 312, /* Right "Windows" key */
+ SDLK_MODE = 313, /* "Alt Gr" key */
+ SDLK_COMPOSE = 314, /* Multi-key compose key */
+
+ /* Miscellaneous function keys */
+ SDLK_HELP = 315,
+ SDLK_PRINT = 316,
+ SDLK_SYSREQ = 317,
+ SDLK_BREAK = 318,
+ SDLK_MENU = 319,
+ SDLK_POWER = 320, /* Power Macintosh power key */
+ SDLK_EURO = 321, /* Some european keyboards */
+ SDLK_UNDO = 322, /* Atari keyboard has Undo */
+
+ /* Add any other keys here */
+
+ SDLK_LAST
+};
+
+
namespace_end
namespace_end
diff --git a/source/modules/asura-core/Input/JoystickState.h b/source/modules/asura-core/Input/JoystickState.h
index e69de29..42d0a79 100644
--- a/source/modules/asura-core/Input/JoystickState.h
+++ b/source/modules/asura-core/Input/JoystickState.h
@@ -0,0 +1,16 @@
+#ifndef _ASURA_JOYSTICKSTATE_H_
+#define _ASURA_JOYSTICKSTATE_H_
+
+#include <asura-utils/Classes.h>
+
+namespace_begin(AsuraEngine)
+namespace_begin(Input)
+
+class JoystickState {};
+
+
+namespace_end
+namespace_end
+
+#endif
+
diff --git a/source/modules/asura-core/Input/Keys.h b/source/modules/asura-core/Input/Keys.h
deleted file mode 100644
index 8f04dc2..0000000
--- a/source/modules/asura-core/Input/Keys.h
+++ /dev/null
@@ -1,482 +0,0 @@
-
-/**
-* Keyboard keys. They are dependent on the current layout of the keyboard.
-**/
-enum Key
-{
- KEY_UNKNOWN,
-
- KEY_RETURN,
- KEY_ESCAPE,
- KEY_BACKSPACE,
- KEY_TAB,
- KEY_SPACE,
- KEY_EXCLAIM,
- KEY_QUOTEDBL,
- KEY_HASH,
- KEY_PERCENT,
- KEY_DOLLAR,
- KEY_AMPERSAND,
- KEY_QUOTE,
- KEY_LEFTPAREN,
- KEY_RIGHTPAREN,
- KEY_ASTERISK,
- KEY_PLUS,
- KEY_COMMA,
- KEY_MINUS,
- KEY_PERIOD,
- KEY_SLASH,
- KEY_0,
- KEY_1,
- KEY_2,
- KEY_3,
- KEY_4,
- KEY_5,
- KEY_6,
- KEY_7,
- KEY_8,
- KEY_9,
- KEY_COLON,
- KEY_SEMICOLON,
- KEY_LESS,
- KEY_EQUALS,
- KEY_GREATER,
- KEY_QUESTION,
- KEY_AT,
-
- KEY_LEFTBRACKET,
- KEY_BACKSLASH,
- KEY_RIGHTBRACKET,
- KEY_CARET,
- KEY_UNDERSCORE,
- KEY_BACKQUOTE,
- KEY_A,
- KEY_B,
- KEY_C,
- KEY_D,
- KEY_E,
- KEY_F,
- KEY_G,
- KEY_H,
- KEY_I,
- KEY_J,
- KEY_K,
- KEY_L,
- KEY_M,
- KEY_N,
- KEY_O,
- KEY_P,
- KEY_Q,
- KEY_R,
- KEY_S,
- KEY_T,
- KEY_U,
- KEY_V,
- KEY_W,
- KEY_X,
- KEY_Y,
- KEY_Z,
-
- KEY_CAPSLOCK,
-
- KEY_F1,
- KEY_F2,
- KEY_F3,
- KEY_F4,
- KEY_F5,
- KEY_F6,
- KEY_F7,
- KEY_F8,
- KEY_F9,
- KEY_F10,
- KEY_F11,
- KEY_F12,
-
- KEY_PRINTSCREEN,
- KEY_SCROLLLOCK,
- KEY_PAUSE,
- KEY_INSERT,
- KEY_HOME,
- KEY_PAGEUP,
- KEY_DELETE,
- KEY_END,
- KEY_PAGEDOWN,
- KEY_RIGHT,
- KEY_LEFT,
- KEY_DOWN,
- KEY_UP,
-
- KEY_NUMLOCKCLEAR,
- KEY_KP_DIVIDE,
- KEY_KP_MULTIPLY,
- KEY_KP_MINUS,
- KEY_KP_PLUS,
- KEY_KP_ENTER,
- KEY_KP_1,
- KEY_KP_2,
- KEY_KP_3,
- KEY_KP_4,
- KEY_KP_5,
- KEY_KP_6,
- KEY_KP_7,
- KEY_KP_8,
- KEY_KP_9,
- KEY_KP_0,
- KEY_KP_PERIOD,
- KEY_KP_COMMA,
- KEY_KP_EQUALS,
-
- KEY_APPLICATION,
- KEY_POWER,
- KEY_F13,
- KEY_F14,
- KEY_F15,
- KEY_F16,
- KEY_F17,
- KEY_F18,
- KEY_F19,
- KEY_F20,
- KEY_F21,
- KEY_F22,
- KEY_F23,
- KEY_F24,
- KEY_EXECUTE,
- KEY_HELP,
- KEY_MENU,
- KEY_SELECT,
- KEY_STOP,
- KEY_AGAIN,
- KEY_UNDO,
- KEY_CUT,
- KEY_COPY,
- KEY_PASTE,
- KEY_FIND,
- KEY_MUTE,
- KEY_VOLUMEUP,
- KEY_VOLUMEDOWN,
-
- KEY_ALTERASE,
- KEY_SYSREQ,
- KEY_CANCEL,
- KEY_CLEAR,
- KEY_PRIOR,
- KEY_RETURN2,
- KEY_SEPARATOR,
- KEY_OUT,
- KEY_OPER,
- KEY_CLEARAGAIN,
-
- KEY_THOUSANDSSEPARATOR,
- KEY_DECIMALSEPARATOR,
- KEY_CURRENCYUNIT,
- KEY_CURRENCYSUBUNIT,
-
- KEY_LCTRL,
- KEY_LSHIFT,
- KEY_LALT,
- KEY_LGUI,
- KEY_RCTRL,
- KEY_RSHIFT,
- KEY_RALT,
- KEY_RGUI,
-
- KEY_MODE,
-
- KEY_AUDIONEXT,
- KEY_AUDIOPREV,
- KEY_AUDIOSTOP,
- KEY_AUDIOPLAY,
- KEY_AUDIOMUTE,
- KEY_MEDIASELECT,
- KEY_WWW,
- KEY_MAIL,
- KEY_CALCULATOR,
- KEY_COMPUTER,
- KEY_APP_SEARCH,
- KEY_APP_HOME,
- KEY_APP_BACK,
- KEY_APP_FORWARD,
- KEY_APP_STOP,
- KEY_APP_REFRESH,
- KEY_APP_BOOKMARKS,
-
- KEY_BRIGHTNESSDOWN,
- KEY_BRIGHTNESSUP,
- KEY_DISPLAYSWITCH,
- KEY_KBDILLUMTOGGLE,
- KEY_KBDILLUMDOWN,
- KEY_KBDILLUMUP,
- KEY_EJECT,
- KEY_SLEEP,
-
- KEY_MAX_ENUM
-};
-
-/**
-* Scancodes represent physical keys independent of the current layout.
-* Their names may not match the names of the keys printed on the keyboard.
-* Some of them are very esoteric...
-**/
-enum Scancode
-{
- SCANCODE_UNKNOWN,
-
- SCANCODE_A,
- SCANCODE_B,
- SCANCODE_C,
- SCANCODE_D,
- SCANCODE_E,
- SCANCODE_F,
- SCANCODE_G,
- SCANCODE_H,
- SCANCODE_I,
- SCANCODE_J,
- SCANCODE_K,
- SCANCODE_L,
- SCANCODE_M,
- SCANCODE_N,
- SCANCODE_O,
- SCANCODE_P,
- SCANCODE_Q,
- SCANCODE_R,
- SCANCODE_S,
- SCANCODE_T,
- SCANCODE_U,
- SCANCODE_V,
- SCANCODE_W,
- SCANCODE_X,
- SCANCODE_Y,
- SCANCODE_Z,
-
- SCANCODE_1,
- SCANCODE_2,
- SCANCODE_3,
- SCANCODE_4,
- SCANCODE_5,
- SCANCODE_6,
- SCANCODE_7,
- SCANCODE_8,
- SCANCODE_9,
- SCANCODE_0,
-
- SCANCODE_RETURN,
- SCANCODE_ESCAPE,
- SCANCODE_BACKSPACE,
- SCANCODE_TAB,
- SCANCODE_SPACE,
-
- SCANCODE_MINUS,
- SCANCODE_EQUALS,
- SCANCODE_LEFTBRACKET,
- SCANCODE_RIGHTBRACKET,
- SCANCODE_BACKSLASH,
- SCANCODE_NONUSHASH,
- SCANCODE_SEMICOLON,
- SCANCODE_APOSTROPHE,
- SCANCODE_GRAVE,
- SCANCODE_COMMA,
- SCANCODE_PERIOD,
- SCANCODE_SLASH,
-
- SCANCODE_CAPSLOCK,
-
- SCANCODE_F1,
- SCANCODE_F2,
- SCANCODE_F3,
- SCANCODE_F4,
- SCANCODE_F5,
- SCANCODE_F6,
- SCANCODE_F7,
- SCANCODE_F8,
- SCANCODE_F9,
- SCANCODE_F10,
- SCANCODE_F11,
- SCANCODE_F12,
-
- SCANCODE_PRINTSCREEN,
- SCANCODE_SCROLLLOCK,
- SCANCODE_PAUSE,
- SCANCODE_INSERT,
- SCANCODE_HOME,
- SCANCODE_PAGEUP,
- SCANCODE_DELETE,
- SCANCODE_END,
- SCANCODE_PAGEDOWN,
- SCANCODE_RIGHT,
- SCANCODE_LEFT,
- SCANCODE_DOWN,
- SCANCODE_UP,
-
- SCANCODE_NUMLOCKCLEAR,
- SCANCODE_KP_DIVIDE,
- SCANCODE_KP_MULTIPLY,
- SCANCODE_KP_MINUS,
- SCANCODE_KP_PLUS,
- SCANCODE_KP_ENTER,
- SCANCODE_KP_1,
- SCANCODE_KP_2,
- SCANCODE_KP_3,
- SCANCODE_KP_4,
- SCANCODE_KP_5,
- SCANCODE_KP_6,
- SCANCODE_KP_7,
- SCANCODE_KP_8,
- SCANCODE_KP_9,
- SCANCODE_KP_0,
- SCANCODE_KP_PERIOD,
-
- SCANCODE_NONUSBACKSLASH,
- SCANCODE_APPLICATION,
- SCANCODE_POWER,
- SCANCODE_KP_EQUALS,
- SCANCODE_F13,
- SCANCODE_F14,
- SCANCODE_F15,
- SCANCODE_F16,
- SCANCODE_F17,
- SCANCODE_F18,
- SCANCODE_F19,
- SCANCODE_F20,
- SCANCODE_F21,
- SCANCODE_F22,
- SCANCODE_F23,
- SCANCODE_F24,
- SCANCODE_EXECUTE,
- SCANCODE_HELP,
- SCANCODE_MENU,
- SCANCODE_SELECT,
- SCANCODE_STOP,
- SCANCODE_AGAIN,
- SCANCODE_UNDO,
- SCANCODE_CUT,
- SCANCODE_COPY,
- SCANCODE_PASTE,
- SCANCODE_FIND,
- SCANCODE_MUTE,
- SCANCODE_VOLUMEUP,
- SCANCODE_VOLUMEDOWN,
- SCANCODE_KP_COMMA,
- SCANCODE_KP_EQUALSAS400,
-
- SCANCODE_INTERNATIONAL1,
- SCANCODE_INTERNATIONAL2,
- SCANCODE_INTERNATIONAL3,
- SCANCODE_INTERNATIONAL4,
- SCANCODE_INTERNATIONAL5,
- SCANCODE_INTERNATIONAL6,
- SCANCODE_INTERNATIONAL7,
- SCANCODE_INTERNATIONAL8,
- SCANCODE_INTERNATIONAL9,
- SCANCODE_LANG1,
- SCANCODE_LANG2,
- SCANCODE_LANG3,
- SCANCODE_LANG4,
- SCANCODE_LANG5,
- SCANCODE_LANG6,
- SCANCODE_LANG7,
- SCANCODE_LANG8,
- SCANCODE_LANG9,
-
- SCANCODE_ALTERASE,
- SCANCODE_SYSREQ,
- SCANCODE_CANCEL,
- SCANCODE_CLEAR,
- SCANCODE_PRIOR,
- SCANCODE_RETURN2,
- SCANCODE_SEPARATOR,
- SCANCODE_OUT,
- SCANCODE_OPER,
- SCANCODE_CLEARAGAIN,
- SCANCODE_CRSEL,
- SCANCODE_EXSEL,
-
- SCANCODE_KP_00,
- SCANCODE_KP_000,
- SCANCODE_THOUSANDSSEPARATOR,
- SCANCODE_DECIMALSEPARATOR,
- SCANCODE_CURRENCYUNIT,
- SCANCODE_CURRENCYSUBUNIT,
- SCANCODE_KP_LEFTPAREN,
- SCANCODE_KP_RIGHTPAREN,
- SCANCODE_KP_LEFTBRACE,
- SCANCODE_KP_RIGHTBRACE,
- SCANCODE_KP_TAB,
- SCANCODE_KP_BACKSPACE,
- SCANCODE_KP_A,
- SCANCODE_KP_B,
- SCANCODE_KP_C,
- SCANCODE_KP_D,
- SCANCODE_KP_E,
- SCANCODE_KP_F,
- SCANCODE_KP_XOR,
- SCANCODE_KP_POWER,
- SCANCODE_KP_PERCENT,
- SCANCODE_KP_LESS,
- SCANCODE_KP_GREATER,
- SCANCODE_KP_AMPERSAND,
- SCANCODE_KP_DBLAMPERSAND,
- SCANCODE_KP_VERTICALBAR,
- SCANCODE_KP_DBLVERTICALBAR,
- SCANCODE_KP_COLON,
- SCANCODE_KP_HASH,
- SCANCODE_KP_SPACE,
- SCANCODE_KP_AT,
- SCANCODE_KP_EXCLAM,
- SCANCODE_KP_MEMSTORE,
- SCANCODE_KP_MEMRECALL,
- SCANCODE_KP_MEMCLEAR,
- SCANCODE_KP_MEMADD,
- SCANCODE_KP_MEMSUBTRACT,
- SCANCODE_KP_MEMMULTIPLY,
- SCANCODE_KP_MEMDIVIDE,
- SCANCODE_KP_PLUSMINUS,
- SCANCODE_KP_CLEAR,
- SCANCODE_KP_CLEARENTRY,
- SCANCODE_KP_BINARY,
- SCANCODE_KP_OCTAL,
- SCANCODE_KP_DECIMAL,
- SCANCODE_KP_HEXADECIMAL,
-
- SCANCODE_LCTRL,
- SCANCODE_LSHIFT,
- SCANCODE_LALT,
- SCANCODE_LGUI,
- SCANCODE_RCTRL,
- SCANCODE_RSHIFT,
- SCANCODE_RALT,
- SCANCODE_RGUI,
-
- SCANCODE_MODE,
-
- SCANCODE_AUDIONEXT,
- SCANCODE_AUDIOPREV,
- SCANCODE_AUDIOSTOP,
- SCANCODE_AUDIOPLAY,
- SCANCODE_AUDIOMUTE,
- SCANCODE_MEDIASELECT,
- SCANCODE_WWW,
- SCANCODE_MAIL,
- SCANCODE_CALCULATOR,
- SCANCODE_COMPUTER,
- SCANCODE_AC_SEARCH,
- SCANCODE_AC_HOME,
- SCANCODE_AC_BACK,
- SCANCODE_AC_FORWARD,
- SCANCODE_AC_STOP,
- SCANCODE_AC_REFRESH,
- SCANCODE_AC_BOOKMARKS,
-
- SCANCODE_BRIGHTNESSDOWN,
- SCANCODE_BRIGHTNESSUP,
- SCANCODE_DISPLAYSWITCH,
- SCANCODE_KBDILLUMTOGGLE,
- SCANCODE_KBDILLUMDOWN,
- SCANCODE_KBDILLUMUP,
- SCANCODE_EJECT,
- SCANCODE_SLEEP,
-
- SCANCODE_APP1,
- SCANCODE_APP2,
-
- SCANCODE_MAX_ENUM
-};
diff --git a/source/modules/asura-core/Input/MouseState.h b/source/modules/asura-core/Input/MouseState.h
index e69de29..1192a34 100644
--- a/source/modules/asura-core/Input/MouseState.h
+++ b/source/modules/asura-core/Input/MouseState.h
@@ -0,0 +1,16 @@
+#ifndef _ASURA_MOUSESTATE_H_
+#define _ASURA_MOUSESTATE_H_
+
+#include <asura-utils/Classes.h>
+
+namespace_begin(AsuraEngine)
+namespace_begin(Input)
+
+class MouseState {};
+
+
+namespace_end
+namespace_end
+
+#endif
+
diff --git a/source/modules/asura-core/application.h b/source/modules/asura-core/application.h
index ea5faa7..696d125 100644
--- a/source/modules/asura-core/application.h
+++ b/source/modules/asura-core/application.h
@@ -38,40 +38,28 @@ public:
virtual ~Application();
- ///
- /// ʼǰϵͳ
- ///
+ // ʼǰϵͳ
bool InitSubModules(uint flag = ASURA_MODULE_ALL);
- ///
- ///
- ///
+ //
virtual void Run(int argc, char* args[]);
- ///
- /// ˳runʱĴ
- ///
+ // ˳runʱĴ
virtual void OnExit();
protected:
- ///
- /// moduleapplicationӵmoduleȨ
- ///
+ // moduleapplicationӵmoduleȨ
void EnqueueModule(Module* module);
private:
- ///
/// ̵߳lua state handleӦѭСһ˵ֻҪ߳һlua_State̲߳Ҫ̼߳
/// lua̫ʹˡC++дȻעһصһ̴߳lua_Stateעắִк󷢻
/// ̵߳lua_Stateֻ֤һnativeʵ֮һlua_State󶨡
- ///
Luax::LuaxVM* m_VM;
- ///
- /// Asura libsᰴն˳ʼ˳ʱִ˳
- ///
+ // Asura libsᰴն˳ʼ˳ʱִ˳
std::queue<Module*> m_Modules;
};
diff --git a/source/modules/asura-core/input/keys.h b/source/modules/asura-core/input/keys.h
deleted file mode 100644
index 8f04dc2..0000000
--- a/source/modules/asura-core/input/keys.h
+++ /dev/null
@@ -1,482 +0,0 @@
-
-/**
-* Keyboard keys. They are dependent on the current layout of the keyboard.
-**/
-enum Key
-{
- KEY_UNKNOWN,
-
- KEY_RETURN,
- KEY_ESCAPE,
- KEY_BACKSPACE,
- KEY_TAB,
- KEY_SPACE,
- KEY_EXCLAIM,
- KEY_QUOTEDBL,
- KEY_HASH,
- KEY_PERCENT,
- KEY_DOLLAR,
- KEY_AMPERSAND,
- KEY_QUOTE,
- KEY_LEFTPAREN,
- KEY_RIGHTPAREN,
- KEY_ASTERISK,
- KEY_PLUS,
- KEY_COMMA,
- KEY_MINUS,
- KEY_PERIOD,
- KEY_SLASH,
- KEY_0,
- KEY_1,
- KEY_2,
- KEY_3,
- KEY_4,
- KEY_5,
- KEY_6,
- KEY_7,
- KEY_8,
- KEY_9,
- KEY_COLON,
- KEY_SEMICOLON,
- KEY_LESS,
- KEY_EQUALS,
- KEY_GREATER,
- KEY_QUESTION,
- KEY_AT,
-
- KEY_LEFTBRACKET,
- KEY_BACKSLASH,
- KEY_RIGHTBRACKET,
- KEY_CARET,
- KEY_UNDERSCORE,
- KEY_BACKQUOTE,
- KEY_A,
- KEY_B,
- KEY_C,
- KEY_D,
- KEY_E,
- KEY_F,
- KEY_G,
- KEY_H,
- KEY_I,
- KEY_J,
- KEY_K,
- KEY_L,
- KEY_M,
- KEY_N,
- KEY_O,
- KEY_P,
- KEY_Q,
- KEY_R,
- KEY_S,
- KEY_T,
- KEY_U,
- KEY_V,
- KEY_W,
- KEY_X,
- KEY_Y,
- KEY_Z,
-
- KEY_CAPSLOCK,
-
- KEY_F1,
- KEY_F2,
- KEY_F3,
- KEY_F4,
- KEY_F5,
- KEY_F6,
- KEY_F7,
- KEY_F8,
- KEY_F9,
- KEY_F10,
- KEY_F11,
- KEY_F12,
-
- KEY_PRINTSCREEN,
- KEY_SCROLLLOCK,
- KEY_PAUSE,
- KEY_INSERT,
- KEY_HOME,
- KEY_PAGEUP,
- KEY_DELETE,
- KEY_END,
- KEY_PAGEDOWN,
- KEY_RIGHT,
- KEY_LEFT,
- KEY_DOWN,
- KEY_UP,
-
- KEY_NUMLOCKCLEAR,
- KEY_KP_DIVIDE,
- KEY_KP_MULTIPLY,
- KEY_KP_MINUS,
- KEY_KP_PLUS,
- KEY_KP_ENTER,
- KEY_KP_1,
- KEY_KP_2,
- KEY_KP_3,
- KEY_KP_4,
- KEY_KP_5,
- KEY_KP_6,
- KEY_KP_7,
- KEY_KP_8,
- KEY_KP_9,
- KEY_KP_0,
- KEY_KP_PERIOD,
- KEY_KP_COMMA,
- KEY_KP_EQUALS,
-
- KEY_APPLICATION,
- KEY_POWER,
- KEY_F13,
- KEY_F14,
- KEY_F15,
- KEY_F16,
- KEY_F17,
- KEY_F18,
- KEY_F19,
- KEY_F20,
- KEY_F21,
- KEY_F22,
- KEY_F23,
- KEY_F24,
- KEY_EXECUTE,
- KEY_HELP,
- KEY_MENU,
- KEY_SELECT,
- KEY_STOP,
- KEY_AGAIN,
- KEY_UNDO,
- KEY_CUT,
- KEY_COPY,
- KEY_PASTE,
- KEY_FIND,
- KEY_MUTE,
- KEY_VOLUMEUP,
- KEY_VOLUMEDOWN,
-
- KEY_ALTERASE,
- KEY_SYSREQ,
- KEY_CANCEL,
- KEY_CLEAR,
- KEY_PRIOR,
- KEY_RETURN2,
- KEY_SEPARATOR,
- KEY_OUT,
- KEY_OPER,
- KEY_CLEARAGAIN,
-
- KEY_THOUSANDSSEPARATOR,
- KEY_DECIMALSEPARATOR,
- KEY_CURRENCYUNIT,
- KEY_CURRENCYSUBUNIT,
-
- KEY_LCTRL,
- KEY_LSHIFT,
- KEY_LALT,
- KEY_LGUI,
- KEY_RCTRL,
- KEY_RSHIFT,
- KEY_RALT,
- KEY_RGUI,
-
- KEY_MODE,
-
- KEY_AUDIONEXT,
- KEY_AUDIOPREV,
- KEY_AUDIOSTOP,
- KEY_AUDIOPLAY,
- KEY_AUDIOMUTE,
- KEY_MEDIASELECT,
- KEY_WWW,
- KEY_MAIL,
- KEY_CALCULATOR,
- KEY_COMPUTER,
- KEY_APP_SEARCH,
- KEY_APP_HOME,
- KEY_APP_BACK,
- KEY_APP_FORWARD,
- KEY_APP_STOP,
- KEY_APP_REFRESH,
- KEY_APP_BOOKMARKS,
-
- KEY_BRIGHTNESSDOWN,
- KEY_BRIGHTNESSUP,
- KEY_DISPLAYSWITCH,
- KEY_KBDILLUMTOGGLE,
- KEY_KBDILLUMDOWN,
- KEY_KBDILLUMUP,
- KEY_EJECT,
- KEY_SLEEP,
-
- KEY_MAX_ENUM
-};
-
-/**
-* Scancodes represent physical keys independent of the current layout.
-* Their names may not match the names of the keys printed on the keyboard.
-* Some of them are very esoteric...
-**/
-enum Scancode
-{
- SCANCODE_UNKNOWN,
-
- SCANCODE_A,
- SCANCODE_B,
- SCANCODE_C,
- SCANCODE_D,
- SCANCODE_E,
- SCANCODE_F,
- SCANCODE_G,
- SCANCODE_H,
- SCANCODE_I,
- SCANCODE_J,
- SCANCODE_K,
- SCANCODE_L,
- SCANCODE_M,
- SCANCODE_N,
- SCANCODE_O,
- SCANCODE_P,
- SCANCODE_Q,
- SCANCODE_R,
- SCANCODE_S,
- SCANCODE_T,
- SCANCODE_U,
- SCANCODE_V,
- SCANCODE_W,
- SCANCODE_X,
- SCANCODE_Y,
- SCANCODE_Z,
-
- SCANCODE_1,
- SCANCODE_2,
- SCANCODE_3,
- SCANCODE_4,
- SCANCODE_5,
- SCANCODE_6,
- SCANCODE_7,
- SCANCODE_8,
- SCANCODE_9,
- SCANCODE_0,
-
- SCANCODE_RETURN,
- SCANCODE_ESCAPE,
- SCANCODE_BACKSPACE,
- SCANCODE_TAB,
- SCANCODE_SPACE,
-
- SCANCODE_MINUS,
- SCANCODE_EQUALS,
- SCANCODE_LEFTBRACKET,
- SCANCODE_RIGHTBRACKET,
- SCANCODE_BACKSLASH,
- SCANCODE_NONUSHASH,
- SCANCODE_SEMICOLON,
- SCANCODE_APOSTROPHE,
- SCANCODE_GRAVE,
- SCANCODE_COMMA,
- SCANCODE_PERIOD,
- SCANCODE_SLASH,
-
- SCANCODE_CAPSLOCK,
-
- SCANCODE_F1,
- SCANCODE_F2,
- SCANCODE_F3,
- SCANCODE_F4,
- SCANCODE_F5,
- SCANCODE_F6,
- SCANCODE_F7,
- SCANCODE_F8,
- SCANCODE_F9,
- SCANCODE_F10,
- SCANCODE_F11,
- SCANCODE_F12,
-
- SCANCODE_PRINTSCREEN,
- SCANCODE_SCROLLLOCK,
- SCANCODE_PAUSE,
- SCANCODE_INSERT,
- SCANCODE_HOME,
- SCANCODE_PAGEUP,
- SCANCODE_DELETE,
- SCANCODE_END,
- SCANCODE_PAGEDOWN,
- SCANCODE_RIGHT,
- SCANCODE_LEFT,
- SCANCODE_DOWN,
- SCANCODE_UP,
-
- SCANCODE_NUMLOCKCLEAR,
- SCANCODE_KP_DIVIDE,
- SCANCODE_KP_MULTIPLY,
- SCANCODE_KP_MINUS,
- SCANCODE_KP_PLUS,
- SCANCODE_KP_ENTER,
- SCANCODE_KP_1,
- SCANCODE_KP_2,
- SCANCODE_KP_3,
- SCANCODE_KP_4,
- SCANCODE_KP_5,
- SCANCODE_KP_6,
- SCANCODE_KP_7,
- SCANCODE_KP_8,
- SCANCODE_KP_9,
- SCANCODE_KP_0,
- SCANCODE_KP_PERIOD,
-
- SCANCODE_NONUSBACKSLASH,
- SCANCODE_APPLICATION,
- SCANCODE_POWER,
- SCANCODE_KP_EQUALS,
- SCANCODE_F13,
- SCANCODE_F14,
- SCANCODE_F15,
- SCANCODE_F16,
- SCANCODE_F17,
- SCANCODE_F18,
- SCANCODE_F19,
- SCANCODE_F20,
- SCANCODE_F21,
- SCANCODE_F22,
- SCANCODE_F23,
- SCANCODE_F24,
- SCANCODE_EXECUTE,
- SCANCODE_HELP,
- SCANCODE_MENU,
- SCANCODE_SELECT,
- SCANCODE_STOP,
- SCANCODE_AGAIN,
- SCANCODE_UNDO,
- SCANCODE_CUT,
- SCANCODE_COPY,
- SCANCODE_PASTE,
- SCANCODE_FIND,
- SCANCODE_MUTE,
- SCANCODE_VOLUMEUP,
- SCANCODE_VOLUMEDOWN,
- SCANCODE_KP_COMMA,
- SCANCODE_KP_EQUALSAS400,
-
- SCANCODE_INTERNATIONAL1,
- SCANCODE_INTERNATIONAL2,
- SCANCODE_INTERNATIONAL3,
- SCANCODE_INTERNATIONAL4,
- SCANCODE_INTERNATIONAL5,
- SCANCODE_INTERNATIONAL6,
- SCANCODE_INTERNATIONAL7,
- SCANCODE_INTERNATIONAL8,
- SCANCODE_INTERNATIONAL9,
- SCANCODE_LANG1,
- SCANCODE_LANG2,
- SCANCODE_LANG3,
- SCANCODE_LANG4,
- SCANCODE_LANG5,
- SCANCODE_LANG6,
- SCANCODE_LANG7,
- SCANCODE_LANG8,
- SCANCODE_LANG9,
-
- SCANCODE_ALTERASE,
- SCANCODE_SYSREQ,
- SCANCODE_CANCEL,
- SCANCODE_CLEAR,
- SCANCODE_PRIOR,
- SCANCODE_RETURN2,
- SCANCODE_SEPARATOR,
- SCANCODE_OUT,
- SCANCODE_OPER,
- SCANCODE_CLEARAGAIN,
- SCANCODE_CRSEL,
- SCANCODE_EXSEL,
-
- SCANCODE_KP_00,
- SCANCODE_KP_000,
- SCANCODE_THOUSANDSSEPARATOR,
- SCANCODE_DECIMALSEPARATOR,
- SCANCODE_CURRENCYUNIT,
- SCANCODE_CURRENCYSUBUNIT,
- SCANCODE_KP_LEFTPAREN,
- SCANCODE_KP_RIGHTPAREN,
- SCANCODE_KP_LEFTBRACE,
- SCANCODE_KP_RIGHTBRACE,
- SCANCODE_KP_TAB,
- SCANCODE_KP_BACKSPACE,
- SCANCODE_KP_A,
- SCANCODE_KP_B,
- SCANCODE_KP_C,
- SCANCODE_KP_D,
- SCANCODE_KP_E,
- SCANCODE_KP_F,
- SCANCODE_KP_XOR,
- SCANCODE_KP_POWER,
- SCANCODE_KP_PERCENT,
- SCANCODE_KP_LESS,
- SCANCODE_KP_GREATER,
- SCANCODE_KP_AMPERSAND,
- SCANCODE_KP_DBLAMPERSAND,
- SCANCODE_KP_VERTICALBAR,
- SCANCODE_KP_DBLVERTICALBAR,
- SCANCODE_KP_COLON,
- SCANCODE_KP_HASH,
- SCANCODE_KP_SPACE,
- SCANCODE_KP_AT,
- SCANCODE_KP_EXCLAM,
- SCANCODE_KP_MEMSTORE,
- SCANCODE_KP_MEMRECALL,
- SCANCODE_KP_MEMCLEAR,
- SCANCODE_KP_MEMADD,
- SCANCODE_KP_MEMSUBTRACT,
- SCANCODE_KP_MEMMULTIPLY,
- SCANCODE_KP_MEMDIVIDE,
- SCANCODE_KP_PLUSMINUS,
- SCANCODE_KP_CLEAR,
- SCANCODE_KP_CLEARENTRY,
- SCANCODE_KP_BINARY,
- SCANCODE_KP_OCTAL,
- SCANCODE_KP_DECIMAL,
- SCANCODE_KP_HEXADECIMAL,
-
- SCANCODE_LCTRL,
- SCANCODE_LSHIFT,
- SCANCODE_LALT,
- SCANCODE_LGUI,
- SCANCODE_RCTRL,
- SCANCODE_RSHIFT,
- SCANCODE_RALT,
- SCANCODE_RGUI,
-
- SCANCODE_MODE,
-
- SCANCODE_AUDIONEXT,
- SCANCODE_AUDIOPREV,
- SCANCODE_AUDIOSTOP,
- SCANCODE_AUDIOPLAY,
- SCANCODE_AUDIOMUTE,
- SCANCODE_MEDIASELECT,
- SCANCODE_WWW,
- SCANCODE_MAIL,
- SCANCODE_CALCULATOR,
- SCANCODE_COMPUTER,
- SCANCODE_AC_SEARCH,
- SCANCODE_AC_HOME,
- SCANCODE_AC_BACK,
- SCANCODE_AC_FORWARD,
- SCANCODE_AC_STOP,
- SCANCODE_AC_REFRESH,
- SCANCODE_AC_BOOKMARKS,
-
- SCANCODE_BRIGHTNESSDOWN,
- SCANCODE_BRIGHTNESSUP,
- SCANCODE_DISPLAYSWITCH,
- SCANCODE_KBDILLUMTOGGLE,
- SCANCODE_KBDILLUMDOWN,
- SCANCODE_KBDILLUMUP,
- SCANCODE_EJECT,
- SCANCODE_SLEEP,
-
- SCANCODE_APP1,
- SCANCODE_APP2,
-
- SCANCODE_MAX_ENUM
-};