From 6435cc83339afb2b97a26e4aa73725f8b6bed953 Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Thu, 14 Dec 2023 13:51:17 +0100 Subject: [PATCH] fixing issues with texture rendering --- src/renderer/images/texture.h | 5 +++-- test/main.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/renderer/images/texture.h b/src/renderer/images/texture.h index 695e580..0390cc1 100644 --- a/src/renderer/images/texture.h +++ b/src/renderer/images/texture.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/08 02:24:58 by maldavid #+# #+# */ -/* Updated: 2023/12/08 19:10:09 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/14 13:47:03 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -22,6 +22,7 @@ #include #include #include +#include namespace mlx { @@ -83,7 +84,7 @@ namespace std { size_t operator()(const mlx::TextureRenderData& td) const noexcept { - return std::hash()(td.texture) + std::hash()(td.x) + std::hash()(td.y); + return std::hash{}(td.texture) + std::hash{}(std::to_string(td.x)) + std::hash{}(std::to_string(td.y)); } }; } diff --git a/test/main.c b/test/main.c index 12e13a2..e618462 100644 --- a/test/main.c +++ b/test/main.c @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 17:55:21 by maldavid #+# #+# */ -/* Updated: 2023/12/08 18:08:13 by kbz_8 ### ########.fr */ +/* Updated: 2023/12/14 13:49:22 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -107,7 +107,7 @@ int main(void) mlx_on_event(mlx.mlx, mlx.win, MLX_WINDOW_EVENT, window_hook, &mlx); mlx.logo = mlx_png_file_to_image(mlx.mlx, "42_logo.png", &w, &h); mlx_pixel_put(mlx.mlx, mlx.win, 200, 10, 0xFFFF00FF); - mlx_put_image_to_window(mlx.mlx, mlx.win, mlx.logo, 200, 200); + mlx_put_image_to_window(mlx.mlx, mlx.win, mlx.logo, 10, 190); mlx.img = create_image(&mlx); mlx_string_put(mlx.mlx, mlx.win, 20, 20, 0xFFFF2000, \ "that text will disappear");