From ff9ab9251f481c77bdc7a11261bf3e4d6e393537 Mon Sep 17 00:00:00 2001 From: RedShip Date: Tue, 28 Jan 2025 18:35:46 +0100 Subject: [PATCH] + | truc --- scenes/dragon.rt | 4 ++-- shaders/debug.glsl | 4 ++++ shaders/intersect.glsl | 4 ++-- srcs/RT.cpp | 6 +++--- srcs/class/ObjParser.cpp | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/scenes/dragon.rt b/scenes/dragon.rt index a0ed4e7..84bbb1c 100644 --- a/scenes/dragon.rt +++ b/scenes/dragon.rt @@ -24,8 +24,8 @@ pl 0 -2 0 0 1 0 2 // floor qu -1 1.999 -1 2 0 0 0 0 2 6 -OBJ scenes/obj/Dragon_800K.obj -0.5 0 0.55 5 0 90 0 -OBJ scenes/obj/Dragon_800K.obj 0.5 0 -0.55 5 0 -90 0 +OBJ obj/Dragon_800K.obj -0.5 0 0.55 5 0 90 0 +OBJ obj/Dragon_800K.obj 0.5 0 -0.55 5 0 -90 0 # OBJ obj/Model.obj diff --git a/shaders/debug.glsl b/shaders/debug.glsl index 9d49dd5..4940348 100644 --- a/shaders/debug.glsl +++ b/shaders/debug.glsl @@ -60,6 +60,10 @@ struct GPUTriangle vec3 vertex2; vec3 normal; + vec2 texture_vertex1; + vec2 texture_vertex2; + vec2 texture_vertex3; + int mat_index; }; layout(std430, binding = 2) buffer TriangleBuffer diff --git a/shaders/intersect.glsl b/shaders/intersect.glsl index 61b80a2..3bdec19 100644 --- a/shaders/intersect.glsl +++ b/shaders/intersect.glsl @@ -89,8 +89,8 @@ bool intersectTriangle(Ray ray, GPUTriangle obj, out hitInfo hit) hit.t = t; hit.position = ray.origin + ray.direction * t; - // hit.normal = vec3(u, v, 1 - (u + v)); //texture mapping - hit.normal = obj.normal * sign(-dot(ray.direction, obj.normal)); + hit.normal = vec3(u, v, 1 - (u + v)); //texture mapping + // hit.normal = obj.normal * sign(-dot(ray.direction, obj.normal)); return (valid); } diff --git a/srcs/RT.cpp b/srcs/RT.cpp index 586780b..82b459f 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: 2025/01/27 19:07:49 by ycontre ### ########.fr */ +/* Updated: 2025/01/28 18:34:10 by ycontre ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,9 +20,9 @@ int main(int argc, char **argv) return (1); Window window(&scene, WIDTH, HEIGHT, "RT_GPU", 0); - Shader shader("shaders/vertex.vert", "shaders/frag.frag", "shaders/compute.glsl"); + // Shader shader("shaders/vertex.vert", "shaders/frag.frag", "shaders/compute.glsl"); - // Shader shader("shaders/vertex.vert", "shaders/frag.frag", "shaders/debug.glsl"); + Shader shader("shaders/vertex.vert", "shaders/frag.frag", "shaders/debug.glsl"); GLint max_gpu_size; glGetIntegerv(GL_MAX_SHADER_STORAGE_BLOCK_SIZE, &max_gpu_size); diff --git a/srcs/class/ObjParser.cpp b/srcs/class/ObjParser.cpp index aa26951..e57c106 100644 --- a/srcs/class/ObjParser.cpp +++ b/srcs/class/ObjParser.cpp @@ -6,7 +6,7 @@ /* By: ycontre +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/16 15:00:33 by tomoron #+# #+# */ -/* Updated: 2025/01/24 18:49:42 by ycontre ### ########.fr */ +/* Updated: 2025/01/28 18:30:33 by ycontre ### ########.fr */ /* */ /* ************************************************************************** */