diff --git a/imgui.ini b/imgui.ini index 4b5fce1..92379a4 100644 --- a/imgui.ini +++ b/imgui.ini @@ -7,7 +7,7 @@ Pos=1645,8 Size=259,200 [Window][Material] -Pos=1648,211 +Pos=1648,210 Size=262,299 [Window][Fog settings] 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/scenes/obj/textures/Eye_N.jpg b/scenes/obj/textures/Eye_N.jpg deleted file mode 100644 index 8ff362f..0000000 Binary files a/scenes/obj/textures/Eye_N.jpg and /dev/null differ diff --git a/scenes/obj/textures/REF 1.jpg b/scenes/obj/textures/REF 1.jpg deleted file mode 100644 index c2f5dfb..0000000 Binary files a/scenes/obj/textures/REF 1.jpg and /dev/null differ diff --git a/shaders/compute.glsl b/shaders/compute.glsl index e4f3f00..0153d93 100644 --- a/shaders/compute.glsl +++ b/shaders/compute.glsl @@ -238,6 +238,11 @@ void main() ivec2 pixel_coords = ivec2(gl_GlobalInvocationID.xy); if (pixel_coords.x >= int(u_resolution.x) || pixel_coords.y >= int(u_resolution.y)) return; + + // vec2 uv = ((vec2(pixel_coords)) / u_resolution); + // uv.x *= u_resolution.x / u_resolution.y; + // imageStore(output_image, pixel_coords, vec4(vec3(uv, 0.), 1.)); + // return ; if (u_pixelisation != 1 && (uint(pixel_coords.x) % u_pixelisation != 0 || uint(pixel_coords.y) % u_pixelisation != 0)) return; diff --git a/shaders/light.glsl b/shaders/light.glsl index c5a5773..e9c6fd8 100644 --- a/shaders/light.glsl +++ b/shaders/light.glsl @@ -113,8 +113,8 @@ vec3 getTextureColor(int texture_index, hitInfo hit) { GPUTriangle tri = triangles[hit.obj_index]; uv = hit.u * tri.texture_vertex2 + hit.v * tri.texture_vertex3 + (1 - (hit.u + hit.v)) * tri.texture_vertex1; + uv = vec2(uv.x, 1-uv.y); } - return (texture(textures[texture_index], uv).rgb); } diff --git a/srcs/class/ObjParser.cpp b/srcs/class/ObjParser.cpp index 428d159..8f92d02 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/28 19:18:37 by ycontre ### ########.fr */ +/* Updated: 2025/01/29 18:26:31 by ycontre ### ########.fr */ /* */ /* ************************************************************************** */ @@ -55,7 +55,6 @@ glm::vec2 ObjParser::getUV(std::stringstream &line) if(!(line >> res.x) || (!(line >> res.y) && !line.eof())) throw std::runtime_error("syntax error in obj file while parsing texture vertex"); - // res = res - glm::floor(res); return(res); }