xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Merge branch 'main' into SP3-129-AudioSystem

This commit is contained in:
Glence 2022-09-27 14:11:16 +08:00
parent ee7cb36896 033414f7ea
commit 3c3b6a285b
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SHADE_Engine/src/Graphics/Windowing/SHWindow.cpp
View File

@ -1,6 +1,8 @@
#include "SHPch.h" #include "SHPch.h"
#include "SHWindowMap.h" #include "SHWindowMap.h"
#include "SHWindow.h" #include "SHWindow.h"
#include "ECS_Base/Managers/SHSystemManager.h"
#include "Input/SHInputManagerSystem.h"
namespace SHADE namespace SHADE
@ -339,6 +341,14 @@ namespace SHADE
OnPosChange(reinterpret_cast<LPWINDOWPOS>(lparam)); OnPosChange(reinterpret_cast<LPWINDOWPOS>(lparam));
break; break;
} }
case WM_MOUSEWHEEL:
{
if (auto im = SHSystemManager::GetSystem<SHInputManagerSystem>())
{
im->PollWheelVerticalDelta(wparam);
}
break;
}
default: default:
return ::DefWindowProc(hwnd, msg, wparam, lparam); return ::DefWindowProc(hwnd, msg, wparam, lparam);
} }

1
SHADE_Engine/src/Input/SHInputManagerSystem.h
View File

@ -12,6 +12,7 @@
#pragma once #pragma once
//#include <Xinput.h> //#include <Xinput.h>
//#include "../../SHADE_Managed/src/SHpch.h" //#include "../../SHADE_Managed/src/SHpch.h"
#include "SH_API.h"
#include "ECS_Base/System/SHSystem.h" #include "ECS_Base/System/SHSystem.h"
#include "ECS_Base/System/SHFixedSystemRoutine.h" #include "ECS_Base/System/SHFixedSystemRoutine.h"