a la norme et sans leaks, manque le parsing
This commit is contained in:
32
srcs/fdf.c
32
srcs/fdf.c
@@ -1,22 +1,25 @@
|
||||
#include "fdf.h"
|
||||
|
||||
int shut_down(t_fdf *fdf)
|
||||
int shut_down(t_fdf *fdf)
|
||||
{
|
||||
while (fdf->map_height--)
|
||||
free(fdf->map[fdf->map_height]);
|
||||
free(fdf->map);
|
||||
mlx_destroy_image(fdf->mlx_ptr, fdf->img_ptr);
|
||||
mlx_destroy_window(fdf->mlx_ptr, fdf->win_ptr);
|
||||
exit(0);
|
||||
mlx_destroy_display(fdf->mlx_ptr);
|
||||
free(fdf);
|
||||
exit(0);
|
||||
return (0);
|
||||
}
|
||||
|
||||
t_fdf *init_fdf(void)
|
||||
t_fdf *init_fdf(t_fdf *fdf)
|
||||
{
|
||||
t_fdf *fdf;
|
||||
|
||||
fdf = malloc(sizeof(t_fdf));
|
||||
fdf->offset = 50;
|
||||
fdf->margin = 50;
|
||||
fdf->altitude = 3;
|
||||
fdf->map = parse_map(fdf);
|
||||
fdf->map_size_x = (fdf->map_width - 1) * fdf->offset + 1;
|
||||
fdf->map_size_y = (fdf->map_height - 1) * fdf->offset + 1;
|
||||
fdf->win_size_x = fdf->map_size_x + 2 * fdf->margin;
|
||||
fdf->win_size_y = fdf->map_size_y + 2 * fdf->margin;
|
||||
fdf->img_size_x = fdf->win_size_x;
|
||||
@@ -28,23 +31,22 @@ t_fdf *init_fdf(void)
|
||||
fdf->zoom = 0;
|
||||
fdf->mlx_ptr = mlx_init();
|
||||
fdf->win_ptr = mlx_new_window(fdf->mlx_ptr, fdf->win_size_x,
|
||||
fdf->win_size_y, "test");
|
||||
fdf->win_size_y, "test");
|
||||
fdf->img_ptr = mlx_new_image(fdf->mlx_ptr, fdf->img_size_x,
|
||||
fdf->img_size_y);
|
||||
fdf->img_size_y);
|
||||
fdf->img_addr = mlx_get_data_addr(fdf->img_ptr, &(fdf->img_bpp),
|
||||
&(fdf->img_sizel), &(fdf->img_endian));
|
||||
&(fdf->img_sizel), &(fdf->img_endian));
|
||||
draw_image(fdf);
|
||||
return (fdf);
|
||||
}
|
||||
|
||||
int main(int ac, char **av)
|
||||
int main(void)
|
||||
{
|
||||
t_fdf *fdf;
|
||||
|
||||
(void)av;
|
||||
(void)ac;
|
||||
|
||||
fdf = init_fdf();
|
||||
fdf = malloc(sizeof(t_fdf));
|
||||
fdf->map = parse_map(fdf);
|
||||
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);
|
||||
mlx_loop(fdf->mlx_ptr);
|
||||
|
||||
Reference in New Issue
Block a user