changed functions draw line and pixel to receive an img ptr instead of the whole structure

This commit is contained in:
hugogogo
2022-04-24 19:41:44 +02:00
parent bb3a9db930
commit a11ea35ac1
6 changed files with 46 additions and 32 deletions

View File

@@ -1,11 +1,10 @@
#include "cube3d.h"
static void init_img(t_img *img, t_game *game)
static void init_img(t_img *img, void *mlx_ptr, t_win *win)
{
img->ptr = mlx_new_image(game->mlx_ptr, game->map_win.size_x,
game->map_win.size_y);
img->data = mlx_get_data_addr(img->ptr, &(img->bpp),
&(img->sizel), &(img->endian));
img->ptr = mlx_new_image(mlx_ptr, win->size_x, win->size_y);
img->data = mlx_get_data_addr(img->ptr, &img->bpp, &img->szl, &img->ndn);
img->height = win->size_y;
}
static void init_map(t_map *map)
@@ -70,6 +69,7 @@ static void init_raycast(t_rcast *rcast)
dist = (SCREEN_FOCAL / 2) * M_PI / 180;
dist = cos(dist) * ((SCREEN_WIDTH / 2) / sin(dist));
rcast->screen_def = SCREEN_WIDTH;
rcast->screen_center = SCREEN_HEIGHT / 2;
// screen dist
rcast->screen_dist.start.x = 0;
rcast->screen_dist.start.y = 0;
@@ -116,21 +116,17 @@ t_game *init_game(void)
mb_add(game->mlx_ptr);
// tmp draw map
// size window map
game->map_win.size_x = game->map.size_x * CELL;
game->map_win.size_y = game->map.size_y * CELL + SCREEN_HEIGHT;
// create the window
game->map_win.ptr = mlx_new_window(game->mlx_ptr, game->map_win.size_x,
game->map_win.size_y, "map");
// create image and get its data address
init_img(&(game->map_img), game);
game->map_win.ptr = mlx_new_window(game->mlx_ptr, game->map_win.size_x, game->map_win.size_y, "map");
init_img(&(game->map_img), game->mlx_ptr, &(game->map_win));
// tmp end
game->win.size_x = SCREEN_WIDTH;
game->win.size_y = SCREEN_HEIGHT;
game->win.ptr = mlx_new_window(game->mlx_ptr, game->win.size_x,
game->win.size_y, "cub3d");
init_img(&(game->img), game);
init_img(&(game->img), game->mlx_ptr, &(game->win));
// k(ey)_hook is the array containing the values of key press events
ft_bzero(&game->k_hook, sizeof(game->k_hook));
// raycasting