added finer figure control

Author: Anaelle LECLABART

includes/fractol.h

@@ -6,7 +6,7 @@
 /*   By: anleclab <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/02/15 15:25:34 by anleclab          #+#    #+#             */
-/*   Updated: 2019/02/18 17:13:01 by anleclab         ###   ########.fr       */
+/*   Updated: 2019/02/18 17:24:23 by anleclab         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

includes/keys.h

@@ -6,7 +6,7 @@
 /*   By: anleclab <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/01/27 17:23:18 by anleclab          #+#    #+#             */
-/*   Updated: 2019/02/18 13:59:43 by anleclab         ###   ########.fr       */
+/*   Updated: 2019/02/18 17:35:06 by anleclab         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,6 +20,13 @@
 
 # define C 8
 
+# define SPACE 49
+
+# define DOWN_ARROW 125
+# define UP_ARROW 126
+# define RIGHT_ARROW 124
+# define LEFT_ARROW 123
+
 /*# define PAD_1 83
 # define PAD_2 84
 # define PAD_3 85
@@ -38,9 +45,7 @@
 # define Z 6
 # define X 7
 
-# define DOWN_ARROW 125
-# define UP_ARROW 126
-# define SPACE 49
+
 
 # define PLUS 24
 # define PAD_PLUS 69

srcs/color.c

@@ -6,7 +6,7 @@
 /*   By: anleclab <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/02/18 12:13:25 by anleclab          #+#    #+#             */
-/*   Updated: 2019/02/18 17:20:23 by anleclab         ###   ########.fr       */
+/*   Updated: 2019/02/18 17:24:55 by anleclab         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

srcs/events.c

@@ -6,14 +6,16 @@
 /*   By: anleclab <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/02/15 16:31:46 by anleclab          #+#    #+#             */
-/*   Updated: 2019/02/18 15:44:57 by anleclab         ###   ########.fr       */
+/*   Updated: 2019/02/18 17:39:22 by anleclab         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "fractol.h"
 
 int		mouse_event(int button, int x, int y, t_fract *fract)
 {
+	if (button != MOUSE_SCROLL_UP && button != MOUSE_SCROLL_DOWN)
+		return (0);
 	(void)x;
 	(void)y;
 	if (button == MOUSE_SCROLL_UP)
@@ -47,7 +49,25 @@ int		key_release(int key, t_fract *fract)
 {
 	if (key == ESC)
 		end(fract, EXIT_OK);
-	if (key == C)
+	else if (key == C)
 		fract->mode = (fract->mode + 1) % 2;
+	else if (key == SPACE || (fract->name == JULIA && (key == DOWN_ARROW
+					|| key == UP_ARROW || key == RIGHT_ARROW
+					|| key == LEFT_ARROW)))
+	{
+		if (key == SPACE)
+			fract->color = (fract->color + 1) % NB_COLOR_SCHEMES;
+		if (key == DOWN_ARROW)
+			fract->julia.y *= 0.9;
+		if (key == UP_ARROW)
+			fract->julia.y *= 1.1;
+		if (key == LEFT_ARROW)
+			fract->julia.x *= 0.9;
+		if (key == RIGHT_ARROW)
+			fract->julia.x *= 1.1;
+		draw_fractal(fract);
+		mlx_put_image_to_window(fract->mlx_ptr, fract->win_ptr, fract->img_ptr,
+				0, 0);
+	}
 	return (0);
 }