42/42_INT_04_fdf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

infos affichees ajout zoom et deplacement

Browse Source
This commit is contained in:
hugogogo
2021-07-24 10:42:04 +02:00
parent 99c95c1cf1
commit 5474a870f0
10 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
srcs/draw.c
View File

@@ -18,7 +18,7 @@ void draw_image(t_fdf *fdf)
draw_grid(fdf, i, j);
}
mlx_put_image_to_window(fdf->mlx_ptr, fdf->win_ptr, fdf->img_ptr, 0, 0);
rotation_state(fdf);
position_state(fdf);
}
void draw_grid(t_fdf *fdf, int i, int j)

12
srcs/fdf.c
View File

@@ -24,11 +24,11 @@ t_fdf *init_fdf(t_fdf *fdf)
fdf->win_size_y = fdf->map_size_y + 2 * fdf->margin;
fdf->img_size_x = fdf->win_size_x;
fdf->img_size_y = fdf->win_size_y;
fdf->rot_x = 0;
fdf->rot_y = 0;
fdf->rot_x = -30;
fdf->rot_y = -45;
fdf->mov_x = 0;
fdf->mov_y = 0;
fdf->zoom = 0;
fdf->zoom = -5;
fdf->mlx_ptr = mlx_init();
fdf->win_ptr = mlx_new_window(fdf->mlx_ptr, fdf->win_size_x,
fdf->win_size_y, "test");
@@ -40,12 +40,14 @@ t_fdf *init_fdf(t_fdf *fdf)
return (fdf);
}
int main(void)
int main(int ac, char **av)
{
t_fdf *fdf;
if (ac != 1)
return (0);
fdf = malloc(sizeof(t_fdf));
fdf->map = parse_map(fdf);
fdf->map = parse_map(fdf, av);
fdf = init_fdf(fdf);
mlx_hook(fdf->win_ptr, 2, 1L << 0, keypress, fdf);
mlx_hook(fdf->win_ptr, 17, 1L << 17, shut_down, fdf);

30
srcs/modifs.c
View File

@@ -32,17 +32,17 @@ int keypress(int keycode, t_fdf *fdf)
/*
** int[0] = x, int[1] = y, int[2] = z
** quick explanation :
** zoom :
** zoom :
** x = i * (fdf->offset + fdf->zoom);
** center before 3d rotation :
** center before 3d rotation :
** x -= (fdf->map_size_x + fdf->zoom * fdf->map_width) / 2;
** z changes according to zoom :
** z changes according to zoom :
** z += (z * fdf->zoom) / fdf->offset;
** deplacement :
** deplacement :
** point[0] += fdf->margin + fdf->mov_x;
** center zoom after :
** center zoom :
** point[0] -= ((fdf->map_size_x / 2) / fdf->offset) * fdf->zoom;
** center after 3d rotation :
** center after 3d rotation :
** point[0] += (fdf->map_size_x + fdf->zoom * fdf->map_width) / 2;
*/
int *new_coordinates(t_fdf *fdf, int i, int j)
@@ -79,17 +79,25 @@ int print_keycode(int keycode)
return (0);
}
void rotation_state(t_fdf *fdf)
void position_state(t_fdf *fdf)
{
char *position;
int x;
int y;
x = fdf->img_size_x - 10;
y = fdf->img_size_y - 10;
position = ft_strjoinfree(ft_itoa(fdf->rot_x), ft_strdup(" | "));
position = ft_strjoinfree(ft_strdup("zoom: "), ft_itoa(fdf->zoom));
position = ft_strjoinfree(position, ft_strdup(" "));
position = ft_strjoinfree(position, ft_strdup("deplacement: "));
position = ft_strjoinfree(position, ft_itoa(fdf->mov_x));
position = ft_strjoinfree(position, ft_strdup(" "));
position = ft_strjoinfree(position, ft_itoa(fdf->mov_y));
position = ft_strjoinfree(position, ft_strdup(" "));
position = ft_strjoinfree(position, ft_strdup("rotation: "));
position = ft_strjoinfree(position, ft_itoa(fdf->rot_x));
position = ft_strjoinfree(position, ft_strdup(" "));
position = ft_strjoinfree(position, ft_itoa(fdf->rot_y));
x -= ft_strlen(position) * 6;
x = fdf->img_size_x - 10 - ft_strlen(position) * 6;
y = fdf->img_size_y - 10;
mlx_string_put(fdf->mlx_ptr, fdf->win_ptr, x, y, 0xffffff, position);
free(position);
}

3
srcs/parse.c
View File

@@ -1,11 +1,12 @@
#include "fdf.h"
int **parse_map(t_fdf *fdf)
int **parse_map(t_fdf *fdf, char **av)
{
int **map;
int i;
int j;
(void)av;
map = ft_calloc(10, sizeof(map));
i = -1;
while (++i < 10)