tom/RT_GPU
1
0
Fork 0
mirror of https://github.com/TheRedShip/RT_GPU.git synced 2025-09-27 18:48:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

~ | Better camera managment

Browse Source
This commit is contained in:
TheRedShip
2025-01-09 11:48:32 +01:00
parent dbdd08f3ec
commit e474e451e6
11 changed files with 144 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
includes/RT/Camera.hpp
View File

@ -15,6 +15,14 @@
# include "RT.hpp"
struct GPUCamera
{
glm::mat4 view_matrix;
alignas(16) glm::vec3 camera_position;
float aperture_size;
float focus_distance;
};
class Camera
{
public:
@ -27,13 +35,20 @@ class Camera
void processMouse(float xoffset, float yoffset, bool constrainPitch);
void processKeyboard(bool forward, bool backward, bool left, bool right, bool up, bool down);
glm::mat4 getViewMatrix();
void updateCameraVectors();
glm::vec3 getPosition();
glm::vec2 getDirection();
glm::vec2 getDOV();
glm::mat4 getViewMatrix();
GPUCamera getGPUData();
void setPosition(glm::vec3 position);
void setDirection(float pitch, float yaw);
void setDOV(float aperture, float focus);
private:
void updateCameraVectors();
glm::vec3 _position;
glm::vec3 _forward;
@ -50,6 +65,9 @@ class Camera
float _acceleration_rate = 40.0f;
float _deceleration_rate = 10000.0f;
float _sensitivity = 0.2f;
float _aperture_size = 0.0f;
float _focus_distance = 1.0f;
};
#endif

26
includes/RT/objects/Portal.hpp
View File

@ -45,11 +45,11 @@ class Portal : public Object
throw std::runtime_error("Missing material properties");
_position = glm::vec3(x, y, z);
_edge1 = glm::vec3(x1, y1, z1);
_edge2 = glm::vec3(x2, y2, z2);
_up = glm::vec3(x1, y1, z1);
_right = glm::vec3(x2, y2, z2);
glm::vec3 up = glm::normalize(_edge1);
glm::vec3 right = glm::normalize(_edge2);
glm::vec3 up = glm::normalize(_up);
glm::vec3 right = glm::normalize(_right);
glm::vec3 forward = glm::normalize(glm::cross(right, up));
up = normalize(glm::cross(forward, right));
@ -64,17 +64,17 @@ class Portal : public Object
catch (const std::exception &e) { throw; }
}
Portal(const glm::vec3 &position, const glm::vec3 &edge1, const glm::vec3 &edge2, const int linked_portal, const int mat_index)
: Object(position, mat_index), _edge1(edge1), _edge2(edge2), _linked_portal(linked_portal) {}
: Object(position, mat_index), _up(edge1), _right(edge2), _linked_portal(linked_portal) {}
Quad *createSupportQuad() const
{
float extension = 0.2f;
glm::vec3 right_dir = glm::normalize(_edge1);
glm::vec3 up_dir = glm::normalize(_edge2);
glm::vec3 right_dir = glm::normalize(_up);
glm::vec3 up_dir = glm::normalize(_right);
float right_length = glm::length(_edge1) + extension;
float up_length = glm::length(_edge2) + extension;
float right_length = glm::length(_up) + extension;
float up_length = glm::length(_right) + extension;
glm::vec3 center_offset = -(right_dir * (extension / 2.0f) + up_dir * (extension / 2.0f));
glm::vec3 position = _position + _normal * -0.001f + center_offset;
@ -85,8 +85,8 @@ class Portal : public Object
return (new Quad(position, right, up, _mat_index));
}
glm::vec3 getEdge1() const { return (_edge1); }
glm::vec3 getEdge2() const { return (_edge2); }
glm::vec3 getUp() const { return (_up); }
glm::vec3 getRight() const { return (_right); }
glm::vec3 getNormal() const { return (_normal); }
glm::mat3 getTransform() const { return (_transform); }
@ -97,8 +97,8 @@ class Portal : public Object
Type getType() const override { return Type::PORTAL; }
private:
glm::vec3 _edge1;
glm::vec3 _edge2;
glm::vec3 _up;
glm::vec3 _right;
glm::vec3 _normal;
glm::mat3 _transform;

14
includes/RT/objects/Quad.hpp
View File

@ -39,23 +39,23 @@ class Quad : public Object
throw std::runtime_error("Missing material properties");
_position = glm::vec3(x, y, z);
_edge1 = glm::vec3(x1, y1, z1);
_edge2 = glm::vec3(x2, y2, z2);
_up = glm::vec3(x1, y1, z1);
_right = glm::vec3(x2, y2, z2);
_mat_index = mat_index;
}
catch (const std::exception &e) { throw; }
}
Quad(const glm::vec3 &position, const glm::vec3 &edge1, const glm::vec3 &edge2, const int mat_index)
: Object(position, mat_index), _edge1(edge1), _edge2(edge2) {}
: Object(position, mat_index), _up(edge1), _right(edge2) {}
glm::vec3 getEdge1() const { return (_edge1); }
glm::vec3 getEdge2() const { return (_edge2); }
glm::vec3 getUp() const { return (_up); }
glm::vec3 getRight() const { return (_right); }
Type getType() const override { return Type::QUAD; }
private:
glm::vec3 _edge1;
glm::vec3 _edge2;
glm::vec3 _up;
glm::vec3 _right;
};
#endif