benkyd/inferno-hart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

airplane

Browse Source
This commit is contained in:
benkyd
2022-11-13 21:36:40 +00:00
parent 9fd96f5e02
commit c9b26054cb
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libhart/scene/camera.hpp
View File

@@ -17,6 +17,7 @@ public:
glm::mat4 GetFrustrumMatrix();
void UpdateProjection(int width, int height);
void UpdateProjection();
// Keyboard
void MoveCamera(uint8_t posDelta);
@@ -33,6 +34,7 @@ public:
glm::vec3 Position = {};
float Roll, Pitch, Yaw;
float FOV = 45.0f;
glm::vec3 LookDirection = {};
private:

16
src/inferno.cpp
View File

@@ -176,9 +176,7 @@ int Inferno::run()
if (showPreview && ImGui::Begin("Preview", nullptr, ImGuiWindowFlags_NoScrollbar))
{
const bool allowMove = ImGui::IsWindowHovered();
if (allowMove)
if (ImGui::IsWindowHovered())
{
this->moveInput();
} else
@@ -201,12 +199,18 @@ int Inferno::run()
if (ImGui::Begin("Render"))
{
ImGui::End();
}
if (showRenderSettings && ImGui::Begin("Inferno HART"))
{
if (ImGui::TreeNode("Render"))
{
ImGui::TreePop();
}
if (ImGui::TreeNode("Camera"))
{
ImGui::PushItemWidth(100);
@@ -223,9 +227,13 @@ int Inferno::run()
camera.UpdateView();
ImGui::PopItemWidth();
ImGui::Text("Camera Zoom");
ImGui::DragFloat("Zoom", &camera.FOV, -0.1f, 0.0f, 180.0f, "%.2f", ImGuiSliderFlags_None); ImGui::SameLine();
camera.UpdateProjection();
ImGui::TreePop();
}
ImGui::ShowDemoWindow();
ImGui::End();
}

17
src/scene/camera.cpp
View File

@@ -4,7 +4,7 @@ using namespace inferno;
Camera::Camera()
{
mProjMatrix = glm::perspective( glm::radians( 45.0f ), 1.0f, 0.1f, 1000.0f );
mProjMatrix = glm::perspective( glm::radians(FOV), 1.0f, 0.1f, 1000.0f );
Roll = 0.0f;
Pitch = 0.0f;
@@ -20,7 +20,7 @@ Camera::Camera()
Camera::Camera(int w, int h)
{
mProjMatrix = glm::perspective(glm::radians(45.0f), (float)w / (float)h, 0.1f, 1000.0f);
mProjMatrix = glm::perspective(glm::radians(FOV), (float)w / (float)h, 0.1f, 1000.0f);
Roll = 0.0f;
Pitch = 0.0f;
@@ -42,9 +42,9 @@ void Camera::UpdateView()
glm::mat4 matYaw = glm::mat4(1.0f); //identity matrix
// roll, pitch and yaw
matRoll = glm::rotate( matRoll, Roll, glm::vec3(0.0f, 0.0f, 1.0f));
matPitch = glm::rotate( matPitch, Pitch, glm::vec3(1.0f, 0.0f, 0.0f));
matYaw = glm::rotate( matYaw, Yaw, glm::vec3( 0.0f, 1.0f, 0.0f));
matRoll = glm::rotate(matRoll, Roll, glm::vec3(0.0f, 0.0f, 1.0f));
matPitch = glm::rotate(matPitch, Pitch, glm::vec3(1.0f, 0.0f, 0.0f));
matYaw = glm::rotate(matYaw, Yaw, glm::vec3( 0.0f, 1.0f, 0.0f));
glm::mat4 rotate = matRoll * matPitch * matYaw;
@@ -74,7 +74,12 @@ glm::mat4 Camera::GetProjectionMatrix()
void Camera::UpdateProjection(int width, int height)
{
mViewport = {width, height};
mProjMatrix = glm::perspective(glm::radians(45.0f), (float)width / (float)height, 0.1f, 1000.0f);
mProjMatrix = glm::perspective(glm::radians(FOV), (float)width / (float)height, 0.1f, 1000.0f);
}
void Camera::UpdateProjection()
{
mProjMatrix = glm::perspective(glm::radians(FOV), mViewport.x / mViewport.y, 0.1f, 1000.0f);
}
void Camera::MoveCamera(uint8_t posDelta)