used utf8 instead of gb18080 in few files.
This commit is contained in:
parent
f62c0e3110
commit
7e469db038
@ -1,4 +1,4 @@
|
||||
#ifndef HGL_EVENT_PROC_INCLUDE
|
||||
#ifndef HGL_EVENT_PROC_INCLUDE
|
||||
#define HGL_EVENT_PROC_INCLUDE
|
||||
|
||||
#include<hgl/type/Queue.h>
|
||||
@ -6,7 +6,7 @@
|
||||
namespace hgl
|
||||
{
|
||||
/**
|
||||
* 事件基类
|
||||
* 事件基类
|
||||
*/
|
||||
class EventProc
|
||||
{
|
||||
@ -21,7 +21,7 @@ namespace hgl
|
||||
using EventProcQueue=Queue<EventProc *>;
|
||||
|
||||
/**
|
||||
* 执行一个事件
|
||||
* 执行一个事件
|
||||
*/
|
||||
inline bool UpdateEvent(EventProcQueue *epq)
|
||||
{
|
||||
@ -42,9 +42,9 @@ namespace hgl
|
||||
}
|
||||
|
||||
/**
|
||||
* 刷新执行事件队列
|
||||
* @param epq 事件队列
|
||||
* @param max_count 最大刷新个数(-1表示无限制)
|
||||
* 刷新执行事件队列
|
||||
* @param epq 事件队列
|
||||
* @param max_count 最大刷新个数(-1表示无限制)
|
||||
*/
|
||||
inline int UpdateEventQueue(EventProcQueue *epq,int max_count=-1)
|
||||
{
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef HGL_IO_INPUT_EVENT_INCLUDE
|
||||
#ifndef HGL_IO_INPUT_EVENT_INCLUDE
|
||||
#define HGL_IO_INPUT_EVENT_INCLUDE
|
||||
|
||||
#include<hgl/type/SortedSets.h>
|
||||
@ -9,15 +9,15 @@ namespace hgl
|
||||
{
|
||||
struct EventHeader
|
||||
{
|
||||
uint8 type; ///<输入源类型
|
||||
uint8 index; ///<输入源索引(比如同一设备有多个)
|
||||
uint16 id; ///<事件id
|
||||
uint8 type; ///<输入源类型
|
||||
uint8 index; ///<输入源索引(比如同一设备有多个)
|
||||
uint16 id; ///<事件id
|
||||
};
|
||||
|
||||
constexpr size_t EventHeaderBytes=sizeof(EventHeader);
|
||||
|
||||
/**
|
||||
* 事件处理结果
|
||||
* 事件处理结果
|
||||
*/
|
||||
enum class EventProcResult
|
||||
{
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef HGL_IO_DEVICE_MOUSE_EVENT_INCLUDE
|
||||
#ifndef HGL_IO_DEVICE_MOUSE_EVENT_INCLUDE
|
||||
#define HGL_IO_DEVICE_MOUSE_EVENT_INCLUDE
|
||||
|
||||
#include<hgl/TypeFunc.h>
|
||||
@ -7,7 +7,7 @@ namespace hgl
|
||||
namespace io
|
||||
{
|
||||
/**
|
||||
* 手柄按键枚举
|
||||
* 手柄按键枚举
|
||||
*/
|
||||
enum class JoystickButton
|
||||
{
|
||||
@ -33,10 +33,10 @@ namespace hgl
|
||||
Left =JoystickButton::Left,
|
||||
Right =JoystickButton::Right,
|
||||
|
||||
Fork =JoystickButton::_0, // 叉
|
||||
Circle =JoystickButton::_1, // 圆
|
||||
Square =JoystickButton::_2, // 方
|
||||
Triangle =JoystickButton::_3, // 三角
|
||||
Fork =JoystickButton::_0, // 叉
|
||||
Circle =JoystickButton::_1, // 圆
|
||||
Square =JoystickButton::_2, // 方
|
||||
Triangle =JoystickButton::_3, // 三角
|
||||
|
||||
L1 =JoystickButton::_6, L2 =JoystickButton::_4,
|
||||
R1 =JoystickButton::_7, R2 =JoystickButton::_5,
|
||||
@ -54,7 +54,7 @@ namespace hgl
|
||||
// R=JoystickButton::_5,
|
||||
|
||||
// //XBOX/XBOX360
|
||||
// //XBOX, //西瓜键
|
||||
// //XBOX, //西瓜键
|
||||
//};
|
||||
}//namespace io
|
||||
}//namespace hgl
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef HGL_IO_KEYBOARD_EVENT_INCLUDE
|
||||
#ifndef HGL_IO_KEYBOARD_EVENT_INCLUDE
|
||||
#define HGL_IO_KEYBOARD_EVENT_INCLUDE
|
||||
|
||||
#include<hgl/io/event/InputEvent.h>
|
||||
@ -7,15 +7,15 @@ namespace hgl
|
||||
namespace io
|
||||
{
|
||||
/**
|
||||
* 按键枚举定义
|
||||
* 按键枚举定义
|
||||
*/
|
||||
enum class KeyboardButton
|
||||
{
|
||||
NONE=0,
|
||||
//主键盘区
|
||||
//主键盘区
|
||||
Esc, ///<ESC
|
||||
|
||||
//F功能键
|
||||
//F功能键
|
||||
F1, ///<F1
|
||||
F2, ///<F2
|
||||
F3, ///<F3
|
||||
@ -29,26 +29,26 @@ namespace hgl
|
||||
F11, ///<F11
|
||||
F12, ///<F12
|
||||
|
||||
Grave, //<`号(主键盘数字键1左边的按钮)
|
||||
Grave, //<`号(主键盘数字键1左边的按钮)
|
||||
|
||||
//10个数字
|
||||
_0, ///<数字键0
|
||||
_1, ///<数字键1
|
||||
_2, ///<数字键2
|
||||
_3, ///<数字键3
|
||||
_4, ///<数字键4
|
||||
_5, ///<数字键5
|
||||
_6, ///<数字键6
|
||||
_7, ///<数字键7
|
||||
_8, ///<数字键8
|
||||
_9, ///<数字键9
|
||||
//10个数字
|
||||
_0, ///<数字键0
|
||||
_1, ///<数字键1
|
||||
_2, ///<数字键2
|
||||
_3, ///<数字键3
|
||||
_4, ///<数字键4
|
||||
_5, ///<数字键5
|
||||
_6, ///<数字键6
|
||||
_7, ///<数字键7
|
||||
_8, ///<数字键8
|
||||
_9, ///<数字键9
|
||||
|
||||
Minus, ///< - (减号)
|
||||
Equals, ///< = (等号)
|
||||
BackSlash, ///< \ (反斜杠)
|
||||
BackSpace, ///< 退格键
|
||||
Minus, ///< - (减号)
|
||||
Equals, ///< = (等号)
|
||||
BackSlash, ///< \ (反斜杠)
|
||||
BackSpace, ///< 退格键
|
||||
|
||||
Tab, ///<Tab键
|
||||
Tab, ///<Tab键
|
||||
|
||||
A, ///<A
|
||||
B, ///<B
|
||||
@ -80,66 +80,66 @@ namespace hgl
|
||||
LeftBracket, ///<[
|
||||
RightBracket, ///<]
|
||||
|
||||
CapsLock, ///<大写锁定键
|
||||
CapsLock, ///<大写锁定键
|
||||
|
||||
Semicolon, ///<; (分号)
|
||||
Apostrophe, ///<' (单引号)
|
||||
Enter, ///<回车键
|
||||
Semicolon, ///<; (分号)
|
||||
Apostrophe, ///<' (单引号)
|
||||
Enter, ///<回车键
|
||||
|
||||
LeftShift, ///<左边的Shift键
|
||||
LeftShift, ///<左边的Shift键
|
||||
|
||||
Comma, ///<, (逗号)
|
||||
Period, ///<. (句号)
|
||||
Slash, ///</ (除号)
|
||||
RightShift, ///<右边的Shift键
|
||||
Comma, ///<, (逗号)
|
||||
Period, ///<. (句号)
|
||||
Slash, ///</ (除号)
|
||||
RightShift, ///<右边的Shift键
|
||||
|
||||
LeftCtrl, ///<左边的Ctrl键
|
||||
LeftOS, ///<左边的OS键(Win/Apple键)
|
||||
LeftAlt, ///<左边的Alt键
|
||||
Space, ///<空格键
|
||||
RightAlt, ///<右边的Alt键
|
||||
RightOS, ///<右边的OS键(Win/Apple键)
|
||||
RightMenu, ///<右边的Menu键
|
||||
RightCtrl, ///<右边的Ctrl键
|
||||
LeftCtrl, ///<左边的Ctrl键
|
||||
LeftOS, ///<左边的OS键(Win/Apple键)
|
||||
LeftAlt, ///<左边的Alt键
|
||||
Space, ///<空格键
|
||||
RightAlt, ///<右边的Alt键
|
||||
RightOS, ///<右边的OS键(Win/Apple键)
|
||||
RightMenu, ///<右边的Menu键
|
||||
RightCtrl, ///<右边的Ctrl键
|
||||
|
||||
//中键盘区
|
||||
PrintScreen, ///<打印屏幕键
|
||||
ScrollLock, ///<滚动锁定键
|
||||
Pause, ///<暂停键
|
||||
//中键盘区
|
||||
PrintScreen, ///<打印屏幕键
|
||||
ScrollLock, ///<滚动锁定键
|
||||
Pause, ///<暂停键
|
||||
|
||||
Insert, ///<插入键
|
||||
Delete, ///<删除键
|
||||
Home, ///<行首键
|
||||
End, ///<行尾键
|
||||
PageUp, ///<向前翻页键
|
||||
PageDown, ///<向后翻页键
|
||||
Insert, ///<插入键
|
||||
Delete, ///<删除键
|
||||
Home, ///<行首键
|
||||
End, ///<行尾键
|
||||
PageUp, ///<向前翻页键
|
||||
PageDown, ///<向后翻页键
|
||||
|
||||
Up, ///<↑光标键
|
||||
Down, ///<↓光标键
|
||||
Left, ///<←光标键
|
||||
Right, ///<→光标键
|
||||
Up, ///<↑光标键
|
||||
Down, ///<↓光标键
|
||||
Left, ///<←光标键
|
||||
Right, ///<→光标键
|
||||
|
||||
//小键盘区
|
||||
NumLock, ///<小键盘 数字锁定键
|
||||
//小键盘区
|
||||
NumLock, ///<小键盘 数字锁定键
|
||||
|
||||
NumAdd, ///<小键盘 +
|
||||
NumSubtract, ///<小键盘 -
|
||||
NumMultiply, ///<小键盘 *
|
||||
NumDivide, ///<小键盘 /
|
||||
NumAdd, ///<小键盘 +
|
||||
NumSubtract, ///<小键盘 -
|
||||
NumMultiply, ///<小键盘 *
|
||||
NumDivide, ///<小键盘 /
|
||||
|
||||
Num0, ///<小键盘 0
|
||||
Num1, ///<小键盘 1
|
||||
Num2, ///<小键盘 2
|
||||
Num3, ///<小键盘 3
|
||||
Num4, ///<小键盘 4
|
||||
Num5, ///<小键盘 5
|
||||
Num6, ///<小键盘 6
|
||||
Num7, ///<小键盘 7
|
||||
Num8, ///<小键盘 8
|
||||
Num9, ///<小键盘 9
|
||||
Num0, ///<小键盘 0
|
||||
Num1, ///<小键盘 1
|
||||
Num2, ///<小键盘 2
|
||||
Num3, ///<小键盘 3
|
||||
Num4, ///<小键盘 4
|
||||
Num5, ///<小键盘 5
|
||||
Num6, ///<小键盘 6
|
||||
Num7, ///<小键盘 7
|
||||
Num8, ///<小键盘 8
|
||||
Num9, ///<小键盘 9
|
||||
|
||||
NumDecimal, ///<小键盘 . (小数点/删除键)
|
||||
NumEnter, ///<小键盘 回车键
|
||||
NumDecimal, ///<小键盘 . (小数点/删除键)
|
||||
NumEnter, ///<小键盘 回车键
|
||||
|
||||
ENUM_CLASS_RANGE(NONE,NumEnter)
|
||||
};//enum KeyboardButton
|
||||
@ -227,7 +227,7 @@ namespace hgl
|
||||
public:
|
||||
|
||||
/**
|
||||
* 某按键是否按下状态
|
||||
* 某按键是否按下状态
|
||||
*/
|
||||
const bool HasPressed(const KeyboardButton &kb)const
|
||||
{
|
||||
@ -237,7 +237,7 @@ namespace hgl
|
||||
}
|
||||
|
||||
/**
|
||||
* 设定当前时间
|
||||
* 设定当前时间
|
||||
*/
|
||||
void SetCurTime(const double &ct)
|
||||
{
|
||||
@ -245,7 +245,7 @@ namespace hgl
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取按键按下的时间
|
||||
* 获取按键按下的时间
|
||||
*/
|
||||
const double GetPressedTime(const KeyboardButton &kb)const
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user