celisej567/Nuake-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Major cleanup.

Browse Source 
Moved to namespace
Cleanup includes
This commit is contained in:
Antoine Pilote
2021-07-11 18:56:44 -04:00
parent f77bef6b28
commit 0c6ed48bbd
174 changed files with 11772 additions and 11296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
Nuake/src/Scene/EditorCamera.cpp
View File

@@ -3,96 +3,99 @@
#include <GLFW/glfw3.h>
#include <glm/trigonometric.hpp>
void EditorCamera::Update(Timestep ts)
namespace Nuake
{
float x = Input::GetMouseX();
float y = Input::GetMouseY();
if (!controlled && Input::IsMouseButtonDown(1))
void EditorCamera::Update(Timestep ts)
{
mouseLastX = x;
mouseLastY = y;
}
float x = Input::GetMouseX();
float y = Input::GetMouseY();
controlled = Input::IsMouseButtonDown(1);
if (!controlled && Input::IsMouseButtonDown(1))
{
mouseLastX = x;
mouseLastY = y;
}
//if (!controlled)
// Input::ShowMouse();
//else
// Input::HideMouse();
controlled = Input::IsMouseButtonDown(1);
// Should probably not have speed binding in here.
if (Input::IsKeyDown(GLFW_KEY_UP))
Speed += 0.1f;
else if (Input::IsKeyDown(GLFW_KEY_DOWN))
Speed -= 0.1f;
//if (!controlled)
// Input::ShowMouse();
//else
// Input::HideMouse();
if (Speed < 0)
Speed = 0;
// Keyboard
if (!controlled) {
return;
}
if (m_Type == CAMERA_TYPE::ORTHO) {
if (Input::IsKeyDown(GLFW_KEY_RIGHT))
Translation.x += Speed * ts;
if (Input::IsKeyDown(GLFW_KEY_LEFT))
Translation.x -= Speed * ts;
// Should probably not have speed binding in here.
if (Input::IsKeyDown(GLFW_KEY_UP))
Translation.y += Speed * ts;
if (Input::IsKeyDown(GLFW_KEY_DOWN))
Translation.y -= Speed * ts;
}
else {
glm::vec3 movement = glm::vec3(0, 0, 0);
Speed += 0.1f;
else if (Input::IsKeyDown(GLFW_KEY_DOWN))
Speed -= 0.1f;
if (Input::IsKeyDown(GLFW_KEY_D))
movement -= cameraRight * (Speed * ts);
if (Input::IsKeyDown(GLFW_KEY_A))
movement += cameraRight * (Speed * ts);
if (Speed < 0)
Speed = 0;
if (Input::IsKeyDown(GLFW_KEY_W))
movement += cameraDirection * (Speed * ts);
if (Input::IsKeyDown(GLFW_KEY_S))
movement -= cameraDirection * (Speed * ts);
if (Input::IsKeyDown(GLFW_KEY_LEFT_SHIFT))
movement -= up * (Speed * ts);
if (Input::IsKeyDown(GLFW_KEY_SPACE))
movement += up * (Speed * ts);
// Keyboard
if (!controlled) {
return;
}
Translation += Vector3(movement);
}
if (m_Type == CAMERA_TYPE::ORTHO) {
if (Input::IsKeyDown(GLFW_KEY_RIGHT))
Translation.x += Speed * ts;
if (Input::IsKeyDown(GLFW_KEY_LEFT))
Translation.x -= Speed * ts;
if (Input::IsKeyDown(GLFW_KEY_UP))
Translation.y += Speed * ts;
if (Input::IsKeyDown(GLFW_KEY_DOWN))
Translation.y -= Speed * ts;
}
else {
glm::vec3 movement = glm::vec3(0, 0, 0);
if (firstMouse)
{
if (Input::IsKeyDown(GLFW_KEY_D))
movement -= cameraRight * (Speed * ts);
if (Input::IsKeyDown(GLFW_KEY_A))
movement += cameraRight * (Speed * ts);
if (Input::IsKeyDown(GLFW_KEY_W))
movement += cameraDirection * (Speed * ts);
if (Input::IsKeyDown(GLFW_KEY_S))
movement -= cameraDirection * (Speed * ts);
if (Input::IsKeyDown(GLFW_KEY_LEFT_SHIFT))
movement -= up * (Speed * ts);
if (Input::IsKeyDown(GLFW_KEY_SPACE))
movement += up * (Speed * ts);
Translation += Vector3(movement);
}
if (firstMouse)
{
mouseLastX = x;
mouseLastY = y;
firstMouse = false;
}
// mouse
float diffx = x - mouseLastX;
float diffy = mouseLastY - y;
mouseLastX = x;
mouseLastY = y;
firstMouse = false;
const float sensitivity = 0.1f;
diffx *= sensitivity;
diffy *= sensitivity;
Yaw += diffx;
Pitch += diffy;
if (Pitch > 89.0f)
Pitch = 89.0f;
if (Pitch < -89.0f)
Pitch = -89.0f;
cameraDirection.x = cos(glm::radians(Yaw)) * cos(glm::radians(Pitch));
cameraDirection.y = sin(glm::radians(Pitch));
cameraDirection.z = sin(glm::radians(Yaw)) * cos(glm::radians(Pitch));
cameraFront = glm::normalize(cameraDirection);
cameraRight = glm::normalize(glm::cross(up, cameraFront));
}
// mouse
float diffx = x - mouseLastX;
float diffy = mouseLastY - y;
mouseLastX = x;
mouseLastY = y;
const float sensitivity = 0.1f;
diffx *= sensitivity;
diffy *= sensitivity;
Yaw += diffx;
Pitch += diffy;
if (Pitch > 89.0f)
Pitch = 89.0f;
if (Pitch < -89.0f)
Pitch = -89.0f;
cameraDirection.x = cos(glm::radians(Yaw)) * cos(glm::radians(Pitch));
cameraDirection.y = sin(glm::radians(Pitch));
cameraDirection.z = sin(glm::radians(Yaw)) * cos(glm::radians(Pitch));
cameraFront = glm::normalize(cameraDirection);
cameraRight = glm::normalize(glm::cross(up, cameraFront));
}
}