连接修改,类型适配
This commit is contained in:
parent
46ae04cd50
commit
f0ff214289
@ -64,7 +64,7 @@ namespace hgl
|
|||||||
|
|
||||||
virtual void SetSystemCursor(bool){}
|
virtual void SetSystemCursor(bool){}
|
||||||
|
|
||||||
virtual bool Update();
|
virtual bool Update() override;
|
||||||
};//class Window
|
};//class Window
|
||||||
|
|
||||||
Window *CreateRenderWindow(const OSString &win_name);
|
Window *CreateRenderWindow(const OSString &win_name);
|
||||||
|
@ -184,7 +184,7 @@ namespace hgl
|
|||||||
|
|
||||||
void WMProcDestroy(InputEvent *ie,uint32,uint32)
|
void WMProcDestroy(InputEvent *ie,uint32,uint32)
|
||||||
{
|
{
|
||||||
event_header.type =(uint8)InputEventSource::Window;
|
event_header.type =InputEventSource::Window;
|
||||||
event_header.index =0;
|
event_header.index =0;
|
||||||
event_header.id =(uint16)WindowEventID::Close;
|
event_header.id =(uint16)WindowEventID::Close;
|
||||||
|
|
||||||
@ -200,7 +200,7 @@ namespace hgl
|
|||||||
mouse_event_data.y=HIWORD(lParam); \
|
mouse_event_data.y=HIWORD(lParam); \
|
||||||
mouse_event_data.button=(uint8)MouseButton::mouse_button; \
|
mouse_event_data.button=(uint8)MouseButton::mouse_button; \
|
||||||
\
|
\
|
||||||
event_header.type =(uint8)InputEventSource::Mouse; \
|
event_header.type =InputEventSource::Mouse; \
|
||||||
event_header.index =0; \
|
event_header.index =0; \
|
||||||
event_header.id =(uint16)MouseEventID::action; \
|
event_header.id =(uint16)MouseEventID::action; \
|
||||||
\
|
\
|
||||||
@ -225,7 +225,7 @@ namespace hgl
|
|||||||
mouse_event_data.y=HIWORD(lParam);
|
mouse_event_data.y=HIWORD(lParam);
|
||||||
mouse_event_data.button=0;
|
mouse_event_data.button=0;
|
||||||
|
|
||||||
event_header.type =(uint8)InputEventSource::Mouse;
|
event_header.type =InputEventSource::Mouse;
|
||||||
event_header.index =0;
|
event_header.index =0;
|
||||||
event_header.id =(uint16)MouseEventID::Move;
|
event_header.id =(uint16)MouseEventID::Move;
|
||||||
|
|
||||||
@ -243,7 +243,7 @@ namespace hgl
|
|||||||
mouse_event_data.y=zDelta;
|
mouse_event_data.y=zDelta;
|
||||||
mouse_event_data.button=0;
|
mouse_event_data.button=0;
|
||||||
|
|
||||||
event_header.type =(uint8)InputEventSource::Mouse;
|
event_header.type =InputEventSource::Mouse;
|
||||||
event_header.index =0;
|
event_header.index =0;
|
||||||
event_header.id =(uint16)MouseEventID::Wheel;
|
event_header.id =(uint16)MouseEventID::Wheel;
|
||||||
|
|
||||||
@ -259,7 +259,7 @@ namespace hgl
|
|||||||
mouse_event_data.y=0;
|
mouse_event_data.y=0;
|
||||||
mouse_event_data.button=0;
|
mouse_event_data.button=0;
|
||||||
|
|
||||||
event_header.type =(uint8)InputEventSource::Mouse;
|
event_header.type =InputEventSource::Mouse;
|
||||||
event_header.index =0;
|
event_header.index =0;
|
||||||
event_header.id =(uint16)MouseEventID::Wheel;
|
event_header.id =(uint16)MouseEventID::Wheel;
|
||||||
|
|
||||||
@ -268,7 +268,7 @@ namespace hgl
|
|||||||
|
|
||||||
WMEF2(WMProcSize)
|
WMEF2(WMProcSize)
|
||||||
{
|
{
|
||||||
event_header.type =(uint8)InputEventSource::Window;
|
event_header.type =InputEventSource::Window;
|
||||||
event_header.index =0;
|
event_header.index =0;
|
||||||
event_header.id =(uint16)WindowEventID::Resize;
|
event_header.id =(uint16)WindowEventID::Resize;
|
||||||
|
|
||||||
@ -284,7 +284,7 @@ namespace hgl
|
|||||||
#define WMEF1(name) void name(InputEvent *ie,uint32 wParam,uint32)
|
#define WMEF1(name) void name(InputEvent *ie,uint32 wParam,uint32)
|
||||||
WMEF1(WMProcKeyDown)
|
WMEF1(WMProcKeyDown)
|
||||||
{
|
{
|
||||||
event_header.type =(uint8)InputEventSource::Keyboard;
|
event_header.type =InputEventSource::Keyboard;
|
||||||
event_header.index =0;
|
event_header.index =0;
|
||||||
event_header.id =(uint16)KeyboardEventID::Pressed;
|
event_header.id =(uint16)KeyboardEventID::Pressed;
|
||||||
|
|
||||||
@ -295,7 +295,7 @@ namespace hgl
|
|||||||
|
|
||||||
WMEF1(WMProcKeyUp)
|
WMEF1(WMProcKeyUp)
|
||||||
{
|
{
|
||||||
event_header.type =(uint8)InputEventSource::Keyboard;
|
event_header.type =InputEventSource::Keyboard;
|
||||||
event_header.index =0;
|
event_header.index =0;
|
||||||
event_header.id =(uint16)KeyboardEventID::Released;
|
event_header.id =(uint16)KeyboardEventID::Released;
|
||||||
|
|
||||||
@ -306,7 +306,7 @@ namespace hgl
|
|||||||
|
|
||||||
WMEF1(WMProcChar)
|
WMEF1(WMProcChar)
|
||||||
{
|
{
|
||||||
event_header.type =(uint8)InputEventSource::Keyboard;
|
event_header.type =InputEventSource::Keyboard;
|
||||||
event_header.index =0;
|
event_header.index =0;
|
||||||
event_header.id =(uint16)KeyboardEventID::Char;
|
event_header.id =(uint16)KeyboardEventID::Char;
|
||||||
|
|
||||||
@ -320,7 +320,7 @@ namespace hgl
|
|||||||
//if(JoyPlugIn)
|
//if(JoyPlugIn)
|
||||||
// JoyInterface.SetInputActive(wParam);
|
// JoyInterface.SetInputActive(wParam);
|
||||||
|
|
||||||
event_header.type =(uint8)InputEventSource::Window;
|
event_header.type =InputEventSource::Window;
|
||||||
event_header.index =0;
|
event_header.index =0;
|
||||||
event_header.id =(uint16)WindowEventID::Active;
|
event_header.id =(uint16)WindowEventID::Active;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user