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

use new Mouse/KeyboardButton event names.

Browse Source
This commit is contained in:
hyzboy 2020-10-27 14:28:35 +08:00
parent 613be62b73
commit 35d0c6c9c9
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMPlatform

@ -1 +1 @@
Subproject commit 3d644e9550395a0635332ce044a4b6453cf694f8 Subproject commit 72b54414ac9148fc0adb7606f15932f388901dc9

40
example/common/VulkanAppFramework.h
View File

@ -30,19 +30,19 @@ private:
Window * win =nullptr; Window * win =nullptr;
VulkanInstance * inst =nullptr; VulkanInstance * inst =nullptr;
void OnKeyDown (KeyboardButton kb){key_status[kb]=true;} void OnKeyPressed (KeyboardButton kb){key_status[kb]=true;}
void OnKeyUp (KeyboardButton kb){key_status[kb]=false;} void OnKeyReleased (KeyboardButton kb){key_status[kb]=false;}
void OnKeyPress (KeyboardButton kb){KeyPress(kb);} void OnKeyRepeat (KeyboardButton kb){KeyRepeat(kb);}
protected: protected:
uint mouse_key=0; uint mouse_key=0;
Vector2f mouse_pos; Vector2f mouse_pos;
void OnMouseDown(int,int,uint mk){mouse_key=mk;MouseDown(mk);} void OnMousePressed (int,int,uint mk){mouse_key=mk;MousePressed(mk);}
void OnMouseUp (int,int,uint mk){mouse_key=0;MouseUp(mk);} void OnMouseReleased(int,int,uint mk){mouse_key=0;MouseReleased(mk);}
void OnMouseMove(int x,int y){mouse_pos.Set(x,y);MouseMove();} void OnMouseMove (int x,int y){mouse_pos.Set(x,y);MouseMove();}
void OnMouseWheel(int v,int h,uint mk){MouseWheel(v,h,mk);} void OnMouseWheel (int v,int h,uint mk){MouseWheel(v,h,mk);}
protected: protected:
@ -121,23 +121,23 @@ public:
InitCommandBuffer(); InitCommandBuffer();
SetEventCall(win->OnResize, this,VulkanApplicationFramework,OnResize ); SetEventCall(win->OnResize, this,VulkanApplicationFramework,OnResize );
SetEventCall(win->OnKeyDown, this,VulkanApplicationFramework,OnKeyDown ); SetEventCall(win->OnKeyPressed, this,VulkanApplicationFramework,OnKeyPressed );
SetEventCall(win->OnKeyUp, this,VulkanApplicationFramework,OnKeyUp ); SetEventCall(win->OnKeyReleased, this,VulkanApplicationFramework,OnKeyReleased );
SetEventCall(win->OnKeyPress, this,VulkanApplicationFramework,OnKeyPress ); SetEventCall(win->OnKeyRepeat, this,VulkanApplicationFramework,OnKeyRepeat );
SetEventCall(win->OnMouseDown, this,VulkanApplicationFramework,OnMouseDown ); SetEventCall(win->OnMousePressed, this,VulkanApplicationFramework,OnMousePressed );
SetEventCall(win->OnMouseUp, this,VulkanApplicationFramework,OnMouseUp ); SetEventCall(win->OnMouseReleased, this,VulkanApplicationFramework,OnMouseReleased );
SetEventCall(win->OnMouseMove, this,VulkanApplicationFramework,OnMouseMove ); SetEventCall(win->OnMouseMove, this,VulkanApplicationFramework,OnMouseMove );
SetEventCall(win->OnMouseWheel, this,VulkanApplicationFramework,OnMouseWheel); SetEventCall(win->OnMouseWheel, this,VulkanApplicationFramework,OnMouseWheel );
return(true); return(true);
} }
virtual void Resize(int,int)=0; virtual void Resize(int,int)=0;
virtual void KeyPress(KeyboardButton){} virtual void KeyRepeat(KeyboardButton){}
virtual void MouseDown(uint){} virtual void MousePressed(uint){}
virtual void MouseUp(uint){} virtual void MouseReleased(uint){}
virtual void MouseMove(){} virtual void MouseMove(){}
virtual void MouseWheel(int,int,uint){} virtual void MouseWheel(int,int,uint){}
@ -404,14 +404,14 @@ public:
return; return;
} }
virtual void KeyPress(KeyboardButton kb)override virtual void KeyRepeat(KeyboardButton kb)override
{ {
if(kb==kbMinus)move_speed*=0.9f;else if(kb==kbMinus)move_speed*=0.9f;else
if(kb==kbEquals)move_speed*=1.1f;else if(kb==kbEquals)move_speed*=1.1f;else
return; return;
} }
virtual void MouseDown(uint) override virtual void MousePressed(uint) override
{ {
mouse_last_pos=mouse_pos; mouse_last_pos=mouse_pos;
} }