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

game view, but wrong :p

Browse Source
This commit is contained in:
hugogogo
2022-04-24 21:28:50 +02:00
parent c886118bd6
commit c52f04d9c8
7 changed files with 76 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
headers/cube3d_proto.h
View File

@@ -62,8 +62,8 @@ int is_wall(t_game *game, int cell_x, int cell_y);
// SRC/DRAW // SRC/DRAW
// ------------------------------- // -------------------------------
// draw.c // draw.c
void draw_pixel(t_game *game, int x, int y, int color); void draw_pixel(t_img *img, int x, int y, int color);
void draw_line(t_game *game, t_vec vec, int color); void draw_line(t_img *img, t_vec *vec, int color);
void draw(t_game *game); void draw(t_game *game);
// raycast.c // raycast.c
void raycast(t_game *game, t_rcast *rcast); void raycast(t_game *game, t_rcast *rcast);

10
headers/cube3d_struct.h
View File

@@ -35,7 +35,9 @@ typedef struct s_rcast
t_vec screen_dist; t_vec screen_dist;
t_vec screen_size; t_vec screen_size;
t_vec ray; t_vec ray;
int screen_def; t_vec wall;
int screen_width;
int screen_height;
int cell; int cell;
int cell_x; int cell_x;
int cell_y; int cell_y;
@@ -53,7 +55,6 @@ typedef struct s_rcast
int ray_step_y; int ray_step_y;
int is_x; int is_x;
int ray_nb; int ray_nb;
int wall_height;
double ratio; double ratio;
} t_rcast; } t_rcast;
@@ -73,8 +74,9 @@ typedef struct s_img
void *ptr; void *ptr;
char *data; char *data;
int bpp; int bpp;
int sizel; int szl;
int endian; int ndn;
int height;
} t_img; } t_img;
/* /*

34
srcs/draw/draw.c
View File

@@ -1,40 +1,40 @@
#include "cube3d.h" #include "cube3d.h"
static int pxl_out_limits(t_game *game, int x, int y) static int pxl_out_limits(t_img *img, int x, int y)
{ {
int xmax; int xmax;
int ymax; int ymax;
xmax = game->map_img.sizel / (game->map_img.bpp / 8); xmax = img->szl / (img->bpp / 8);
ymax = game->map_win.size_y; ymax = img->height;
if (x < 0 || y < 0 || x > xmax || y > ymax) if (x < 0 || y < 0 || x > xmax || y > ymax)
return (1); return (1);
return (0); return (0);
} }
void draw_pixel(t_game *game, int x, int y, int color) void draw_pixel(t_img *img, int x, int y, int color)
{ {
unsigned int position; unsigned int position;
if (pxl_out_limits(game, x, y)) if (pxl_out_limits(img, x, y))
return ; return ;
position = y * game->map_img.sizel + x * (game->map_img.bpp / 8); position = y * img->szl + x * (img->bpp / 8);
*(unsigned int*)(game->map_img.data + position) = color; *(unsigned int*)(img->data + position) = color;
} }
void draw_line(t_game *game, t_vec vec, int color) void draw_line(t_img *img, t_vec *vec, int color)
{ {
t_coord dist; t_coord dist;
int i; int i;
int j; int j;
dist.x = vec.end.x - vec.start.x; dist.x = (*vec).end.x - (*vec).start.x;
dist.y = vec.end.y - vec.start.y; dist.y = (*vec).end.y - (*vec).start.y;
i = 0; i = 0;
j = 0; j = 0;
while (ft_abs(i) <= ft_abs(dist.x) && ft_abs(j) <= ft_abs(dist.y)) while (ft_abs(i) <= ft_abs(dist.x) && ft_abs(j) <= ft_abs(dist.y))
{ {
draw_pixel(game, vec.start.x + i, vec.start.y + j, color); draw_pixel(img, (*vec).start.x + i, (*vec).start.y + j, color);
if (!ft_abs(dist.x) || ft_abs(j) < ft_abs(i * dist.y / dist.x)) if (!ft_abs(dist.x) || ft_abs(j) < ft_abs(i * dist.y / dist.x))
j += ft_sign(dist.y); j += ft_sign(dist.y);
else else
@@ -60,11 +60,11 @@ void draw_line(t_game *game, t_vec vec, int color)
if (rotation) if (rotation)
rotate(&(game->plr), &(new)); rotate(&(game->plr), &(new));
if (!i || i == size - 1) if (!i || i == size - 1)
draw_pixel(game, new.x, new.y, border); draw_pixel(&game->map_img, new.x, new.y, border);
else if (!j || j == size - 1) else if (!j || j == size - 1)
draw_pixel(game, new.x, new.y, border); draw_pixel(&game->map_img, new.x, new.y, border);
else else
draw_pixel(game, new.x, new.y, fill); draw_pixel(&game->map_img, new.x, new.y, fill);
j++; j++;
} }
i++; i++;
@@ -113,14 +113,14 @@ void draw_line(t_game *game, t_vec vec, int color)
screen.end.x = rcast->screen_size.end.x + game->plr.pos.x; screen.end.x = rcast->screen_size.end.x + game->plr.pos.x;
screen.end.y = rcast->screen_size.end.y + game->plr.pos.y; screen.end.y = rcast->screen_size.end.y + game->plr.pos.y;
rotate(&(game->plr), &(screen.end)); rotate(&(game->plr), &(screen.end));
draw_line(game, screen, 0x00FFFFFF); draw_line(&game->map_img, &screen, 0x00FFFFFF);
// draw screen dist // draw screen dist
screen.start.x = rcast->screen_dist.start.x + game->plr.pos.x; screen.start.x = rcast->screen_dist.start.x + game->plr.pos.x;
screen.start.y = rcast->screen_dist.start.y + game->plr.pos.y; screen.start.y = rcast->screen_dist.start.y + game->plr.pos.y;
screen.end.x = rcast->screen_dist.end.x + game->plr.pos.x; screen.end.x = rcast->screen_dist.end.x + game->plr.pos.x;
screen.end.y = rcast->screen_dist.end.y + game->plr.pos.y; screen.end.y = rcast->screen_dist.end.y + game->plr.pos.y;
rotate(&(game->plr), &(screen.end)); rotate(&(game->plr), &(screen.end));
draw_line(game, screen, 0x00FFFFFF); draw_line(&game->map_img, &screen, 0x00FFFFFF);
} }
// tmp end // tmp end
@@ -137,5 +137,5 @@ void draw(t_game *game)
mlx_put_image_to_window(game->mlx_ptr, game->map_win.ptr, game->map_img.ptr, 0, SCREEN_HEIGHT); mlx_put_image_to_window(game->mlx_ptr, game->map_win.ptr, game->map_img.ptr, 0, SCREEN_HEIGHT);
// tmp end // tmp end
// mlx_put_image_to_window(game->mlx_ptr, game->win.ptr, game->img.ptr, 0, 0); mlx_put_image_to_window(game->mlx_ptr, game->win.ptr, game->img.ptr, 0, 0);
} }

1
srcs/draw/ray_intersect.c
View File

@@ -3,7 +3,6 @@
static void init_raycast(t_rcast *rcast, t_vec *ray) static void init_raycast(t_rcast *rcast, t_vec *ray)
{ {
rcast->is_x = 0; rcast->is_x = 0;
rcast->wall_height = 0;
// ray sign // ray sign
rcast->ray_sign_x = 1; rcast->ray_sign_x = 1;
if (ray->start.x < ray->end.x) if (ray->start.x < ray->end.x)

48
srcs/draw/raycast.c
View File

@@ -30,11 +30,44 @@
} }
// tmp end // tmp end
void draw_column(t_game *game, t_rcast *rcast, t_vec *ray) static void calcul_wall(t_rcast *rcast)
{ {
(void)game; int height;
(void)rcast;
(void)ray; rcast->wall.start.x = rcast->ray_nb;
rcast->wall.end.x = rcast->ray_nb;
if (rcast->is_x == 1 && rcast->slope_y != 0)
height = (rcast->next_x - rcast->ray_step_x) / ft_abs(rcast->slope_y);
if (rcast->is_x == 0 && rcast->slope_x != 0)
height = (rcast->next_y - rcast->ray_step_y) / ft_abs(rcast->slope_x);
if (height > rcast->screen_height)
height = rcast->screen_height;
rcast->wall.start.y = rcast->screen_height / 2 + height / 2;
rcast->wall.end.y = rcast->screen_height / 2 - height / 2;
}
void draw_column(t_game *game, t_rcast *rcast)
{
t_vec floor;
t_vec ceilling;
if (rcast->wall.start.y > 0)
{
floor.start.x = rcast->ray_nb;
floor.end.x = rcast->ray_nb;
floor.start.y = rcast->screen_height;
floor.end.y = rcast->wall.start.y;
draw_line(&game->img, &floor, 0x00FF0000);
}
if (rcast->wall.start.y < rcast->screen_height)
{
ceilling.start.x = rcast->ray_nb;
ceilling.end.x = rcast->ray_nb;
ceilling.start.y = rcast->wall.end.y;
ceilling.end.y = 0;
draw_line(&game->img, &ceilling, 0x00FF0000);
}
draw_line(&game->img, &rcast->wall, 0x00FF00FF);
} }
void raycast(t_game *game, t_rcast *rcast) void raycast(t_game *game, t_rcast *rcast)
@@ -42,16 +75,17 @@ void raycast(t_game *game, t_rcast *rcast)
t_vec ray; t_vec ray;
rcast->ray_nb = 0; rcast->ray_nb = 0;
while (rcast->ray_nb <= rcast->screen_def) while (rcast->ray_nb <= rcast->screen_width)
{ {
ray_intersect(game, rcast, &ray); ray_intersect(game, rcast, &ray);
// tmp, to draw the map // tmp, to draw the map
calcul_ray_end(rcast, &ray); calcul_ray_end(rcast, &ray);
draw_line(game, ray, 0x00FF00FF); draw_line(&game->map_img, &ray, 0x00FF00FF);
// tmp end // tmp end
draw_column(game, rcast, &ray); calcul_wall(rcast);
draw_column(game, rcast);
(rcast->ray_nb)++; (rcast->ray_nb)++;
} }
} }

22
srcs/init/init_struct.c
View File

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

2
srcs/player/player_limits.c
View File

@@ -18,7 +18,7 @@ int plr_out_limits(t_game *game, int x, int y)
int cell_x; int cell_x;
int cell_y; int cell_y;
xmax = game->map_img.sizel / (game->map_img.bpp / 8); xmax = game->map_img.szl / (game->map_img.bpp / 8);
ymax = game->map_win.size_y; ymax = game->map_win.size_y;
cell_x = x / game->map.cell; cell_x = x / game->map.cell;
cell_y = y / game->map.cell; cell_y = y / game->map.cell;