Fractol final

mdabir1203 · Dec 10, 2022 · ae564c6 · ae564c6
1 parent 2859b05
commit ae564c6
Show file tree

Hide file tree

Showing 63 changed files with 47 additions and 14 deletions.
diff --git a/fractol b/fractol
diff --git a/libs/libft/ft_atoi.o b/libs/libft/ft_atoi.o
diff --git a/libs/libft/ft_bzero.o b/libs/libft/ft_bzero.o
diff --git a/libs/libft/ft_calloc.o b/libs/libft/ft_calloc.o
diff --git a/libs/libft/ft_isalnum.o b/libs/libft/ft_isalnum.o
diff --git a/libs/libft/ft_isalpha.o b/libs/libft/ft_isalpha.o
diff --git a/libs/libft/ft_isascii.o b/libs/libft/ft_isascii.o
diff --git a/libs/libft/ft_isdigit.o b/libs/libft/ft_isdigit.o
diff --git a/libs/libft/ft_isprint.o b/libs/libft/ft_isprint.o
diff --git a/libs/libft/ft_itoa.o b/libs/libft/ft_itoa.o
diff --git a/libs/libft/ft_lstadd_back.o b/libs/libft/ft_lstadd_back.o
diff --git a/libs/libft/ft_lstadd_front.o b/libs/libft/ft_lstadd_front.o
diff --git a/libs/libft/ft_lstclear.o b/libs/libft/ft_lstclear.o
diff --git a/libs/libft/ft_lstdelone.o b/libs/libft/ft_lstdelone.o
diff --git a/libs/libft/ft_lstiter.o b/libs/libft/ft_lstiter.o
diff --git a/libs/libft/ft_lstlast.o b/libs/libft/ft_lstlast.o
diff --git a/libs/libft/ft_lstmap.o b/libs/libft/ft_lstmap.o
diff --git a/libs/libft/ft_lstnew.o b/libs/libft/ft_lstnew.o
diff --git a/libs/libft/ft_lstsize.o b/libs/libft/ft_lstsize.o
diff --git a/libs/libft/ft_memchr.o b/libs/libft/ft_memchr.o
diff --git a/libs/libft/ft_memcmp.o b/libs/libft/ft_memcmp.o
diff --git a/libs/libft/ft_memcpy.o b/libs/libft/ft_memcpy.o
diff --git a/libs/libft/ft_memmove.o b/libs/libft/ft_memmove.o
diff --git a/libs/libft/ft_memset.o b/libs/libft/ft_memset.o
diff --git a/libs/libft/ft_putchar_fd.o b/libs/libft/ft_putchar_fd.o
diff --git a/libs/libft/ft_putendl_fd.o b/libs/libft/ft_putendl_fd.o
diff --git a/libs/libft/ft_putnbr_fd.o b/libs/libft/ft_putnbr_fd.o
diff --git a/libs/libft/ft_putstr_fd.o b/libs/libft/ft_putstr_fd.o
diff --git a/libs/libft/ft_split.o b/libs/libft/ft_split.o
diff --git a/libs/libft/ft_strchr.o b/libs/libft/ft_strchr.o
diff --git a/libs/libft/ft_strdup.o b/libs/libft/ft_strdup.o
diff --git a/libs/libft/ft_striteri.o b/libs/libft/ft_striteri.o
diff --git a/libs/libft/ft_strjoin.o b/libs/libft/ft_strjoin.o
diff --git a/libs/libft/ft_strlcat.o b/libs/libft/ft_strlcat.o
diff --git a/libs/libft/ft_strlcpy.o b/libs/libft/ft_strlcpy.o
diff --git a/libs/libft/ft_strlen.o b/libs/libft/ft_strlen.o
diff --git a/libs/libft/ft_strmapi.o b/libs/libft/ft_strmapi.o
diff --git a/libs/libft/ft_strncmp.o b/libs/libft/ft_strncmp.o
diff --git a/libs/libft/ft_strnstr.o b/libs/libft/ft_strnstr.o
diff --git a/libs/libft/ft_strrchr.o b/libs/libft/ft_strrchr.o
diff --git a/libs/libft/ft_strtrim.o b/libs/libft/ft_strtrim.o
diff --git a/libs/libft/ft_substr.o b/libs/libft/ft_substr.o
diff --git a/libs/libft/ft_tolower.o b/libs/libft/ft_tolower.o
diff --git a/libs/libft/ft_toupper.o b/libs/libft/ft_toupper.o
diff --git a/libs/libft/libft.a b/libs/libft/libft.a
diff --git a/libs/minilibx-linux/libmlx.a b/libs/minilibx-linux/libmlx.a
diff --git a/libs/minilibx-linux/mlx_init_loop.o b/libs/minilibx-linux/mlx_init_loop.o
diff --git a/libs/minilibx-linux/mlx_int_str_to_wordtab.o b/libs/minilibx-linux/mlx_int_str_to_wordtab.o
diff --git a/libs/minilibx-linux/mlx_mouse.o b/libs/minilibx-linux/mlx_mouse.o
diff --git a/libs/minilibx-linux/mlx_new_image.o b/libs/minilibx-linux/mlx_new_image.o
diff --git a/libs/minilibx-linux/mlx_new_window.o b/libs/minilibx-linux/mlx_new_window.o
diff --git a/libs/minilibx-linux/mlx_png.o b/libs/minilibx-linux/mlx_png.o
diff --git a/libs/minilibx-linux/mlx_shaders.o b/libs/minilibx-linux/mlx_shaders.o
diff --git a/libs/minilibx-linux/mlx_xpm.o b/libs/minilibx-linux/mlx_xpm.o
diff --git a/src/colors.c b/src/colors.c
@@ -6,7 +6,7 @@
 /*   By: mabbas <[email protected]>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/12/08 14:30:35 by mabbas            #+#    #+#             */
-/*   Updated: 2022/12/10 00:34:28 by mabbas           ###   ########.fr       */
+/*   Updated: 2022/12/10 23:39:41 by mabbas           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -63,3 +63,32 @@ int	color_init(t_mlx *mlx)
 	}
 	return (trgb_gen(color[0], color[1], color[2], color[3]));
 }
+
+/** Experimental Color conversions **/
+// int	color_init(t_mlx *mlx)
+// {
+// 	double	t;
+// 	int		color[4];
+
+// 	t = (double)mlx->iter / (double)mlx->iter_max;
+// 	color[0] = 0;
+// 	if (mlx->shift == 1)
+// 	{
+// 		color[1] = (rand()) * 255 * t;
+// 		color[2] = (rand()) * 1 * t;
+// 		color[3] = (rand()) * 125 * (1 - t);
+// 	}
+// 	if (mlx->shift == 2)
+// 	{
+// 		color[2] = (int)(9 * (1 - t) * pow(t, 3) * 235);
+// 		color[1] = (int)(13 * pow((1 - t), 2) * pow(t, 2) * 255);
+// 		color[3] = (int)(7 * pow((1 - t), 3) * t * 225);
+// 	}
+// 	if (mlx->shift == 3)
+// 	{
+// 		color[3] = (int)(9 * (1 - t) * pow(t, 3) * 255);
+// 		color[2] = (int)(15 * pow((1 - t), 2) * pow(t, 2) * 121);
+// 		color[1] = (int)(8.5 * pow((1 - t), 3) * t * 225);
+// 	}
+// 	return (trgb_gen(color[0], color[1], color[2], color[3]));
+// }
diff --git a/src/colors.o b/src/colors.o
diff --git a/src/equations.o b/src/equations.o
diff --git a/src/initialization.o b/src/initialization.o
diff --git a/src/key_oper.o b/src/key_oper.o
diff --git a/src/main.c b/src/main.c
@@ -6,7 +6,7 @@
 /*   By: mabbas <[email protected]>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/12/08 20:43:36 by mabbas            #+#    #+#             */
-/*   Updated: 2022/12/10 14:50:21 by mabbas           ###   ########.fr       */
+/*   Updated: 2022/12/10 22:20:26 by mabbas           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

diff --git a/src/main.o b/src/main.o
diff --git a/src/mouse_oper.c b/src/mouse_oper.c
@@ -6,7 +6,7 @@
 /*   By: mabbas <[email protected]>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/12/08 19:23:34 by mabbas            #+#    #+#             */
-/*   Updated: 2022/12/10 00:54:55 by mabbas           ###   ########.fr       */
+/*   Updated: 2022/12/10 22:50:38 by mabbas           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,37 +18,41 @@
  *  An extra check is there for the coeff value range.
  **/
 
+// double	lerp(double start, double end, double inter_coeff)
+// {
+// 	if (inter_coeff <= 0.0)
+// 		return (start);
+// 	if (inter_coeff >= 1.0)
+// 		return (end);
+// 	return ((1 - inter_coeff) * start + inter_coeff * end);
+// }
+
 double	lerp(double start, double end, double inter_coeff)
 {
-	if (inter_coeff <= 0.0)
-		return (start);
-	if (inter_coeff >= 1.0)
-		return (end);
-	return ((1 - inter_coeff) * start + inter_coeff * end);
+	return (start + ((end - start) * inter_coeff));
 }
 
 int	ctrl_mouse(int key, int x, int y, t_mlx *mlx)
 {
 	t_oper	mouse;
 	double	zoom;
 
-	zoom = 0.0;
 	if (key == 1)
 		mlx->press = 1;
 	mouse.r = (mlx->min.r + x * ((mlx->max.r - mlx->min.r)
 				/ (WIDTH)));
 	mouse.i = (mlx->max.i - y * ((mlx->max.i - mlx->min.i)
 				/ (HEIGHT)));
 	if (key == 5)
-		zoom = 1.10;
+		zoom = 1.20;
 	else if (key == 4)
-		zoom = 0.75;
+		zoom = 0.80;
 	else
-		zoom = 1;
+		zoom = 1.0;
 	mlx->min.r = lerp(mouse.r, mlx->min.r, zoom);
 	mlx->min.i = lerp(mouse.i, mlx->min.i, zoom);
 	mlx->max.r = lerp(mouse.r, mlx->max.r, zoom);
-	mlx->min.i = lerp(mouse.i, mlx->min.r, zoom);
+	mlx->max.i = lerp(mouse.i, mlx->max.i, zoom);
 	render_fractal(mlx);
 	return (0);
 }
@@ -61,7 +65,7 @@ int	julia_key_press(int key, int x, int y, t_mlx *mlx)
 	(void) x;
 	(void) y;
 	if (key == 1)
-		mlx->press = KEY_A;
+		mlx->press = 0;
 	return (0);
 }
 

diff --git a/src/mouse_oper.o b/src/mouse_oper.o