Merge branch 'indev' into multiple-fonts

seekrs · Dec 14, 2023 · 57b27ad · 57b27ad
2 parents d08a97f + ac91253
commit 57b27ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/renderer/images/texture.h b/src/renderer/images/texture.h
@@ -6,7 +6,7 @@
 /*   By: maldavid <kbz_8.dev@akel-engine.com>       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/03/08 02:24:58 by maldavid          #+#    #+#             */
-/*   Updated: 2023/12/14 16:28:07 by maldavid         ###   ########.fr       */
+/*   Updated: 2023/12/14 14:37:08 by maldavid         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -22,6 +22,7 @@
 #include <renderer/buffers/vk_ibo.h>
 #include <renderer/buffers/vk_vbo.h>
 #include <mlx_profile.h>
+#include <string>
 
 namespace mlx
 {
@@ -67,7 +68,6 @@ namespace mlx
 	struct TextureRenderData
 	{
 		Texture* texture;
-		std::size_t hash = 0;
 		int x;
 		int y;
 

diff --git a/test/main.c b/test/main.c
@@ -106,7 +106,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");