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

plr orientation at begining

Browse Source
This commit is contained in:
hugogogo
2022-05-04 00:55:47 +02:00
parent eb3b5c37a8
commit 3c76a8646a
13 changed files with 176 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
srcs/draw/draw.c
View File

@@ -1,87 +1,64 @@
#include "cube3d.h"
// tmp draw map
static void draw_square(t_game *game, t_coord pos, int border, int fill, int size, int rotation)
{
int i;
int j;
t_coord new;
i = 0;
while (i < size)
{
j = 0;
while (j < size)
{
new.x = pos.x + j;
new.y = pos.y + i;
if (rotation)
rotate(&(game->plr), &(new));
if (!i || i == size - 1)
draw_pixel(&game->map_img, new.x, new.y, border);
else if (!j || j == size - 1)
draw_pixel(&game->map_img, new.x, new.y, border);
else
draw_pixel(&game->map_img, new.x, new.y, fill);
j++;
}
i++;
}
}
static void draw_map(t_game *game)
{
t_coord incr;
t_coord pos;
int cell;
cell = game->map.cell;
incr.x = 0;
pos.x = 0;
pos.y = 0;
while ((game->map.content)[incr.x])
{
incr.y = 0;
while ((game->map.content)[incr.x][incr.y])
{
if ((game->map.content)[incr.x][incr.y] == '1' )
draw_square(game, pos, 0x00999999, 0x00000000, cell, 0);
else
draw_square(game, pos, 0x00555555, 0x00333333, cell, 0);
(incr.y)++;
pos.x += cell;
}
(incr.x)++;
pos.x = 0;
pos.y += cell;
}
pos.x = game->plr.pos.x - cell / 2;
pos.y = game->plr.pos.y - cell / 2;
draw_square(game, pos, 0x00999900, 0x00330033, cell, 1);
}
/*
static void draw_screen(t_game *game, t_rcast *rcast)
{
t_vec screen;
// draw screen size
screen.start.x = rcast->screen_size.start.x + game->plr.pos.x;
screen.start.y = rcast->screen_size.start.y + game->plr.pos.y;
rotate(&(game->plr), &(screen.start));
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->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->map_img, &screen, 0x00FFFFFF);
}
*/
// static void draw_square(t_game *game, t_coord pos, int border, int fill, int size, int rotation)
// {
// int i;
// int j;
// t_coord new;
//
// i = 0;
// while (i < size)
// {
// j = 0;
// while (j < size)
// {
// new.x = pos.x + j;
// new.y = pos.y + i;
// if (rotation)
// rotate(&(game->plr), &(new));
// if (!i || i == size - 1)
// draw_pixel(&game->map_img, new.x, new.y, border);
// else if (!j || j == size - 1)
// draw_pixel(&game->map_img, new.x, new.y, border);
// else
// draw_pixel(&game->map_img, new.x, new.y, fill);
// j++;
// }
// i++;
// }
// }
//
// static void draw_map(t_game *game)
// {
// t_coord incr;
// t_coord pos;
// int cell;
//
// cell = game->map.cell;
// incr.x = 0;
// pos.x = 0;
// pos.y = 0;
// while ((game->map.content)[incr.x])
// {
// incr.y = 0;
// while ((game->map.content)[incr.x][incr.y])
// {
// if ((game->map.content)[incr.x][incr.y] == '1' )
// draw_square(game, pos, 0x00999999, 0x00000000, cell, 0);
// else
// draw_square(game, pos, 0x00555555, 0x00333333, cell, 0);
// (incr.y)++;
// pos.x += cell;
// }
// (incr.x)++;
// pos.x = 0;
// pos.y += cell;
// }
// pos.x = game->plr.pos.x - cell / 2;
// pos.y = game->plr.pos.y - cell / 2;
// draw_square(game, pos, 0x00999900, 0x00330033, cell, 1);
// }
// tmp end
static int pxl_out_limits(t_img *img, int x, int y)
@@ -129,14 +106,14 @@ void draw_line(t_img *img, t_vec *vec, int color)
void draw(t_game *game)
{
// tmp draw map
draw_map(game);
// draw_map(game);
// tmp end
raycast(game, &(game->rcast));
// tmp draw map
// draw_screen(game, &(game->rcast));
mlx_put_image_to_window(game->mlx_ptr, game->map_win.ptr, game->map_img.ptr, 0, SCREEN_HEIGHT);
// draw_screen(game, &(game->rcast));
// 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);

13
srcs/draw/draw_column.c
View File

@@ -42,13 +42,12 @@ static void draw_txt_column(t_game *game, t_wall *wall, t_img *txt_img)
img_x = (wall->posx * txt_img->width) / game->rcast.cell;
// tmp draw map
if (game->ray_activ)
{
printf("img_x:%i ", img_x);
draw_line(&game->img, &wall->vec, 0x00FF00FF);
return ;
}
// if (game->ray_activ)
// {
// printf("img_x:%i ", img_x);
// draw_line(&game->img, &wall->vec, 0x00FF00FF);
// return ;
// }
// tmp end
j = wall->limit;

92
srcs/draw/raycast.c
View File

@@ -1,33 +1,33 @@
#include "cube3d.h"
// tmp draw map
static void calcul_ray_end(t_rcast *rcast, t_vec *ray)
{
if (rcast->is_x)
{
ray->end.x = rcast->cell_x * rcast->cell;
if (rcast->ray_sign_x == 1)
ray->end.x += rcast->cell;
if (rcast->slope_x)
{
rcast->ratio = (double)(ray->end.x - ray->start.x);
rcast->ratio /= (double)rcast->slope_x;
ray->end.y = ray->start.y + (double)rcast->slope_y * rcast->ratio;
}
}
else
{
ray->end.y = rcast->cell_y * rcast->cell;
if (rcast->ray_sign_y == 1)
ray->end.y += rcast->cell;
if (rcast->slope_y)
{
rcast->ratio = (double)(ray->end.y - ray->start.y);
rcast->ratio /= (double)rcast->slope_y;
ray->end.x = ray->start.x + (double)rcast->slope_x * rcast->ratio;
}
}
}
// static void calcul_ray_end(t_rcast *rcast, t_vec *ray)
// {
// if (rcast->is_x)
// {
// ray->end.x = rcast->cell_x * rcast->cell;
// if (rcast->ray_sign_x == 1)
// ray->end.x += rcast->cell;
// if (rcast->slope_x)
// {
// rcast->ratio = (double)(ray->end.x - ray->start.x);
// rcast->ratio /= (double)rcast->slope_x;
// ray->end.y = ray->start.y + (double)rcast->slope_y * rcast->ratio;
// }
// }
// else
// {
// ray->end.y = rcast->cell_y * rcast->cell;
// if (rcast->ray_sign_y == 1)
// ray->end.y += rcast->cell;
// if (rcast->slope_y)
// {
// rcast->ratio = (double)(ray->end.y - ray->start.y);
// rcast->ratio /= (double)rcast->slope_y;
// ray->end.x = ray->start.x + (double)rcast->slope_x * rcast->ratio;
// }
// }
// }
// tmp end
static void calcul_img_column(t_game *game, t_rcast *rcast, t_wall *wall)
@@ -43,8 +43,8 @@ static void calcul_img_column(t_game *game, t_rcast *rcast, t_wall *wall)
tmp += game->plr.pos.y;
// tmp draw map
if (game->ray_activ)
printf("tmp:%i ", tmp);
// if (game->ray_activ)
// printf("tmp:%i ", tmp);
// tmp end
wall->posx = tmp % rcast->cell;
@@ -58,16 +58,16 @@ static void calcul_img_column(t_game *game, t_rcast *rcast, t_wall *wall)
tmp += game->plr.pos.x;
// tmp draw map
if (game->ray_activ)
printf("tmp:%i ", tmp);
// if (game->ray_activ)
// printf("tmp:%i ", tmp);
// tmp end
wall->posx = tmp % rcast->cell;
}
// tmp draw map
if (game->ray_activ)
printf("wall->posx:%i ", wall->posx);
// if (game->ray_activ)
// printf("wall->posx:%i ", wall->posx);
// tmp end
}
@@ -119,23 +119,23 @@ void raycast(t_game *game, t_rcast *rcast)
{
// tmp draw map
// rays
game->ray_activ = 0;
if (rcast->ray_nb == game->ray_highlight)
{
game->ray_activ = 1;
game->ray = ray;
}
// // rays
// game->ray_activ = 0;
// if (rcast->ray_nb == game->ray_highlight)
// {
// game->ray_activ = 1;
// game->ray = ray;
// }
// tmp end
ray_intersect_wall(game, rcast, &ray);
// tmp draw map
calcul_ray_end(rcast, &ray);
if (game->ray_activ)
draw_line(&game->map_img, &ray, 0x00FF00FF);
else if (rcast->ray_nb % 10 == 0)
draw_line(&game->map_img, &ray, 0x00FFFFFF);
// calcul_ray_end(rcast, &ray);
// if (game->ray_activ)
// draw_line(&game->map_img, &ray, 0x00FF00FF);
// else if (rcast->ray_nb % 10 == 0)
// draw_line(&game->map_img, &ray, 0x00FFFFFF);
// tmp end
calcul_wall(rcast);
@@ -145,7 +145,7 @@ void raycast(t_game *game, t_rcast *rcast)
}
// tmp draw map
printf("\n\n");
// printf("\n\n");
// tmp end
}