voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-07 03:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

refactor: reduce Window references

Browse source
This commit is contained in:
MihailRis 2025-03-06 15:32:58 +03:00
parent 896ab3597a
commit 74a94f869c
19 changed files with 151 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/window/Camera.cpp
View file

@ -3,8 +3,6 @@
#include <cmath>
#include <glm/ext.hpp>
#include "Window.hpp"
Camera::Camera(glm::vec3 position, float fov) : fov(fov), position(position) {
updateVectors();
}
@ -30,17 +28,13 @@ void Camera::rotate(float x, float y, float z) {
}
glm::mat4 Camera::getProjection() const {
constexpr float epsilon = 1e-6f; // 0.000001
float aspect_ratio = this->aspect;
if (std::fabs(aspect_ratio) < epsilon) {
aspect_ratio = Window::width / static_cast<float>(Window::height);
}
constexpr float epsilon = 1e-6f;
if (perspective) {
return glm::perspective(fov * zoom, aspect_ratio, near, far);
return glm::perspective(fov * zoom, ar, near, far);
} else if (flipped) {
return glm::ortho(-0.5f, fov * aspect_ratio-0.5f, fov, 0.0f);
return glm::ortho(0.0f, fov * ar, fov, 0.0f);
} else {
return glm::ortho(-0.5f, fov * aspect_ratio-0.5f, 0.0f, fov);
return glm::ortho(0.0f, fov * ar, 0.0f, fov);
}
}
@ -69,5 +63,9 @@ float Camera::getFov() const {
}
float Camera::getAspectRatio() const {
return aspect;
return ar;
}
void Camera::setAspectRatio(float ar) {
this->ar = ar;
}