Better colors

Author: PythonGermany

colors.c

@@ -25,24 +25,29 @@ uint32_t	get_color(int r, int g, int b, int a)
 uint32_t	tcr(int iter, int curr, int cs)
 {
 	int	c;
+	int max = 255 * 6 + 1;
+	int fa;
 
-	c = range(255 * 6 + 1, iter, curr);
-	if (c == 255 * 6 + 1)
+	fa = 0;
+	c = range(max, iter, curr);
+	if (c == max)
 		return (get_color(0, 0, 0, 255));
 	c += cs;
-	if (c <= 255 && !cs)
+	if (c > max)
+		c -= max;
+	if (cs <= 255 && c <= 255 * ++fa)
 		return (get_color(c, 0, 0, c));
-	if (c <= 255 && cs)
+	if (cs > 255 && c <= 255 * ++fa)
 		return (get_color(255, 0, 255 - c, 255));
-	if (c <= 255 * 2)
+	if (c <= 255 * ++fa)
 		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)
-		return (get_color(0, 255 * 5 - c, 255, 255));
-	return (get_color(c - 255 * 5, 0, 255, 255));
+	if (c <= 255 * ++fa)
+		return (get_color(255 * fa - c, 255 , 0, 255));
+	if (c <= 255 * ++fa)
+		return (get_color(0, 255, c - 255 * (fa - 1), 255));
+	if (c <= 255 * ++fa)
+		return (get_color(0, 255 * fa - c, 255, 255));
+	return (get_color(c - 255 * (fa - 1), 0, 255, 255));
 }
 
 // uint32_t	lin_inter(uint32_t c1, uint32_t c2, double f)

fractals.c

@@ -60,8 +60,8 @@ int	tricorn(t_dta *dta)
 	y_im = 0;
 	while (x_re * x_re + y_im * y_im <= 4 && n < dta->iter)
 	{
-		x_buf = x_re * x_re - y_im * y_im + dta->re;
-		y_im = -2 * x_re * y_im + dta->im;
+		x_buf = x_re * x_re - y_im * y_im + dta->x;
+		y_im = -2 * x_re * y_im + dta->y;
 		x_re = x_buf;
 		n++;
 	}

fractol.h

@@ -15,8 +15,8 @@
 
 # include "MLX42.h"
 
-# define WIDTH 500
-# define HEIGHT 500
+# define WIDTH 400
+# define HEIGHT 400
 
 typedef struct s_dta
 {

hooks.c

@@ -17,37 +17,50 @@
 int i = 0;
 int ms_g = 0;
 
+void	key_act_d(mlx_t *mlx, keys_t key, double *n, double op)
+{
+	if (mlx_is_key_down(mlx, key))
+		*n += op;
+}
+
+void	key_act_i(mlx_t *mlx, keys_t key, int *n, int op)
+{
+	if (mlx_is_key_down(mlx, key))
+		*n = op;
+}
+
 void	key_hook(void *dta)
 {
 	t_dta	*tmp;
+	int32_t x;
+	int32_t y;
 
 	tmp = (t_dta *)dta;
 	if (mlx_is_key_down(tmp->mlx, MLX_KEY_ESCAPE))
 		mlx_close_window(tmp->mlx);
-	if (mlx_is_key_down(tmp->mlx, MLX_KEY_MINUS))
-		tmp->iter = tmp->iter / 1.1 + 1;
-	if (mlx_is_key_down(tmp->mlx, MLX_KEY_EQUAL))
-		tmp->iter = tmp->iter * 1.1 + 1;
-	if (mlx_is_key_down(tmp->mlx, MLX_KEY_UP))
-		tmp->ys += 0.02 * tmp->scale;
-	if (mlx_is_key_down(tmp->mlx, MLX_KEY_DOWN))
-		tmp->ys -= 0.02 * tmp->scale;
-	if (mlx_is_key_down(tmp->mlx, MLX_KEY_LEFT))
-		tmp->xs -= 0.02 * tmp->scale;
-	if (mlx_is_key_down(tmp->mlx, MLX_KEY_RIGHT))
-		tmp->xs += 0.02 * tmp->scale;
 	if (mlx_is_key_down(tmp->mlx, MLX_KEY_R))
 		populate_dta(tmp);
+	key_act_i(tmp->mlx, MLX_KEY_MINUS, &tmp->iter, tmp->iter / 1.1 + 1);
+	key_act_i(tmp->mlx, MLX_KEY_EQUAL, &tmp->iter, tmp->iter * 1.1);
+	key_act_i(tmp->mlx, MLX_KEY_C, &tmp->cs, tmp->cs % (254 * 6) + 6);
+	key_act_d(tmp->mlx, MLX_KEY_UP, &tmp->ys, 0.02 * tmp->scale);
+	key_act_d(tmp->mlx, MLX_KEY_DOWN, &tmp->ys, -0.02 * tmp->scale);
+	key_act_d(tmp->mlx, MLX_KEY_LEFT, &tmp->xs, -0.02 * tmp->scale);
+	key_act_d(tmp->mlx, MLX_KEY_RIGHT, &tmp->xs, 0.02 * tmp->scale);
 	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();
+	{
+		mlx_get_mouse_pos(tmp->mlx, &x, &y);
+		tmp->re = (x - WIDTH / 2) * tmp->scale / WIDTH;
+		tmp->im = (HEIGHT / 2 - y) * tmp->scale / HEIGHT;
+	}
+	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);
+	diff = clock() - start;
+	int msec = diff * 1000 / CLOCKS_PER_SEC;
+	ms_g += msec%1000;
+	i++;
+	printf("%d milliseconds, av: %d\nScale: %f, %d iter\nXparam %f, Yparam %f\n\n", msec%1000, ms_g / i, tmp->scale, tmp->iter, tmp->re, tmp->im);
 
 }
 
@@ -63,14 +76,14 @@ void	scroll_hook(double xdelta, double ydelta, void *param)
 	if (ydelta > 0)
 	{
 		tmp->scale /= 1.2;
-		tmp->xs += ((x - WIDTH / 2) * tmp->scale) / WIDTH * 0.2;
-		tmp->ys += ((HEIGHT / 2 - y) * tmp->scale) / HEIGHT * 0.2;
+		tmp->xs += (x - WIDTH / 2) * tmp->scale / WIDTH * 0.2;
+		tmp->ys += (HEIGHT / 2 - y) * tmp->scale / HEIGHT * 0.2;
 	}
 	if (ydelta < 0)
 	{
 		tmp->scale *= 1.2;
-		tmp->xs += ((x - WIDTH / 2) * tmp->scale) / WIDTH * -(1 - 1 / 1.2);
-		tmp->ys += ((HEIGHT / 2 - y) * tmp->scale) / HEIGHT * -(1 - 1 / 1.2);
+		tmp->xs += (x - WIDTH / 2) * tmp->scale / WIDTH * -(1 - 1 / 1.2);
+		tmp->ys += (HEIGHT / 2 - y) * tmp->scale / HEIGHT * -(1 - 1 / 1.2);
 	}
 }
 

main.c

@@ -6,7 +6,7 @@
 /*   By: rburgsta <[email protected].    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/11/27 16:31:38 by rburgsta          #+#    #+#             */
-/*   Updated: 2022/11/30 02:27:57 by rburgsta         ###   ########.fr       */
+/*   Updated: 2022/11/30 14:08:26 by rburgsta         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -83,17 +83,17 @@ void	populate_dta(t_dta *dta)
 
 void	calculate_window(t_dta *dta)
 {
-	size_t	i;
-	size_t	i2;
+	int	i;
+	int	i2;
 
 	i = 0;
 	while (i < HEIGHT)
 	{
 		i2 = 0;
 		while (i2 < WIDTH)
 		{
-			dta->x = ((i2 - WIDTH / 2.0) * dta->scale) / WIDTH + dta->xs;
-			dta->y = ((HEIGHT / 2.0 - i) * dta->scale) / HEIGHT + dta->ys;
+			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, \
 				tcr(dta->iter, (*dta->f)(dta), dta->cs));
 		}