From ff3af20e1374c73f0b159c416998a404cbbb4a7c Mon Sep 17 00:00:00 2001 From: RedShip Date: Wed, 8 Jan 2025 20:35:31 +0100 Subject: [PATCH] * | TOM EST EVRENU --- includes/RT/objects/Sphere.hpp | 2 +- scenes/stairs.rt | 2 +- shaders/compute.glsl | 6 +++--- shaders/scatter.glsl | 4 ++-- srcs/RT.cpp | 2 +- srcs/class/Scene.cpp | 3 +-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/includes/RT/objects/Sphere.hpp b/includes/RT/objects/Sphere.hpp index 26e7a8a..babb4dc 100644 --- a/includes/RT/objects/Sphere.hpp +++ b/includes/RT/objects/Sphere.hpp @@ -6,7 +6,7 @@ /* By: ycontre +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/12/23 19:12:51 by ycontre #+# #+# */ -/* Updated: 2024/12/23 19:47:09 by ycontre ### ########.fr */ +/* Updated: 2025/01/08 20:20:34 by ycontre ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/scenes/stairs.rt b/scenes/stairs.rt index 0d876fd..8abf314 100644 --- a/scenes/stairs.rt +++ b/scenes/stairs.rt @@ -2,7 +2,7 @@ CAM -7 10 6 MAT 255 255 255 2.0 0.0 0.0 //white light -sp -10 100 10 50 0 +# sp -10 100 10 50 0 qu -2.5 15 -9 7 0 0 0 0 7 0 diff --git a/shaders/compute.glsl b/shaders/compute.glsl index 2286ca6..a6d7618 100644 --- a/shaders/compute.glsl +++ b/shaders/compute.glsl @@ -96,7 +96,7 @@ hitInfo traceRay(Ray ray) { hitInfo hit; - for (int p = 0; p < 5; p++) //portals + for (int p = 0; p < 20; p++) //portals { hit.t = 1e30; hit.obj_index = -1; @@ -145,7 +145,7 @@ vec3 pathtrace(Ray ray, inout uint rng_state) // RR float p = max(color.r, max(color.g, color.b)); - if (randomValue(rng_state) > p && i > 1) + if (i > 1 && randomValue(rng_state) > p) break; color /= p; // @@ -171,7 +171,7 @@ Ray initRay(vec2 uv, inout uint rng_state) vec3 ray_direction = normalize((inverse(u_viewMatrix) * vec4(view_space_ray, 0.0)).xyz); float focus_distance = 4.5; - float aperture = 0.25; + float aperture = 0; vec3 right = vec3(u_viewMatrix[0][0], u_viewMatrix[1][0], u_viewMatrix[2][0]); vec3 up = vec3(u_viewMatrix[0][1], u_viewMatrix[1][1], u_viewMatrix[2][1]); diff --git a/shaders/scatter.glsl b/shaders/scatter.glsl index c2fc9f9..7b3e2b5 100644 --- a/shaders/scatter.glsl +++ b/shaders/scatter.glsl @@ -1,5 +1,5 @@ -Ray lambertRay(hitInfo hit, Ray ray, GPUMaterial mat, uint rng_state) +Ray lambertRay(hitInfo hit, Ray ray, GPUMaterial mat, inout uint rng_state) { vec3 diffuse_dir = normalize(hit.normal + randomDirection(rng_state)); vec3 specular_dir = reflect(ray.direction, hit.normal); @@ -33,7 +33,7 @@ Ray dieletricRay(hitInfo hit, Ray ray, GPUMaterial mat) } -Ray newRay(hitInfo hit, Ray ray, uint rng_state) +Ray newRay(hitInfo hit, Ray ray, inout uint rng_state) { GPUObject obj; GPUMaterial mat; diff --git a/srcs/RT.cpp b/srcs/RT.cpp index cd7d90f..1b5c609 100644 --- a/srcs/RT.cpp +++ b/srcs/RT.cpp @@ -6,7 +6,7 @@ /* By: ycontre +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/09/27 14:51:49 by TheRed #+# #+# */ -/* Updated: 2024/12/23 18:38:38 by ycontre ### ########.fr */ +/* Updated: 2025/01/08 20:09:47 by ycontre ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/class/Scene.cpp b/srcs/class/Scene.cpp index 5bb1b7b..2dcb454 100644 --- a/srcs/class/Scene.cpp +++ b/srcs/class/Scene.cpp @@ -6,7 +6,7 @@ /* By: ycontre +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/12/23 18:29:41 by ycontre #+# #+# */ -/* Updated: 2024/12/23 18:40:17 by ycontre ### ########.fr */ +/* Updated: 2025/01/08 20:08:03 by ycontre ### ########.fr */ /* */ /* ************************************************************************** */ @@ -106,7 +106,6 @@ void Scene::updateGPUData() auto cube = static_cast(obj); gpu_obj.position = cube->getPosition(); gpu_obj.vertex1 = cube->getSize(); - gpu_obj.type = static_cast(cube->getType()); } else if (obj->getType() == Object::Type::PORTAL) {