+ | truc

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 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/Model.obj

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

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 = vec3(u, v, 1 - (u + v)); //texture mapping
-	hit.normal = obj.normal * sign(-dot(ray.direction, obj.normal));
+	// hit.normal = obj.normal * sign(-dot(ray.direction, obj.normal));
 	
 	return (valid);
 }

srcs/RT.cpp

@@ -6,7 +6,7 @@
 /*   By: ycontre <ycontre@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   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);

srcs/class/ObjParser.cpp

@@ -6,7 +6,7 @@
 /*   By: ycontre <ycontre@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   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       */
 /*                                                                            */
 /* ************************************************************************** */