diff --git a/fractol b/fractol new file mode 100755 index 0000000..5b7efed Binary files /dev/null and b/fractol differ diff --git a/libs/libft/ft_atoi.o b/libs/libft/ft_atoi.o new file mode 100644 index 0000000..e991525 Binary files /dev/null and b/libs/libft/ft_atoi.o differ diff --git a/libs/libft/ft_bzero.o b/libs/libft/ft_bzero.o new file mode 100644 index 0000000..cff08ae Binary files /dev/null and b/libs/libft/ft_bzero.o differ diff --git a/libs/libft/ft_calloc.o b/libs/libft/ft_calloc.o new file mode 100644 index 0000000..805a2a7 Binary files /dev/null and b/libs/libft/ft_calloc.o differ diff --git a/libs/libft/ft_isalnum.o b/libs/libft/ft_isalnum.o new file mode 100644 index 0000000..3aecc58 Binary files /dev/null and b/libs/libft/ft_isalnum.o differ diff --git a/libs/libft/ft_isalpha.o b/libs/libft/ft_isalpha.o new file mode 100644 index 0000000..da20b01 Binary files /dev/null and b/libs/libft/ft_isalpha.o differ diff --git a/libs/libft/ft_isascii.o b/libs/libft/ft_isascii.o new file mode 100644 index 0000000..d86e4f0 Binary files /dev/null and b/libs/libft/ft_isascii.o differ diff --git a/libs/libft/ft_isdigit.o b/libs/libft/ft_isdigit.o new file mode 100644 index 0000000..a0e0f40 Binary files /dev/null and b/libs/libft/ft_isdigit.o differ diff --git a/libs/libft/ft_isprint.o b/libs/libft/ft_isprint.o new file mode 100644 index 0000000..8cf5033 Binary files /dev/null and b/libs/libft/ft_isprint.o differ diff --git a/libs/libft/ft_itoa.o b/libs/libft/ft_itoa.o new file mode 100644 index 0000000..325d116 Binary files /dev/null and b/libs/libft/ft_itoa.o differ diff --git a/libs/libft/ft_lstadd_back.o b/libs/libft/ft_lstadd_back.o new file mode 100644 index 0000000..a9ba9ee Binary files /dev/null and b/libs/libft/ft_lstadd_back.o differ diff --git a/libs/libft/ft_lstadd_front.o b/libs/libft/ft_lstadd_front.o new file mode 100644 index 0000000..1dbb092 Binary files /dev/null and b/libs/libft/ft_lstadd_front.o differ diff --git a/libs/libft/ft_lstclear.o b/libs/libft/ft_lstclear.o new file mode 100644 index 0000000..2431c72 Binary files /dev/null and b/libs/libft/ft_lstclear.o differ diff --git a/libs/libft/ft_lstdelone.o b/libs/libft/ft_lstdelone.o new file mode 100644 index 0000000..6dc354e Binary files /dev/null and b/libs/libft/ft_lstdelone.o differ diff --git a/libs/libft/ft_lstiter.o b/libs/libft/ft_lstiter.o new file mode 100644 index 0000000..36388a5 Binary files /dev/null and b/libs/libft/ft_lstiter.o differ diff --git a/libs/libft/ft_lstlast.o b/libs/libft/ft_lstlast.o new file mode 100644 index 0000000..0f262f1 Binary files /dev/null and b/libs/libft/ft_lstlast.o differ diff --git a/libs/libft/ft_lstmap.o b/libs/libft/ft_lstmap.o new file mode 100644 index 0000000..b3d4b6d Binary files /dev/null and b/libs/libft/ft_lstmap.o differ diff --git a/libs/libft/ft_lstnew.o b/libs/libft/ft_lstnew.o new file mode 100644 index 0000000..98420b2 Binary files /dev/null and b/libs/libft/ft_lstnew.o differ diff --git a/libs/libft/ft_lstsize.o b/libs/libft/ft_lstsize.o new file mode 100644 index 0000000..ff48746 Binary files /dev/null and b/libs/libft/ft_lstsize.o differ diff --git a/libs/libft/ft_memchr.o b/libs/libft/ft_memchr.o new file mode 100644 index 0000000..1f39cb2 Binary files /dev/null and b/libs/libft/ft_memchr.o differ diff --git a/libs/libft/ft_memcmp.o b/libs/libft/ft_memcmp.o new file mode 100644 index 0000000..016c46c Binary files /dev/null and b/libs/libft/ft_memcmp.o differ diff --git a/libs/libft/ft_memcpy.o b/libs/libft/ft_memcpy.o new file mode 100644 index 0000000..13d99f6 Binary files /dev/null and b/libs/libft/ft_memcpy.o differ diff --git a/libs/libft/ft_memmove.o b/libs/libft/ft_memmove.o new file mode 100644 index 0000000..6b19f94 Binary files /dev/null and b/libs/libft/ft_memmove.o differ diff --git a/libs/libft/ft_memset.o b/libs/libft/ft_memset.o new file mode 100644 index 0000000..8408d24 Binary files /dev/null and b/libs/libft/ft_memset.o differ diff --git a/libs/libft/ft_putchar_fd.o b/libs/libft/ft_putchar_fd.o new file mode 100644 index 0000000..65a4dfd Binary files /dev/null and b/libs/libft/ft_putchar_fd.o differ diff --git a/libs/libft/ft_putendl_fd.o b/libs/libft/ft_putendl_fd.o new file mode 100644 index 0000000..6b604b9 Binary files /dev/null and b/libs/libft/ft_putendl_fd.o differ diff --git a/libs/libft/ft_putnbr_fd.o b/libs/libft/ft_putnbr_fd.o new file mode 100644 index 0000000..f9fa56b Binary files /dev/null and b/libs/libft/ft_putnbr_fd.o differ diff --git a/libs/libft/ft_putstr_fd.o b/libs/libft/ft_putstr_fd.o new file mode 100644 index 0000000..5b3e61c Binary files /dev/null and b/libs/libft/ft_putstr_fd.o differ diff --git a/libs/libft/ft_split.o b/libs/libft/ft_split.o new file mode 100644 index 0000000..248cec9 Binary files /dev/null and b/libs/libft/ft_split.o differ diff --git a/libs/libft/ft_strchr.o b/libs/libft/ft_strchr.o new file mode 100644 index 0000000..22766e9 Binary files /dev/null and b/libs/libft/ft_strchr.o differ diff --git a/libs/libft/ft_strdup.o b/libs/libft/ft_strdup.o new file mode 100644 index 0000000..ef4efb9 Binary files /dev/null and b/libs/libft/ft_strdup.o differ diff --git a/libs/libft/ft_striteri.o b/libs/libft/ft_striteri.o new file mode 100644 index 0000000..d71e5ef Binary files /dev/null and b/libs/libft/ft_striteri.o differ diff --git a/libs/libft/ft_strjoin.o b/libs/libft/ft_strjoin.o new file mode 100644 index 0000000..05b5dbe Binary files /dev/null and b/libs/libft/ft_strjoin.o differ diff --git a/libs/libft/ft_strlcat.o b/libs/libft/ft_strlcat.o new file mode 100644 index 0000000..b8d13e0 Binary files /dev/null and b/libs/libft/ft_strlcat.o differ diff --git a/libs/libft/ft_strlcpy.o b/libs/libft/ft_strlcpy.o new file mode 100644 index 0000000..1f2e89c Binary files /dev/null and b/libs/libft/ft_strlcpy.o differ diff --git a/libs/libft/ft_strlen.o b/libs/libft/ft_strlen.o new file mode 100644 index 0000000..d7567d6 Binary files /dev/null and b/libs/libft/ft_strlen.o differ diff --git a/libs/libft/ft_strmapi.o b/libs/libft/ft_strmapi.o new file mode 100644 index 0000000..3821f45 Binary files /dev/null and b/libs/libft/ft_strmapi.o differ diff --git a/libs/libft/ft_strncmp.o b/libs/libft/ft_strncmp.o new file mode 100644 index 0000000..4776fc4 Binary files /dev/null and b/libs/libft/ft_strncmp.o differ diff --git a/libs/libft/ft_strnstr.o b/libs/libft/ft_strnstr.o new file mode 100644 index 0000000..1183356 Binary files /dev/null and b/libs/libft/ft_strnstr.o differ diff --git a/libs/libft/ft_strrchr.o b/libs/libft/ft_strrchr.o new file mode 100644 index 0000000..e9ffd0f Binary files /dev/null and b/libs/libft/ft_strrchr.o differ diff --git a/libs/libft/ft_strtrim.o b/libs/libft/ft_strtrim.o new file mode 100644 index 0000000..476c112 Binary files /dev/null and b/libs/libft/ft_strtrim.o differ diff --git a/libs/libft/ft_substr.o b/libs/libft/ft_substr.o new file mode 100644 index 0000000..04ff513 Binary files /dev/null and b/libs/libft/ft_substr.o differ diff --git a/libs/libft/ft_tolower.o b/libs/libft/ft_tolower.o new file mode 100644 index 0000000..940856f Binary files /dev/null and b/libs/libft/ft_tolower.o differ diff --git a/libs/libft/ft_toupper.o b/libs/libft/ft_toupper.o new file mode 100644 index 0000000..137ae03 Binary files /dev/null and b/libs/libft/ft_toupper.o differ diff --git a/libs/libft/libft.a b/libs/libft/libft.a index 74cbc64..7ee8147 100644 Binary files a/libs/libft/libft.a and b/libs/libft/libft.a differ diff --git a/libs/minilibx-linux/libmlx.a b/libs/minilibx-linux/libmlx.a new file mode 100644 index 0000000..6e34009 Binary files /dev/null and b/libs/minilibx-linux/libmlx.a differ diff --git a/libs/minilibx-linux/mlx_init_loop.o b/libs/minilibx-linux/mlx_init_loop.o new file mode 100644 index 0000000..afb0884 Binary files /dev/null and b/libs/minilibx-linux/mlx_init_loop.o differ diff --git a/libs/minilibx-linux/mlx_int_str_to_wordtab.o b/libs/minilibx-linux/mlx_int_str_to_wordtab.o new file mode 100644 index 0000000..efe051c Binary files /dev/null and b/libs/minilibx-linux/mlx_int_str_to_wordtab.o differ diff --git a/libs/minilibx-linux/mlx_mouse.o b/libs/minilibx-linux/mlx_mouse.o new file mode 100644 index 0000000..0e28945 Binary files /dev/null and b/libs/minilibx-linux/mlx_mouse.o differ diff --git a/libs/minilibx-linux/mlx_new_image.o b/libs/minilibx-linux/mlx_new_image.o new file mode 100644 index 0000000..e750718 Binary files /dev/null and b/libs/minilibx-linux/mlx_new_image.o differ diff --git a/libs/minilibx-linux/mlx_new_window.o b/libs/minilibx-linux/mlx_new_window.o new file mode 100644 index 0000000..a6ecdf6 Binary files /dev/null and b/libs/minilibx-linux/mlx_new_window.o differ diff --git a/libs/minilibx-linux/mlx_png.o b/libs/minilibx-linux/mlx_png.o new file mode 100644 index 0000000..4ca9259 Binary files /dev/null and b/libs/minilibx-linux/mlx_png.o differ diff --git a/libs/minilibx-linux/mlx_shaders.o b/libs/minilibx-linux/mlx_shaders.o new file mode 100644 index 0000000..316b204 Binary files /dev/null and b/libs/minilibx-linux/mlx_shaders.o differ diff --git a/libs/minilibx-linux/mlx_xpm.o b/libs/minilibx-linux/mlx_xpm.o new file mode 100644 index 0000000..927b6ce Binary files /dev/null and b/libs/minilibx-linux/mlx_xpm.o differ diff --git a/src/colors.c b/src/colors.c index 9efb773..4b1a62c 100644 --- a/src/colors.c +++ b/src/colors.c @@ -6,7 +6,7 @@ /* By: mabbas +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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])); +// } \ No newline at end of file diff --git a/src/colors.o b/src/colors.o new file mode 100644 index 0000000..f1db63b Binary files /dev/null and b/src/colors.o differ diff --git a/src/equations.o b/src/equations.o new file mode 100644 index 0000000..baf36eb Binary files /dev/null and b/src/equations.o differ diff --git a/src/initialization.o b/src/initialization.o new file mode 100644 index 0000000..f558714 Binary files /dev/null and b/src/initialization.o differ diff --git a/src/key_oper.o b/src/key_oper.o new file mode 100644 index 0000000..8763c6c Binary files /dev/null and b/src/key_oper.o differ diff --git a/src/main.c b/src/main.c index 842e0c3..f51922c 100644 --- a/src/main.c +++ b/src/main.c @@ -6,7 +6,7 @@ /* By: mabbas +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 new file mode 100644 index 0000000..8eb8a19 Binary files /dev/null and b/src/main.o differ diff --git a/src/mouse_oper.c b/src/mouse_oper.c index 8c733cf..74ca926 100644 --- a/src/mouse_oper.c +++ b/src/mouse_oper.c @@ -6,7 +6,7 @@ /* By: mabbas +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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,13 +18,18 @@ * 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) @@ -32,7 +37,6 @@ 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) @@ -40,15 +44,15 @@ int ctrl_mouse(int key, int x, int y, t_mlx *mlx) 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 new file mode 100644 index 0000000..1f6f71d Binary files /dev/null and b/src/mouse_oper.o differ