diff --git a/builds/draw.o b/builds/draw.o new file mode 100644 index 0000000..11ce548 Binary files /dev/null and b/builds/draw.o differ diff --git a/builds/fdf.o b/builds/fdf.o new file mode 100644 index 0000000..95e1cbf Binary files /dev/null and b/builds/fdf.o differ diff --git a/builds/keypress.o b/builds/keypress.o new file mode 100644 index 0000000..e979b5f Binary files /dev/null and b/builds/keypress.o differ diff --git a/builds/modifs.o b/builds/modifs.o new file mode 100644 index 0000000..c717560 Binary files /dev/null and b/builds/modifs.o differ diff --git a/builds/parse.o b/builds/parse.o new file mode 100644 index 0000000..bbc0143 Binary files /dev/null and b/builds/parse.o differ diff --git a/fdf b/fdf new file mode 100755 index 0000000..19e8949 Binary files /dev/null and b/fdf differ diff --git a/includes/fdf.h b/includes/fdf.h index a310172..d30690e 100644 --- a/includes/fdf.h +++ b/includes/fdf.h @@ -32,7 +32,7 @@ typedef struct s_fdf double rad_y; int mov_x; int mov_y; - int zoom; + double zoom; int img_bpp; int img_sizel; int img_endian; diff --git a/srcs/fdf.c b/srcs/fdf.c index c44283d..5e47278 100644 --- a/srcs/fdf.c +++ b/srcs/fdf.c @@ -43,14 +43,15 @@ void init_offset(t_fdf *fdf) { int diagonal; int x; + int y; x = (fdf->map_width) * (fdf->map_width); - x += (fdf->map_height) * (fdf->map_height); + y = (fdf->map_height) * (fdf->map_height); fdf->offset = 1; diagonal = 1; while (diagonal < fdf->win_size_x) { - diagonal = x * (fdf->offset * fdf->offset); + diagonal = (x + y) * (fdf->offset * fdf->offset); diagonal = ft_sqrt(diagonal); fdf->offset++; } diff --git a/srcs/keypress.c b/srcs/keypress.c index 311a04b..b0b0801 100644 --- a/srcs/keypress.c +++ b/srcs/keypress.c @@ -10,9 +10,11 @@ */ void keypress_more(int keycode, t_fdf *fdf) { - if (keycode == ESCAPE) - shut_down(fdf); - if (keycode == U) + if (keycode == A) + fdf->zoom += 1; + else if (keycode == W) + fdf->zoom -= 1; + else if (keycode == U) { fdf->rot_x = 0; fdf->rot_y = 0; @@ -28,10 +30,8 @@ void keypress_more(int keycode, t_fdf *fdf) else if (keycode == O) fdf->altitude++; else if (keycode == P) - { if (fdf->altitude > 1) fdf->altitude--; - } } /* @@ -44,7 +44,9 @@ void keypress_more(int keycode, t_fdf *fdf) */ int keypress(int keycode, t_fdf *fdf) { - if (keycode == LEFT) + if (keycode == ESCAPE) + shut_down(fdf); + else if (keycode == LEFT) fdf->rot_x += 1; else if (keycode == RIGHT) fdf->rot_x -= 1; @@ -60,10 +62,6 @@ int keypress(int keycode, t_fdf *fdf) fdf->mov_y -= 6; else if (keycode == S) fdf->mov_y += 6; - else if (keycode == A) - fdf->zoom += 6; - else if (keycode == W) - fdf->zoom -= 6; else keypress_more(keycode, fdf); draw_image(fdf);