This commit is contained in:
2020-11-23 22:48:11 +01:00
parent aec792fc65
commit 8cf70e483b
3 changed files with 7 additions and 7 deletions

View File

@@ -69,7 +69,7 @@ public:
GetGraphicsAppManager()->GetRenderer()->SetScene(&scene); GetGraphicsAppManager()->GetRenderer()->SetScene(&scene);
auto input = InputManager::GetInstace(); auto input = InputManager::GetInstance();
actionForward = input->GetAction("forward"); actionForward = input->GetAction("forward");
actionSide = input->GetAction("side"); actionSide = input->GetAction("side");
actionLookUp = input->GetAction("look up"); actionLookUp = input->GetAction("look up");
@@ -97,7 +97,7 @@ public:
nodesPool[i].SetMatrix(glm::translate(glm::mat4x4(1), glm::vec3((std::rand() % 10000) / 1000.0f - 5, (std::rand() % 10000) / 1000.0f - 5, (std::rand() % 10000) / 1000.0f - 5))); nodesPool[i].SetMatrix(glm::translate(glm::mat4x4(1), glm::vec3((std::rand() % 10000) / 1000.0f - 5, (std::rand() % 10000) / 1000.0f - 5, (std::rand() % 10000) / 1000.0f - 5)));
} }
auto input = InputManager::GetInstace(); auto input = InputManager::GetInstance();
Vector3f_SIMD vec(input->GetAxis(actionSide), 0, -input->GetAxis(actionForward)); Vector3f_SIMD vec(input->GetAxis(actionSide), 0, -input->GetAxis(actionForward));
if(Utils::length2(vec) > 1.0f) if(Utils::length2(vec) > 1.0f)
{ {

View File

@@ -35,8 +35,8 @@ namespace openVulkanoCpp::GLFW
keyboard.Init(0, "Keyboard"); keyboard.Init(0, "Keyboard");
mouse.Init(0, "Mouse"); mouse.Init(0, "Mouse");
Input::InputManager::GetInstace()->RegisterInputDevice(&mouse); Input::InputManager::GetInstance()->RegisterInputDevice(&mouse);
Input::InputManager::GetInstace()->RegisterInputDevice(&keyboard); Input::InputManager::GetInstance()->RegisterInputDevice(&keyboard);
} }
void InputProviderGLFW::Close() void InputProviderGLFW::Close()
@@ -48,12 +48,12 @@ namespace openVulkanoCpp::GLFW
void InputProviderGLFW::OnJoystickConnect(int joystickId) void InputProviderGLFW::OnJoystickConnect(int joystickId)
{ {
controllers[joystickId].Init(joystickId); controllers[joystickId].Init(joystickId);
Input::InputManager::GetInstace()->RegisterInputDevice(&controllers[joystickId]); Input::InputManager::GetInstance()->RegisterInputDevice(&controllers[joystickId]);
} }
void InputProviderGLFW::OnJoystickDisconnect(int joystickId) void InputProviderGLFW::OnJoystickDisconnect(int joystickId)
{ {
Input::InputManager::GetInstace()->UnregisterInputDevice(&controllers[joystickId]); Input::InputManager::GetInstance()->UnregisterInputDevice(&controllers[joystickId]);
controllers[joystickId].Close(); controllers[joystickId].Close();
} }

View File

@@ -90,7 +90,7 @@ namespace openVulkanoCpp
{ {
InputManager() = default; InputManager() = default;
public: public:
static InputManager* GetInstace() static InputManager* GetInstance()
{ {
static InputManager* instance = new InputManager(); static InputManager* instance = new InputManager();
return instance; return instance;