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

made the Input Manager NOT be a System anymore

This commit is contained in:
mushgunAX 2022-10-01 14:34:30 +08:00
parent dc8d58d95c
commit 0360a8bfa1
4 changed files with 42 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SHADE_Application/src/Application/SBApplication.cpp
View File

@ -23,7 +23,7 @@
#include "Graphics/MiddleEnd/Interface/SHRenderable.h" #include "Graphics/MiddleEnd/Interface/SHRenderable.h"
#include "Scene/SHSceneManager.h" #include "Scene/SHSceneManager.h"
#include "Math/Transform/SHTransformSystem.h" #include "Math/Transform/SHTransformSystem.h"
#include "Input/SHInputManagerSystem.h" #include "Input/SHInputManager.h"
#include "FRC/SHFramerateController.h" #include "FRC/SHFramerateController.h"
//#include "AudioSystem/SHAudioSystem.h" //#include "AudioSystem/SHAudioSystem.h"
@ -58,7 +58,6 @@ namespace Sandbox
// TODO(Diren): Create Physics System here // TODO(Diren): Create Physics System here
SHADE::SHSystemManager::CreateSystem<SHADE::SHTransformSystem>(); SHADE::SHSystemManager::CreateSystem<SHADE::SHTransformSystem>();
SHADE::SHGraphicsSystem* graphicsSystem = static_cast<SHADE::SHGraphicsSystem*>(SHADE::SHSystemManager::GetSystem<SHADE::SHGraphicsSystem>()); SHADE::SHGraphicsSystem* graphicsSystem = static_cast<SHADE::SHGraphicsSystem*>(SHADE::SHSystemManager::GetSystem<SHADE::SHGraphicsSystem>());
SHADE::SHSystemManager::CreateSystem<SHADE::SHInputManagerSystem>();
//SHADE::SHSystemManager::CreateSystem<SHADE::SHAudioSystem>(); //SHADE::SHSystemManager::CreateSystem<SHADE::SHAudioSystem>();
// Create Routines // Create Routines
@ -80,8 +79,6 @@ namespace Sandbox
SHADE::SHComponentManager::CreateComponentSparseSet<SHADE::SHRenderable>(); SHADE::SHComponentManager::CreateComponentSparseSet<SHADE::SHRenderable>();
SHADE::SHComponentManager::CreateComponentSparseSet<SHADE::SHTransformComponent>(); SHADE::SHComponentManager::CreateComponentSparseSet<SHADE::SHTransformComponent>();
SHADE::SHSystemManager::RegisterRoutine<SHADE::SHInputManagerSystem, SHADE::SHInputManagerSystem::InputManagerRoutine>();
//TODO: REMOVE AFTER PRESENTATION //TODO: REMOVE AFTER PRESENTATION
SHADE::SHAssetManager::LoadDataTemp("../../Assets/racoon.gltf"); SHADE::SHAssetManager::LoadDataTemp("../../Assets/racoon.gltf");
SHADE::SHAssetManager::LoadDataTemp("../../Assets/RaccoonBag_Color_Ver4.dds"); SHADE::SHAssetManager::LoadDataTemp("../../Assets/RaccoonBag_Color_Ver4.dds");

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

@ -2,7 +2,7 @@
#include "SHWindowMap.h" #include "SHWindowMap.h"
#include "SHWindow.h" #include "SHWindow.h"
#include "ECS_Base/Managers/SHSystemManager.h" #include "ECS_Base/Managers/SHSystemManager.h"
#include "Input/SHInputManagerSystem.h" #include "Input/SHInputManager.h"
namespace SHADE namespace SHADE
@ -343,10 +343,7 @@ namespace SHADE
} }
case WM_MOUSEWHEEL: case WM_MOUSEWHEEL:
{ {
if (auto im = SHSystemManager::GetSystem<SHInputManagerSystem>()) SHInputManager::PollWheelVerticalDelta(wparam);
{
im->PollWheelVerticalDelta(wparam);
}
break; break;
} }
default: default:

80
SHADE_Engine/src/Input/SHInputManagerSystem.cpp → SHADE_Engine/src/Input/SHInputManager.cpp
View File

@ -1,5 +1,5 @@
/********************************************************************* /*********************************************************************
* \file SHInputManagerSystem.cpp * \file SHInputManager.cpp
* \author Ryan Wang Nian Jing * \author Ryan Wang Nian Jing
* \brief Definition of input manager. * \brief Definition of input manager.
* Handles input from keyboard and mouse. Soon to include controller. * Handles input from keyboard and mouse. Soon to include controller.
@ -11,7 +11,8 @@
#pragma once #pragma once
#include <SHpch.h> #include <SHpch.h>
#include "SHInputManagerSystem.h" #include "SHInputManager.h"
#include "../Tools/SHException.h"
namespace SHADE namespace SHADE
{ {
@ -19,61 +20,34 @@ namespace SHADE
/* Static defines */ /* Static defines */
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
unsigned SHInputManagerSystem::keyCount = 0; unsigned SHInputManager::keyCount = 0;
bool SHInputManagerSystem::keys[MAX_KEYS]; bool SHInputManager::keys[MAX_KEYS];
bool SHInputManagerSystem::keysLast[MAX_KEYS]; bool SHInputManager::keysLast[MAX_KEYS];
double SHInputManagerSystem::keysHeldTime[MAX_KEYS]; double SHInputManager::keysHeldTime[MAX_KEYS];
double SHInputManagerSystem::keysReleasedTime[MAX_KEYS]; double SHInputManager::keysReleasedTime[MAX_KEYS];
unsigned SHInputManagerSystem::keyToggleCount = 0; unsigned SHInputManager::keyToggleCount = 0;
bool SHInputManagerSystem::keysToggle[MAX_KEYS]; bool SHInputManager::keysToggle[MAX_KEYS];
bool SHInputManagerSystem::keysToggleLast[MAX_KEYS]; bool SHInputManager::keysToggleLast[MAX_KEYS];
double SHInputManagerSystem::keysToggleOnTime[MAX_KEYS]; double SHInputManager::keysToggleOnTime[MAX_KEYS];
double SHInputManagerSystem::keysToggleOffTime[MAX_KEYS]; double SHInputManager::keysToggleOffTime[MAX_KEYS];
int SHInputManagerSystem::mouseScreenX = 0; int SHInputManager::mouseScreenX = 0;
int SHInputManagerSystem::mouseScreenY = 0; int SHInputManager::mouseScreenY = 0;
int SHInputManagerSystem::mouseScreenXLast = 0; int SHInputManager::mouseScreenXLast = 0;
int SHInputManagerSystem::mouseScreenYLast = 0; int SHInputManager::mouseScreenYLast = 0;
double SHInputManagerSystem::mouseVelocityX = 0; double SHInputManager::mouseVelocityX = 0;
double SHInputManagerSystem::mouseVelocityY = 0; double SHInputManager::mouseVelocityY = 0;
int SHInputManagerSystem::mouseWheelVerticalDelta = 0; int SHInputManager::mouseWheelVerticalDelta = 0;
int SHInputManagerSystem::mouseWheelVerticalDeltaPoll = 0; int SHInputManager::mouseWheelVerticalDeltaPoll = 0;
void SHInputManagerSystem::Init() void SHInputManager::UpdateInput(double dt) noexcept
{
keyCount = 0;
SecureZeroMemory(keys, sizeof(keys));
SecureZeroMemory(keysLast, sizeof(keysLast));
SecureZeroMemory(keysHeldTime, sizeof(keysHeldTime));
SecureZeroMemory(keysReleasedTime, sizeof(keysReleasedTime));
keyToggleCount = 0;
SecureZeroMemory(keysToggle, sizeof(keysToggle));
SecureZeroMemory(keysToggleLast, sizeof(keysToggleLast));
SecureZeroMemory(keysToggleOnTime, sizeof(keysToggleOnTime));
SecureZeroMemory(keysToggleOffTime, sizeof(keysToggleOffTime));
mouseScreenX = 0;
mouseScreenY = 0;
mouseScreenXLast = 0;
mouseScreenYLast = 0;
mouseWheelVerticalDelta = 0;
mouseWheelVerticalDeltaPoll = 0;
}
void SHInputManagerSystem::Exit()
{
//No dynamically allocated memory. Nothing to do here.
}
void SHInputManagerSystem::InputManagerRoutine::
FixedExecute(double dt) noexcept
{ {
//Keyboard and Mouse Buttons//////////////////////////////////////////////// //Keyboard and Mouse Buttons////////////////////////////////////////////////
//Poll //Poll
unsigned char keyboardState[MAX_KEYS]; unsigned char keyboardState[MAX_KEYS];
GetKeyboardState(keyboardState); //if (GetKeyboardState(keyboardState) == false) return;
SHASSERT(GetKeyboardState(keyboardState), "SHInputManager:GetKeyboardState() failed ({})", GetLastError());
keyCount = 0; keyCount = 0;
keyToggleCount = 0; keyToggleCount = 0;
for (size_t i = 0; i < MAX_KEYS; ++i) for (size_t i = 0; i < MAX_KEYS; ++i)
@ -144,7 +118,7 @@ namespace SHADE
mouseWheelVerticalDeltaPoll = 0; mouseWheelVerticalDeltaPoll = 0;
} }
bool SHInputManagerSystem::AnyKeyDown(SH_KEYCODE* firstDetected) noexcept bool SHInputManager::AnyKeyDown(SH_KEYCODE* firstDetected) noexcept
{ {
for (size_t i = 0; i < MAX_KEYS; ++i) for (size_t i = 0; i < MAX_KEYS; ++i)
{ {
@ -157,7 +131,7 @@ namespace SHADE
return false; return false;
} }
bool SHInputManagerSystem::AnyKey(SH_KEYCODE* firstDetected) noexcept bool SHInputManager::AnyKey(SH_KEYCODE* firstDetected) noexcept
{ {
for (size_t i = 0; i < MAX_KEYS; ++i) for (size_t i = 0; i < MAX_KEYS; ++i)
{ {
@ -170,7 +144,7 @@ namespace SHADE
return false; return false;
} }
bool SHInputManagerSystem::AnyKeyUp(SH_KEYCODE* firstDetected) noexcept bool SHInputManager::AnyKeyUp(SH_KEYCODE* firstDetected) noexcept
{ {
for (size_t i = 0; i < MAX_KEYS; ++i) for (size_t i = 0; i < MAX_KEYS; ++i)
{ {

33
SHADE_Engine/src/Input/SHInputManagerSystem.h → SHADE_Engine/src/Input/SHInputManager.h
View File

@ -1,5 +1,5 @@
/********************************************************************* /*********************************************************************
* \file SHInputManagerSystem.h * \file SHInputManager.h
* \author Ryan Wang Nian Jing * \author Ryan Wang Nian Jing
* \brief Declaration of input manager. * \brief Declaration of input manager.
* Handles input from keyboard and mouse. Soon to include controller. * Handles input from keyboard and mouse. Soon to include controller.
@ -13,19 +13,12 @@
//#include <Xinput.h> //#include <Xinput.h>
//#include "../../SHADE_Managed/src/SHpch.h" //#include "../../SHADE_Managed/src/SHpch.h"
#include "SH_API.h" #include "SH_API.h"
#include "ECS_Base/System/SHSystem.h"
#include "ECS_Base/System/SHFixedSystemRoutine.h"
namespace SHADE namespace SHADE
{ {
class SH_API SHInputManagerSystem : public SHSystem class SH_API SHInputManager
{ {
public: public:
class SH_API InputManagerRoutine : public SHFixedSystemRoutine
{
public:
virtual void FixedExecute(double dt) noexcept override final;
};
public: public:
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
@ -276,23 +269,21 @@ namespace SHADE
}; };
public: public:
//Updates current state of the input, with dt to be fetched from FRC
//TODO should dt be fixed or variable?
static void UpdateInput(double dt) noexcept;
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
/* Constructors & Destructor */ /* Constructors & Destructor */
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
SHInputManagerSystem() noexcept = default; SHInputManager() noexcept = default;
~SHInputManagerSystem() noexcept = default; ~SHInputManager() noexcept = default;
SHInputManagerSystem(const SHInputManagerSystem&) = delete; SHInputManager(const SHInputManager&) = delete;
SHInputManagerSystem(SHInputManagerSystem&&) = delete; SHInputManager(SHInputManager&&) = delete;
SHInputManagerSystem& operator= (const SHInputManagerSystem&) = delete; SHInputManager& operator= (const SHInputManager&) = delete;
SHInputManagerSystem& operator= (SHInputManagerSystem&&) = delete; SHInputManager& operator= (SHInputManager&&) = delete;
/*------------------------------------------------------------------------*/
/* SHSystem Overrides */
/*------------------------------------------------------------------------*/
virtual void Init() override final;
virtual void Exit() override final;
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
/* Member Functions */ /* Member Functions */