hyzboy/CMPlatform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/hyzboy/CMPlatform into HEAD

Browse Source
This commit is contained in:
hyzboy 2021-01-15 20:37:03 +08:00
commit cb60d5ce9c
3 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
inc/hgl/platform/Window.h
View File

@ -30,17 +30,17 @@ namespace hgl
virtual void ProcMouseMove (int x,int y) {SafeCallEvent(OnMouseMove, (x,y));} virtual void ProcMouseMove (int x,int y) {SafeCallEvent(OnMouseMove, (x,y));}
virtual void ProcMouseWheel (int v,int h,uint mb) {SafeCallEvent(OnMouseWheel, (v,h,mb));} virtual void ProcMouseWheel (int v,int h,uint mb) {SafeCallEvent(OnMouseWheel, (v,h,mb));}
virtual void ProcMouseDown (int x,int y,uint mb) {SafeCallEvent(OnMouseDown, (x,y,mb));} virtual void ProcMousePressed (int x,int y,uint mb) {SafeCallEvent(OnMousePressed, (x,y,mb));}
virtual void ProcMouseUp (int x,int y,uint mb) {SafeCallEvent(OnMouseUp, (x,y,mb));} virtual void ProcMouseReleased (int x,int y,uint mb) {SafeCallEvent(OnMouseReleased, (x,y,mb));}
virtual void ProcMouseDblClick (int x,int y,uint mb) {SafeCallEvent(OnMouseDblClick, (x,y,mb));} virtual void ProcMouseDblClicked(int x,int y,uint mb) {SafeCallEvent(OnMouseDblClicked, (x,y,mb));}
//virtual void ProcJoystickDown (uint); //virtual void ProcJoystickPressed (uint);
//virtual void ProcJoystickPress (uint); //virtual void ProcJoystickRepeat (uint);
//virtual void ProcJoystickUp (uint); //virtual void ProcJoystickReleased(uint);
virtual void ProcKeyDown (KeyboardButton); virtual void ProcKeyPressed (KeyboardButton);
virtual void ProcKeyPress (KeyboardButton kb){SafeCallEvent(OnKeyPress,(kb));} virtual void ProcKeyRepeat (KeyboardButton kb){SafeCallEvent(OnKeyRepeat,(kb));}
virtual void ProcKeyUp (KeyboardButton); virtual void ProcKeyReleased(KeyboardButton);
virtual void ProcChar (os_char ch){SafeCallEvent(OnChar,(ch));} virtual void ProcChar (os_char ch){SafeCallEvent(OnChar,(ch));}
@ -56,19 +56,19 @@ namespace hgl
public: public:
DefEvent(void,OnMouseMove ,(int,int)); DefEvent(void,OnMouseMove, (int,int));
DefEvent(void,OnMouseWheel ,(int,int,uint)); DefEvent(void,OnMouseWheel, (int,int,uint));
DefEvent(void,OnMouseDown ,(int,int,uint)); DefEvent(void,OnMousePressed, (int,int,uint));
DefEvent(void,OnMouseUp ,(int,int,uint)); DefEvent(void,OnMouseReleased, (int,int,uint));
DefEvent(void,OnMouseDblClick ,(int,int,uint)); DefEvent(void,OnMouseDblClicked,(int,int,uint));
//DefEvent(void,OnJoystickDown ,(uint)); //DefEvent(void,OnJoystickDown ,(uint));
//DefEvent(void,OnJoystickPress ,(uint)); //DefEvent(void,OnJoystickPress ,(uint));
//DefEvent(void,OnJoystickUp ,(uint)); //DefEvent(void,OnJoystickUp ,(uint));
DefEvent(void,OnKeyDown ,(KeyboardButton)); DefEvent(void,OnKeyPressed, (KeyboardButton));
DefEvent(void,OnKeyPress,(KeyboardButton)); DefEvent(void,OnKeyRepeat, (KeyboardButton));
DefEvent(void,OnKeyUp ,(KeyboardButton)); DefEvent(void,OnKeyReleased,(KeyboardButton));
DefEvent(void,OnChar ,(os_char)); DefEvent(void,OnChar ,(os_char));

40
src/Win/WinMessage.cpp
View File

@ -205,17 +205,17 @@ namespace hgl
win->ProcMouse##action(x,y,mb##button|GetMouseKeyFlags(wParam)); \ win->ProcMouse##action(x,y,mb##button|GetMouseKeyFlags(wParam)); \
} }
WMEF_MOUSE(Left,Down); WMEF_MOUSE(Left,Pressed);
WMEF_MOUSE(Left,Up); WMEF_MOUSE(Left,Released);
WMEF_MOUSE(Left,DblClick); WMEF_MOUSE(Left,DblClicked);
WMEF_MOUSE(Mid,Down); WMEF_MOUSE(Mid,Pressed);
WMEF_MOUSE(Mid,Up); WMEF_MOUSE(Mid,Released);
WMEF_MOUSE(Mid,DblClick); WMEF_MOUSE(Mid,DblClicked);
WMEF_MOUSE(Right,Down); WMEF_MOUSE(Right,Pressed);
WMEF_MOUSE(Right,Up); WMEF_MOUSE(Right,Released);
WMEF_MOUSE(Right,DblClick); WMEF_MOUSE(Right,DblClicked);
void WMProcMouseMove(WinWindow *win,uint32 wParam,uint32 lParam) void WMProcMouseMove(WinWindow *win,uint32 wParam,uint32 lParam)
{ {
@ -249,12 +249,12 @@ namespace hgl
#define WMEF1(name) void name(WinWindow *win,uint32 wParam,uint32) #define WMEF1(name) void name(WinWindow *win,uint32 wParam,uint32)
WMEF1(WMProcKeyDown) WMEF1(WMProcKeyDown)
{ {
win->ProcKeyDown(ConvertOSKey(wParam)); win->ProcKeyPressed(ConvertOSKey(wParam));
} }
WMEF1(WMProcKeyUp) WMEF1(WMProcKeyUp)
{ {
win->ProcKeyUp(ConvertOSKey(wParam)); win->ProcKeyReleased(ConvertOSKey(wParam));
} }
WMEF1(WMProcChar) WMEF1(WMProcChar)
@ -283,15 +283,15 @@ namespace hgl
#define WM_MAP(wm,func) WMProc[wm]=func; #define WM_MAP(wm,func) WMProc[wm]=func;
WM_MAP(WM_CLOSE ,WMProcDestroy); WM_MAP(WM_CLOSE ,WMProcDestroy);
WM_MAP(WM_LBUTTONDOWN ,WMProcMouseLeftDown); WM_MAP(WM_LBUTTONDOWN ,WMProcMouseLeftPressed);
WM_MAP(WM_LBUTTONUP ,WMProcMouseLeftUp); WM_MAP(WM_LBUTTONUP ,WMProcMouseLeftReleased);
WM_MAP(WM_LBUTTONDBLCLK ,WMProcMouseLeftDblClick); WM_MAP(WM_LBUTTONDBLCLK ,WMProcMouseLeftDblClicked);
WM_MAP(WM_MBUTTONDOWN ,WMProcMouseMidDown); WM_MAP(WM_MBUTTONDOWN ,WMProcMouseMidPressed);
WM_MAP(WM_MBUTTONUP ,WMProcMouseMidUp); WM_MAP(WM_MBUTTONUP ,WMProcMouseMidReleased);
WM_MAP(WM_MBUTTONDBLCLK ,WMProcMouseMidDblClick); WM_MAP(WM_MBUTTONDBLCLK ,WMProcMouseMidDblClicked);
WM_MAP(WM_RBUTTONDOWN ,WMProcMouseRightDown); WM_MAP(WM_RBUTTONDOWN ,WMProcMouseRightPressed);
WM_MAP(WM_RBUTTONUP ,WMProcMouseRightUp); WM_MAP(WM_RBUTTONUP ,WMProcMouseRightReleased);
WM_MAP(WM_RBUTTONDBLCLK ,WMProcMouseRightDblClick); WM_MAP(WM_RBUTTONDBLCLK ,WMProcMouseRightDblClicked);
WM_MAP(WM_MOUSEWHEEL ,WMProcMouseWheel); WM_MAP(WM_MOUSEWHEEL ,WMProcMouseWheel);
WM_MAP(WM_MOUSEHWHEEL ,WMProcMouseHWheel); WM_MAP(WM_MOUSEHWHEEL ,WMProcMouseHWheel);
WM_MAP(WM_MOUSEMOVE ,WMProcMouseMove); WM_MAP(WM_MOUSEMOVE ,WMProcMouseMove);

13
src/Window.cpp
View File

@ -2,21 +2,21 @@
namespace hgl namespace hgl
{ {
void Window::ProcKeyDown(KeyboardButton kb) void Window::ProcKeyPressed(KeyboardButton kb)
{ {
if(key_push[kb]) if(key_push[kb])
ProcKeyPress(kb); ProcKeyRepeat(kb);
else else
key_push[kb]=true; key_push[kb]=true;
SafeCallEvent(OnKeyDown,(kb)); SafeCallEvent(OnKeyPressed,(kb));
} }
void Window::ProcKeyUp(KeyboardButton kb) void Window::ProcKeyReleased(KeyboardButton kb)
{ {
key_push[kb]=false; key_push[kb]=false;
SafeCallEvent(OnKeyUp,(kb)); SafeCallEvent(OnKeyReleased,(kb));
} }
void Window::ProcResize(uint w,uint h) void Window::ProcResize(uint w,uint h)
@ -58,7 +58,8 @@ namespace hgl
if(is_close) if(is_close)
return(false); return(false);
if(!active||is_min) // if(!active||is_min)
if(is_min)
this->WaitMessage(); this->WaitMessage();
return(true); return(true);