moving experimental features to a new folder

example/build.sh

@@ -9,4 +9,3 @@ if [ $(uname -s) = 'Darwin' ]; then
 else
 	clang main.c ../libmlx.so -lSDL2 -g -Wall -Wextra -Werror;
 fi
-

example/main.c

@@ -9,8 +9,6 @@ typedef struct
 	void* logo_jpg;
 	void* logo_bmp;
 	void* img;
-	void* render_target;
-	void* render_target_win;
 } mlx_t;
 
 int update(void* param)
@@ -52,19 +50,6 @@ int update(void* param)
 			mlx_pixel_put(mlx->mlx, mlx->win, 220 + j, 160 + k, 0xFFFF0000);
 	}
 
-	mlx_string_put(mlx->mlx, mlx->render_target_win, 20, 20, 0xFFAF2BFF, "cacaboudin");
-	mlx_transform_put_image_to_window(mlx->mlx, mlx->render_target_win, mlx->logo_bmp, 100, 40, 0.5f, 75.0f);
-	mlx_put_image_to_window(mlx->mlx, mlx->render_target_win, mlx->img, 40, 60);
-
-	for(int j = 0, color = 0; j < 200; j++)
-	{
-		mlx_pixel_put(mlx->mlx, mlx->render_target_win, j, j, 0xFFFF0000 + color);
-		mlx_pixel_put(mlx->mlx, mlx->render_target_win, 199 - j, j, 0xFF0000FF);
-		color += (color < 255);
-	}
-
-	mlx_transform_put_image_to_window(mlx->mlx, mlx->win, mlx->render_target, 5, 250, 0.5f, 33.0f);
-
 	i++;
 	return 0;
 }
@@ -151,10 +136,6 @@ int main(void)
 	mlx_get_screens_size(mlx.mlx, mlx.win, &w, &h);
 	printf("screen size : %dx%d\n", w, h);
 
-	mlx.render_target = mlx_new_image(mlx.mlx, 200, 200);
-	mlx.render_target_win = mlx_new_window(mlx.mlx, 200, 200, (char*)mlx.render_target);
-	mlx_clear_window(mlx.mlx, mlx.render_target_win, 0xFFC16868);
-
 	mlx_set_fps_goal(mlx.mlx, 60);
 
 	mlx_on_event(mlx.mlx, mlx.win, MLX_KEYDOWN, key_hook, &mlx);
@@ -181,9 +162,6 @@ int main(void)
 	mlx_destroy_image(mlx.mlx, mlx.img);
 	mlx_destroy_window(mlx.mlx, mlx.win);
 	
-	mlx_destroy_window(mlx.mlx, mlx.render_target_win);
-	mlx_destroy_image(mlx.mlx, mlx.render_target);
-
 	mlx_destroy_display(mlx.mlx);
 
 	return 0;

experimental/RenderToTexture/build.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ -e a.out ]; then
+	rm a.out
+fi
+
+if [ $(uname -s) = 'Darwin' ]; then
+	clang main.c ../../libmlx.dylib -L /opt/homebrew/lib -lSDL2 -g;
+else
+	clang main.c ../../libmlx.so -lSDL2 -g -Wall -Wextra -Werror;
+fi

experimental/RenderToTexture/main.c

@@ -0,0 +1,86 @@
+#include "../../includes/mlx.h"
+
+typedef struct
+{
+	void* mlx;
+	void* win;
+	void* render_target;
+	void* render_target_win;
+} mlx_t;
+
+int update(void* param)
+{
+	mlx_t* mlx = (mlx_t*)param;
+
+	mlx_clear_window(mlx->mlx, mlx->win, 0xFF334D4D);
+
+	mlx_string_put(mlx->mlx, mlx->win, 160, 120, 0xFFFF2066, "text");
+	mlx_string_put(mlx->mlx, mlx->win, 20, 50, 0xFFFFFFFF, "that's a text");
+
+	for(int j = 0, color = 0; j < 400; j++)
+	{
+		mlx_pixel_put(mlx->mlx, mlx->win, j, j, 0xFFFF0000 + color);
+		mlx_pixel_put(mlx->mlx, mlx->win, 399 - j, j, 0xFF0000FF);
+		color += (color < 255);
+	}
+
+	for(int j = 0; j < 20; j++)
+	{
+		for(int k = 0; k < 20; k++)
+			mlx_pixel_put(mlx->mlx, mlx->win, 220 + j, 160 + k, 0xFFFF0000);
+	}
+
+	mlx_string_put(mlx->mlx, mlx->render_target_win, 20, 20, 0xFFAF2BFF, "yippeeee");
+	for(int j = 0, color = 0; j < 200; j++)
+	{
+		mlx_pixel_put(mlx->mlx, mlx->render_target_win, j, j, 0xFFFF0000 + color);
+		mlx_pixel_put(mlx->mlx, mlx->render_target_win, 199 - j, j, 0xFF0000FF);
+		color += (color < 255);
+	}
+
+	mlx_transform_put_image_to_window(mlx->mlx, mlx->win, mlx->render_target, 5, 250, 0.5f, 33.0f);
+
+	return 0;
+}
+
+int key_hook(int key, void* param)
+{
+	mlx_t* mlx = (mlx_t*)param;
+	if(key == 41)
+		mlx_loop_end(mlx->mlx);
+	return 0;
+}
+
+int window_hook(int event, void* param)
+{
+	if(event == 0)
+		mlx_loop_end(((mlx_t*)param)->mlx);
+	return 0;
+}
+
+int main(void)
+{
+	mlx_t mlx;
+
+	mlx.mlx = mlx_init();
+	mlx.win = mlx_new_resizable_window(mlx.mlx, 400, 400, "My window");
+
+	mlx.render_target = mlx_new_image(mlx.mlx, 200, 200);
+	mlx.render_target_win = mlx_new_window(mlx.mlx, 200, 200, (char*)mlx.render_target);
+	mlx_clear_window(mlx.mlx, mlx.render_target_win, 0xFFC16868);
+
+	mlx_on_event(mlx.mlx, mlx.win, MLX_KEYDOWN, key_hook, &mlx);
+	mlx_on_event(mlx.mlx, mlx.win, MLX_WINDOW_EVENT, window_hook, &mlx);
+
+	mlx_loop_hook(mlx.mlx, update, &mlx);
+	mlx_loop(mlx.mlx);
+
+	mlx_destroy_window(mlx.mlx, mlx.win);
+	
+	mlx_destroy_window(mlx.mlx, mlx.render_target_win);
+	mlx_destroy_image(mlx.mlx, mlx.render_target);
+
+	mlx_destroy_display(mlx.mlx);
+
+	return 0;
+}

experimental/RenderToTexture/run.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+bash ./build.sh
+./a.out

includes/mlx.h

@@ -6,7 +6,7 @@
 /*   By: maldavid <contact@kbz8.me>                 +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/10/04 16:56:35 by maldavid          #+#    #+#             */
-/*   Updated: 2024/11/05 18:18:22 by maldavid         ###   ########.fr       */
+/*   Updated: 2024/12/04 17:52:23 by maldavid         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

runtime/Includes/Core/Application.h

@@ -58,6 +58,7 @@ namespace mlx
 			FontRegistry m_font_registry;
 			ImageRegistry m_image_registry;
 			std::vector<std::unique_ptr<GraphicsSupport>> m_graphics;
+			std::shared_ptr<Font> p_last_font_bound;
 			std::function<int(Handle)> f_loop_hook;
 			std::unique_ptr<RenderCore> p_render_core;
 			#ifdef PROFILER

runtime/Includes/Core/Application.inl

@@ -98,6 +98,7 @@ namespace mlx
 				m_in.RegisterWindow(m_graphics.back()->GetWindow());
 			}
 		}
+		m_graphics.back()->GetScene().BindFont(p_last_font_bound);
 		return static_cast<void*>(&m_graphics.back()->GetID());
 	}
 
@@ -162,6 +163,8 @@ namespace mlx
 			m_font_registry.RegisterFont(font);
 		}
 
+		p_last_font_bound = font;
+
 		for(auto& gs : m_graphics)
 		{
 			if(gs)

runtime/Sources/Renderer/Pipelines/Graphics.cpp

@@ -180,14 +180,26 @@ namespace mlx
 			attachment_views.push_back(image->GetImageView());
 		}
 
-		VkSubpassDependency& dependency = dependencies.emplace_back();
+		if(!render_targets.empty())
-		dependency.srcSubpass = VK_SUBPASS_EXTERNAL;
+		{
-		dependency.dstSubpass = 0;
+			VkSubpassDependency& first_depedency = dependencies.emplace_back();
-		dependency.srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+			first_depedency.srcSubpass           = VK_SUBPASS_EXTERNAL;
-		dependency.dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+			first_depedency.dstSubpass           = 0;
-		dependency.srcAccessMask = 0;
+			first_depedency.srcStageMask         = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
-		dependency.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+			first_depedency.srcAccessMask        = VK_ACCESS_SHADER_READ_BIT;
-		dependency.dependencyFlags = 0;
+			first_depedency.dstStageMask         = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+			first_depedency.dstAccessMask        = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+			first_depedency.dependencyFlags      = VK_DEPENDENCY_BY_REGION_BIT;
+
+			VkSubpassDependency& second_depedency = dependencies.emplace_back();
+			second_depedency.srcSubpass           = 0;
+			second_depedency.dstSubpass           = VK_SUBPASS_EXTERNAL;
+			second_depedency.srcStageMask         = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+			second_depedency.srcAccessMask        = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+			second_depedency.dstStageMask         = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
+			second_depedency.dstAccessMask        = VK_ACCESS_SHADER_READ_BIT;
+			second_depedency.dependencyFlags      = VK_DEPENDENCY_BY_REGION_BIT;
+		}
 
 		m_renderpass = kvfCreateRenderPassWithSubpassDependencies(RenderCore::Get().GetDevice(), attachments.data(), attachments.size(), GetPipelineBindPoint(), dependencies.data(), dependencies.size());
 		m_clears.clear();