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

34
srcs/draw/draw.c
View File

@@ -1,40 +1,40 @@
#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 ymax;
xmax = game->map_img.sizel / (game->map_img.bpp / 8);
ymax = game->map_win.size_y;
xmax = img->szl / (img->bpp / 8);
ymax = img->height;
if (x < 0 || y < 0 || x > xmax || y > ymax)
return (1);
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;
if (pxl_out_limits(game, x, y))
if (pxl_out_limits(img, x, y))
return ;
position = y * game->map_img.sizel + x * (game->map_img.bpp / 8);
*(unsigned int*)(game->map_img.data + position) = color;
position = y * img->szl + x * (img->bpp / 8);
*(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;
int i;
int j;
dist.x = vec.end.x - vec.start.x;
dist.y = vec.end.y - vec.start.y;
dist.x = (*vec).end.x - (*vec).start.x;
dist.y = (*vec).end.y - (*vec).start.y;
i = 0;
j = 0;
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))
j += ft_sign(dist.y);
else
@@ -60,11 +60,11 @@ void draw_line(t_game *game, t_vec vec, int color)
if (rotation)
rotate(&(game->plr), &(new));
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)
draw_pixel(game, new.x, new.y, border);
draw_pixel(&game->map_img, new.x, new.y, border);
else
draw_pixel(game, new.x, new.y, fill);
draw_pixel(&game->map_img, new.x, new.y, fill);
j++;
}
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.y = rcast->screen_size.end.y + game->plr.pos.y;
rotate(&(game->plr), &(screen.end));
draw_line(game, screen, 0x00FFFFFF);
draw_line(&game->map_img, &screen, 0x00FFFFFF);
// draw screen dist
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.end.x = rcast->screen_dist.end.x + game->plr.pos.x;
screen.end.y = rcast->screen_dist.end.y + game->plr.pos.y;
rotate(&(game->plr), &(screen.end));
draw_line(game, screen, 0x00FFFFFF);
draw_line(&game->map_img, &screen, 0x00FFFFFF);
}
// 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);
// 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);
}