Nothing

Author: PythonGermany

Makefile

@@ -6,7 +6,7 @@
 #    By: rburgsta <[email protected].    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2022/11/25 15:38:03 by rburgsta          #+#    #+#              #
-#    Updated: 2022/11/29 22:21:52 by rburgsta         ###   ########.fr        #
+#    Updated: 2022/11/30 02:30:14 by rburgsta         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 

colors.c

@@ -22,25 +22,47 @@ uint32_t	get_color(int r, int g, int b, int a)
 	return ((r <<= 24) + (g <<= 16) + (b <<= 8) + (a & 0xFF));
 }
 
-uint32_t	transform_color_range(t_dta *dta)
+uint32_t	tcr(int iter, int curr, int cs)
 {
 	int	c;
 
-	c = range(255 * 6 + 1, dta->iter, (*dta->f)(dta));
+	c = range(255 * 6 + 1, iter, curr);
 	if (c == 255 * 6 + 1)
 		return (get_color(0, 0, 0, 255));
-	c += dta->cs;
-	if (c <= 255 && !dta->cs)
+	c += cs;
+	if (c <= 255 && !cs)
 		return (get_color(c, 0, 0, c));
-	if (c <= 255 && dta->cs)
+	if (c <= 255 && cs)
 		return (get_color(255, 0, 255 - c, 255));
 	if (c <= 255 * 2)
 		return (get_color(255, c - 255, 0, 255));
 	if (c <= 255 * 3)
 		return (get_color(255 * 3 - c, 255 , 0, 255));
 	if (c <= 255 * 4)
 		return (get_color(0, 255, c - 255 * 3, 255));
-	if (c < 255 * 5)
+	if (c <= 255 * 5)
 		return (get_color(0, 255 * 5 - c, 255, 255));
 	return (get_color(c - 255 * 5, 0, 255, 255));
-}
+}
+
+// uint32_t	lin_inter(uint32_t c1, uint32_t c2, double f)
+// {
+// 	uint8_t		dr;
+// 	uint8_t		dg;
+// 	uint8_t		db;
+// 	uint8_t		da;
+
+// 	dr = (c2 - c1) << 24;
+// 	dg = (c2 - c1) << 16;
+// 	db = (c2 - c1) << 8;
+// 	da = (c2 - c1) & 0xFF;
+// 	return (get_color((c2 << 24) + dr * f, (c2 << 16) + dg * f,
+// 		(c2 << 8) + db * f, (c2 & 0xFF) + da * f));
+
+// }
+
+// uint32_t interpolate(int iter, double curr, int cs)
+// {
+// 	return (lin_inter(tcr(iter, curr, cs),
+// 		tcr(iter, curr + 1, cs), curr - (int)curr));
+// }

fractol.h

@@ -33,6 +33,7 @@ typedef struct s_dta
 	double		x;
 	double		y;
 	int			cs;
+	int			param[4];
 }	t_dta;
 
 //Fractals
@@ -41,9 +42,9 @@ int			mandelbrot(t_dta *dta);
 int			tricorn(t_dta *dta);
 
 //Colors
-int			range(int out_max, int in_max, int in_curr);
 uint32_t	get_color(int r, int g, int b, int a);
-uint32_t	transform_color_range(t_dta *dta);
+uint32_t	tcr(int iter, int curr, int cs);
+//uint32_t	interpolate(int iter, double curr, int cs);
 
 //Hooks
 void		key_hook(void *dta);

hooks.c

@@ -11,6 +11,11 @@
 /* ************************************************************************** */
 
 #include "fractol.h"
+#include <stdio.h>
+#include <time.h>
+
+int i = 0;
+int ms_g = 0;
 
 void	key_hook(void *dta)
 {
@@ -35,7 +40,15 @@ void	key_hook(void *dta)
 		populate_dta(tmp);
 	if (mlx_is_mouse_down(tmp->mlx, MLX_MOUSE_BUTTON_RIGHT))
 		tmp->cs = (tmp->cs % (254 * 6)) + 6;
+	// clock_t diff;
+	// clock_t start = clock();
 	calculate_window(tmp);
+	// diff = clock() - start;
+	// int msec = diff * 1000 / CLOCKS_PER_SEC;
+	// ms_g += msec%1000;
+	// i++;
+	// printf("Time taken %d seconds %d milliseconds av: %d\n", msec/1000, msec%1000, ms_g / i);
+
 }
 
 void	scroll_hook(double xdelta, double ydelta, void *param)

main.c

@@ -6,7 +6,7 @@
 /*   By: rburgsta <[email protected].    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/11/27 16:31:38 by rburgsta          #+#    #+#             */
-/*   Updated: 2022/11/29 22:23:20 by rburgsta         ###   ########.fr       */
+/*   Updated: 2022/11/30 02:27:57 by rburgsta         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -94,7 +94,8 @@ void	calculate_window(t_dta *dta)
 		{
 			dta->x = ((i2 - WIDTH / 2.0) * dta->scale) / WIDTH + dta->xs;
 			dta->y = ((HEIGHT / 2.0 - i) * dta->scale) / HEIGHT + dta->ys;
-			mlx_put_pixel(dta->img, i2++, i, transform_color_range(dta));
+			mlx_put_pixel(dta->img, i2++, i, \
+				tcr(dta->iter, (*dta->f)(dta), dta->cs));
 		}
 		i++;
 	}