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

+ | Almost pixel perfect portals tp

Browse Source
This commit is contained in:
RedShip
2025-02-05 20:14:42 +01:00
committed by tomoron
parent 56d564408d
commit 9e802860ee
6 changed files with 49 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
srcs/RT.cpp
View File

@ -6,7 +6,7 @@
/* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/27 14:51:49 by TheRed #+# #+# */
/* Updated: 2025/02/06 16:32:59 by tomoron ### ########.fr */
/* Updated: 2025/02/06 16:33:36 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,11 +15,11 @@
int main(int argc, char **argv)
{
Arguments args(argc, argv);
if(args.error())
return(1);
if (args.error())
return (1);
Scene scene(args.getSceneName());
if(scene.fail())
return(1);
if (scene.fail())
return (1);
Window window(&scene, WIDTH, HEIGHT, "RT_GPU", 0, args);
Shader shader("shaders/vertex.vert", "shaders/frag.frag", "shaders/compute.glsl");
// Shader shader("shaders/vertex.vert", "shaders/frag.frag", "shaders/debug.glsl");

62
srcs/class/Camera.cpp
View File

@ -6,7 +6,7 @@
/* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/15 14:00:38 by TheRed #+# #+# */
/* Updated: 2025/01/28 02:15:41 by tomoron ### ########.fr */
/* Updated: 2025/02/05 20:09:58 by ycontre ### ########.fr */
/* */
/* ************************************************************************** */
@ -42,20 +42,20 @@ void Camera::update(Scene *scene, float delta_time)
_velocity += _acceleration * delta_time;
if (glm::length(_acceleration) < 0.1f)
_velocity *= std::max(0.0f, 1.0f - _deceleration_rate * delta_time);
float speed = glm::length(_velocity);
if (speed > _maxSpeed)
_velocity = glm::normalize(_velocity) * _maxSpeed;
_position += _velocity * delta_time;
_acceleration = glm::vec3(0.0f);
if (glm::length(_acceleration) < 0.1f)
_velocity *= std::max(0.0f, 1.0f - _deceleration_rate * delta_time);
float speed = glm::length(_velocity);
if (speed > _maxSpeed)
_velocity = glm::normalize(_velocity) * _maxSpeed;
if (glm::length(_velocity) > 0.0f && !this->portalTeleport(scene, delta_time))
_position += _velocity * delta_time;
this->portalTeleport(scene);
_acceleration = glm::vec3(0.0f);
}
void Camera::portalTeleport(Scene *scene)
int Camera::portalTeleport(Scene *scene, float delta_time)
{
for (const GPUObject &obj : scene->getObjectData())
{
@ -74,22 +74,26 @@ void Camera::portalTeleport(Scene *scene)
glm::dot(point_projected - obj.position, obj.vertex1),
glm::dot(point_projected - obj.position, obj.vertex2)
);
glm::vec2 alphaBeta = glm::inverse(A) * b;
glm::vec2 alphaBeta = glm::inverse(A) * b;
if (alphaBeta.x >= 0.0f && alphaBeta.x <= 1.0f && alphaBeta.y >= 0.0f && alphaBeta.y <= 1.0f)
{
float distance = glm::length(point_projected - _position);
if (distance < 0.1f)
glm::vec3 future_pos = _position + _velocity * delta_time;
float distance_future_pos = glm::length(future_pos - _position);
float distance_portal = glm::length(point_projected - _position);
if (distance_portal <= distance_future_pos && glm::dot(glm::normalize(future_pos - _position), obj.normal) > 0.0f)
{
GPUObject linked_portal = scene->getObjectData()[obj.radius];
std::cout << glm::to_string(point_projected) << std::endl;
_position = linked_portal.position + (_position - obj.position) - linked_portal.normal * 0.1f;
std::cout << "Teleporting to " << glm::to_string(_position) << std::endl;
_position = (linked_portal.position) + (_position - obj.position) - (((distance_future_pos - distance_portal)) * linked_portal.normal);
break ;
return (1);
}
}
}
return (0);
}
void Camera::processMouse(float xoffset, float yoffset, bool constraint_pitch = true)
@ -115,16 +119,16 @@ void Camera::processKeyboard(bool forward, bool backward, bool left, bool right
glm::vec3 acceleration(0.0f);
if (forward) acceleration += _forward;
if (backward) acceleration -= _forward;
if (right) acceleration += _right;
if (left) acceleration -= _right;
if (up) acceleration += _up;
if (down) acceleration -= _up;
if (glm::length(acceleration) > 0.1f)
acceleration = glm::normalize(acceleration) * _acceleration_rate;
_acceleration = acceleration;
if (backward) acceleration -= _forward;
if (right) acceleration += _right;
if (left) acceleration -= _right;
if (up) acceleration += _up;
if (down) acceleration -= _up;
if (glm::length(acceleration) > 0.1f)
acceleration = glm::normalize(acceleration) * _acceleration_rate;
_acceleration = acceleration;
}
glm::mat4 Camera::getViewMatrix()

2
srcs/class/Window.cpp
View File

@ -6,7 +6,7 @@
/* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/13 16:16:24 by TheRed #+# #+# */
/* Updated: 2025/02/04 16:46:29 by tomoron ### ########.fr */
/* Updated: 2025/02/05 20:01:29 by ycontre ### ########.fr */
/* */
/* ************************************************************************** */