[#13][feat] frame progressbar

Makefile

@@ -147,6 +147,7 @@ SRCS_FILES			=	\
 						camera/rt_cam_world_to_screen.c\
 						\
 						ui/rt_ui_help_bg.c\
+						ui/rt_ui_frame_progress.c\
 						\
 						main.c\
 

include/minirt.h

@@ -222,5 +222,6 @@ void	rt_draw_rect(t_data *data, t_rect, t_rgb color, float alpha);
 
 // ui
 void	rt_ui_help_bg(t_data *data);
+void	rt_ui_frame_progress(t_data *data);
 
 #endif

src/help/rt_help.c

@@ -27,7 +27,7 @@ static int	rt_help_viewer(t_data *data, int line)
 		rt_help_label(data, line, "Image quality");
 		i = 100;
 		if (data->rdr.tile_size > 1 && data->rdr.step_max > 0)
-			i *= (t_float)data->rdr.step / data->rdr.step_max;
+			i *= fmin(data->rdr.step, data->rdr.step_max) / data->rdr.step_max;
 		if (i == 100)
 			rt_help_value_perc(data, line++, i, GREEN);
 		else

src/raytracer/rt_draw_frame.c

@@ -6,7 +6,7 @@
 /*   By: dapereir <[email protected]>      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/12/14 16:35:43 by dapereir          #+#    #+#             */
-/*   Updated: 2023/07/02 21:33:11 by dapereir         ###   ########.fr       */
+/*   Updated: 2023/07/05 14:46:49 by dapereir         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -30,6 +30,31 @@ static void	rt_clear_buffer(t_data *data)
 	}
 }
 
+static void	rt_draw_buffer(t_data *data)
+{
+	int		x;
+	int		y;
+	t_buf	buf;
+	t_rgb	color;
+
+	ft_bzero(&buf, sizeof(buf));
+	y = 0;
+	while (y < WIN_HEIGHT)
+	{
+		x = 0;
+		while (x < WIN_WIDTH)
+		{
+			buf = data->rdr.buf[x][y];
+			color = buf.color;
+			if (buf.obj && buf.obj == data->ui.selected)
+				color = rgb_mix(color, rgb(255, 255, 255), 0.1);
+			rt_viewer_set_pixel(data, x, y, color);
+			x++;
+		}
+		y++;
+	}
+}
+
 void	rt_draw_frame(t_data *data)
 {
 	if (data->ui.changed)
@@ -45,7 +70,9 @@ void	rt_draw_frame(t_data *data)
 	}
 	if (data->rdr.step <= data->rdr.step_max)
 		rt_lowres_draw_step(data, data->rdr.step);
-	if (data->rdr.step < data->rdr.step_max)
+	else
+		rt_draw_buffer(data);
+	if (data->rdr.step <= data->rdr.step_max)
 		data->rdr.step++;
 	data->ui.changed = 0;
 }

src/ui/rt_ui_frame_progress.c

@@ -0,0 +1,30 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   rt_ui_frame_progress.c                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: dapereir <[email protected]>      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/07/05 14:16:53 by dapereir          #+#    #+#             */
+/*   Updated: 2023/07/05 14:47:44 by dapereir         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "minirt.h"
+
+void	rt_ui_frame_progress(t_data *data)
+{
+	int		padding;
+	t_rect	rect;
+
+	if (!data || data->rdr.step > data->rdr.step_max)
+		return ;
+	padding = 2;
+	rect.p = px(padding, padding);
+	rect.h = 2;
+	rect.w = 0;
+	if (data->rdr.step_max)
+		rect.w = (t_float)(WIN_WIDTH - 2 * padding) \
+			* data->rdr.step / data->rdr.step_max;
+	rt_draw_rect(data, rect, rgb(255, 255, 255), 1);
+}

src/viewer/rt_viewer_render_frame.c

@@ -23,6 +23,7 @@ int	rt_viewer_render_frame(t_data *data)
 		&data->img.len, &data->img.endian);
 	rt_viewer_thread_handler(data);
 	rt_ui_help_bg(data);
+	rt_ui_frame_progress(data);
 	mlx_put_image_to_window(data->mlx, data->win, data->img.img, 0, 0);
 	mlx_destroy_image(data->mlx, data->img.img);
 	data->img.img = NULL;