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

better struct and files organization, and still only half raycast on map but no view created

Browse Source
This commit is contained in:
hugogogo
2022-04-22 17:38:29 +02:00
parent 00c9dfd6b8
commit fac1f78230
17 changed files with 602 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
srcs/init/init_struct.c
View File

@@ -1,36 +1,17 @@
#include "cube3d.h"
t_game *init_game(void)
static void init_img(t_img *img, t_game *game)
{
t_game *game;
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));
}
game = mb_alloc(sizeof(t_game));
game->cell = 20;
// player first position
game->plr_exact_x = 2 * game->cell;
game->plr_exact_y = 2 * game->cell;
game->plr_x = game->plr_exact_x;
game->plr_y = game->plr_exact_y;
// rotation
game->rot = 0;
game->cosi = 0;
game->cosj = 0;
game->sini = 0;
game->sinj = 0;
// map size
game->map_size_x = 24;
game->map_size_y = 24;
// size window
game->win_size_x = game->map_size_x * game->cell;
game->win_size_y = game->map_size_y * game->cell;
// init connexion to server
game->mlx_ptr = mlx_init();
mb_add(game->mlx_ptr);
// create the window
game->win_ptr = mlx_new_window(game->mlx_ptr, game->win_size_x,
game->win_size_y, "test");
// k(ey)_hook is the array containing the values of key press events
ft_bzero(&game->k_hook, sizeof(game->k_hook));
static void init_map(t_map *map)
{
map->size_x = 24;
map->size_y = 24;
// map
int tmp[24][24] = {
{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
@@ -59,48 +40,85 @@ t_game *init_game(void)
{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
};
int i = 0;
game->map = mb_alloc(sizeof(char*) * (game->map_size_y + 1));
(game->map)[game->map_size_y] = NULL;
map->content = mb_alloc(sizeof(char*) * (map->size_y + 1));
(map->content)[map->size_y] = NULL;
while (i < 24)
{
(game->map)[i] = mb_alloc(sizeof(char) * (game->map_size_x + 1));
(game->map)[i][game->map_size_x] = '\0';
(map->content)[i] = mb_alloc(sizeof(char) * (map->size_x + 1));
(map->content)[i][map->size_x] = '\0';
i++;
}
int j;
i = 0;
while (i < game->map_size_y)
while (i < map->size_y)
{
j = 0;
while (j < game->map_size_x)
while (j < map->size_x)
{
(game->map)[i][j] = tmp[i][j] + '0';
(map->content)[i][j] = tmp[i][j] + '0';
j++;
}
i++;
}
}
static void init_raycast(t_rcast *rcast)
{
// draw screen dist
game->screen_dist.start_x = 0;
game->screen_dist.start_y = 0;
game->screen_dist.end_x = 0;
game->screen_dist.end_y = -SCREEN_DIST;
rcast->screen_dist.start.x = 0;
rcast->screen_dist.start.y = 0;
rcast->screen_dist.end.x = 0;
rcast->screen_dist.end.y = -SCREEN_DIST;
// draw screen size
game->screen_size.start_x = -SCREEN_SIZE / 2;
game->screen_size.start_y = -SCREEN_DIST;
game->screen_size.end_x = SCREEN_SIZE / 2;
game->screen_size.end_y = -SCREEN_DIST;
rcast->screen_size.start.x = -SCREEN_SIZE / 2;
rcast->screen_size.start.y = -SCREEN_DIST;
rcast->screen_size.end.x = SCREEN_SIZE / 2;
rcast->screen_size.end.y = -SCREEN_DIST;
// draw ray
game->ray.start_x = 0;
game->ray.start_y = 0;
game->ray.end_x = -SCREEN_SIZE / 2;
game->ray.end_y = -SCREEN_DIST;
// tmp
game->ray_highlight = -1;
game->ray_activ = 0;
rcast->ray.start.x = 0;
rcast->ray.start.y = 0;
rcast->ray.end.x = -SCREEN_SIZE / 2;
rcast->ray.end.y = -SCREEN_DIST;
}
static void init_plr(t_plr *plr)
{
// player first position
plr->exact.x = 2 * CELL;
plr->exact.y = 2 * CELL;
plr->pos.x = plr->exact.x;
plr->pos.y = plr->exact.y;
// rotation
plr->rot = 0;
plr->cosi = 0;
plr->cosj = 0;
plr->sini = 0;
plr->sinj = 0;
}
t_game *init_game(void)
{
t_game *game;
game = mb_alloc(sizeof(t_game));
// map
init_map(&(game->map));
// plr
init_plr(&(game->plr));
// size window map
game->map_win.size_x = game->map.size_x * CELL;
game->map_win.size_y = game->map.size_y * CELL;
// init connexion to server
game->mlx_ptr = mlx_init();
mb_add(game->mlx_ptr);
// create the window
game->map_win.ptr = mlx_new_window(game->mlx_ptr, game->map_win.size_x,
game->map_win.size_y, "test");
// k(ey)_hook is the array containing the values of key press events
ft_bzero(&game->k_hook, sizeof(game->k_hook));
// raycasting
init_raycast(&(game->rcast));
// create image and get its data address
game->img_ptr = mlx_new_image(game->mlx_ptr, game->win_size_x,
game->win_size_y);
game->img_data = mlx_get_data_addr(game->img_ptr, &(game->bpp),
&(game->sizel), &(game->endian));
init_img(&(game->map_img), game);
return (game);
}