Merge branch 'main' into SP3-129-AudioSystem
This commit is contained in:
commit
3c3b6a285b
|
@ -1,6 +1,8 @@
|
|||
#include "SHPch.h"
|
||||
#include "SHWindowMap.h"
|
||||
#include "SHWindow.h"
|
||||
#include "ECS_Base/Managers/SHSystemManager.h"
|
||||
#include "Input/SHInputManagerSystem.h"
|
||||
|
||||
|
||||
namespace SHADE
|
||||
|
@ -339,6 +341,14 @@ namespace SHADE
|
|||
OnPosChange(reinterpret_cast<LPWINDOWPOS>(lparam));
|
||||
break;
|
||||
}
|
||||
case WM_MOUSEWHEEL:
|
||||
{
|
||||
if (auto im = SHSystemManager::GetSystem<SHInputManagerSystem>())
|
||||
{
|
||||
im->PollWheelVerticalDelta(wparam);
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
return ::DefWindowProc(hwnd, msg, wparam, lparam);
|
||||
}
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
#pragma once
|
||||
//#include <Xinput.h>
|
||||
//#include "../../SHADE_Managed/src/SHpch.h"
|
||||
#include "SH_API.h"
|
||||
#include "ECS_Base/System/SHSystem.h"
|
||||
#include "ECS_Base/System/SHFixedSystemRoutine.h"
|
||||
|
||||
|
|
Loading…
Reference in New Issue