style: normed all the repo (except the debug function and the too_many_args
This commit is contained in:
Raphael
parent
57c7893501
commit
954c5f76d6
12 changed files with 244 additions and 207 deletions
|
|
@ -6,7 +6,7 @@
|
|||
/* By: bgoulard <bgoulard@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/11/12 06:02:54 by bgoulard #+# #+# */
|
||||
/* Updated: 2024/12/01 17:09:40 by bgoulard ### ########.fr */
|
||||
/* Updated: 2024/12/01 18:57:25 by rparodi ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
|
|
@ -20,34 +20,45 @@
|
|||
#include <math.h>
|
||||
#include <unistd.h>
|
||||
|
||||
void draw_(int side, double perpWallDist, t_ipoint step, int x, t_info *data)
|
||||
void set_step(t_ipoint *step, t_dpoint raydir);
|
||||
void set_side_dist(t_dpoint *side_dist, t_dpoint *tb, t_ipoint pos_i);
|
||||
|
||||
/// line 33: normalize draw_start and draw_end
|
||||
void draw_(int side, double perpWallDist, t_ipoint step, int x, t_info *data)
|
||||
{
|
||||
const int lineHeight = (int)(data->screen_size.y / perpWallDist) * cos(deg2rad(FOV/ 2));
|
||||
int drawStart;
|
||||
int drawEnd;
|
||||
const int line_height = (int)(data->screen_size.y / perpWallDist) \
|
||||
* cos(deg2rad(FOV / 2));
|
||||
int draw_start;
|
||||
int draw_end;
|
||||
int color;
|
||||
|
||||
drawStart = -lineHeight / 2 + data->screen_size.y / 2;
|
||||
drawEnd = lineHeight / 2 + data->screen_size.y / 2;
|
||||
// normalize drawStart and drawEnd
|
||||
drawStart = ft_clamp(drawStart, 0, data->screen_size.y - 1);
|
||||
drawEnd = ft_clamp(drawEnd, 0, data->screen_size.y - 1);
|
||||
draw_start = -line_height / 2 + data->screen_size.y / 2;
|
||||
draw_end = line_height / 2 + data->screen_size.y / 2;
|
||||
draw_start = ft_clamp(draw_start, 0, data->screen_size.y - 1);
|
||||
draw_end = ft_clamp(draw_end, 0, data->screen_size.y - 1);
|
||||
color = get_cl(side, step);
|
||||
while (drawStart < drawEnd)
|
||||
my_mlx_pixel_put(data, x, drawStart++, color);
|
||||
while (draw_start < draw_end)
|
||||
my_mlx_pixel_put(data, x, draw_start++, color);
|
||||
}
|
||||
|
||||
void search_hit(t_dpoint *sideDist, t_dpoint deltaDist, t_ipoint *pos_i, t_ipoint step, void *_data[2])
|
||||
void search_hit(t_dpoint *sideDist, t_dpoint deltaDist, t_ipoint *pos_i, \
|
||||
t_ipoint step, void *_data[2])
|
||||
{
|
||||
int *side = (int *)_data[1];
|
||||
t_info *data = (t_info *)_data[0];
|
||||
int *side;
|
||||
t_info *data;
|
||||
|
||||
while (true) {
|
||||
if (sideDist->x < sideDist->y) {
|
||||
side = (int *)_data[1];
|
||||
data = (t_info *)_data[0];
|
||||
while (true)
|
||||
{
|
||||
if (sideDist->x < sideDist->y)
|
||||
{
|
||||
sideDist->x += deltaDist.x;
|
||||
pos_i->x += step.x;
|
||||
*side = 0;
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
sideDist->y += deltaDist.y;
|
||||
pos_i->y += step.y;
|
||||
*side = 1;
|
||||
|
|
@ -58,74 +69,52 @@ void search_hit(t_dpoint *sideDist, t_dpoint deltaDist, t_ipoint *pos_i, t_ipoin
|
|||
}
|
||||
}
|
||||
|
||||
static void set_step(t_ipoint *step, t_dpoint raydir)
|
||||
void column_handler(t_ipoint pos_i, t_dpoint ray_dir, t_info *data, int x)
|
||||
{
|
||||
if (raydir.x < 0)
|
||||
step->x = -1;
|
||||
else
|
||||
step->x = 1;
|
||||
if (raydir.y < 0)
|
||||
step->y = -1;
|
||||
else
|
||||
step->y = 1;
|
||||
}
|
||||
|
||||
static void set_side_dist(t_dpoint *sideDist, t_dpoint *tb, t_ipoint pos_i)
|
||||
{
|
||||
t_dpoint rayDir = tb[0];
|
||||
t_dpoint pos = tb[1];
|
||||
t_dpoint deltaDist = tb[2];
|
||||
|
||||
if (rayDir.x < 0)
|
||||
sideDist->x = (pos.x - pos_i.x) * deltaDist.x;
|
||||
else
|
||||
sideDist->x = (pos_i.x + 1.0 - pos.x) * deltaDist.x;
|
||||
if (rayDir.y < 0)
|
||||
sideDist->y = (pos.y - pos_i.y) * deltaDist.y;
|
||||
else
|
||||
sideDist->y = (pos_i.y + 1.0 - pos.y) * deltaDist.y;
|
||||
}
|
||||
|
||||
void column_handler(t_ipoint pos_i, t_dpoint rayDir, t_info *data, int x)
|
||||
{
|
||||
t_dpoint sideDist;
|
||||
t_dpoint deltaDist;
|
||||
double perpWallDist;
|
||||
t_dpoint side_dist;
|
||||
t_dpoint delta_dist;
|
||||
double perp_wall_dist;
|
||||
t_ipoint step;
|
||||
int side;
|
||||
|
||||
deltaDist = (t_dpoint){fabs(1 / rayDir.x), fabs(1 / rayDir.y)};
|
||||
set_step(&step, rayDir);
|
||||
set_side_dist(&sideDist, (t_dpoint[]){rayDir, data->player.pos, deltaDist}, pos_i);
|
||||
search_hit(&sideDist, deltaDist, &pos_i, step, (void *[]){data, &side});
|
||||
delta_dist = (t_dpoint){fabs(1 / ray_dir.x), fabs(1 / ray_dir.y)};
|
||||
set_step(&step, ray_dir);
|
||||
set_side_dist(&side_dist, (t_dpoint[]){ray_dir, data->player.pos, \
|
||||
delta_dist}, pos_i);
|
||||
search_hit(&side_dist, delta_dist, &pos_i, step, (void *[]){data, &side});
|
||||
if (side == 0)
|
||||
perpWallDist = (pos_i.x - data->player.pos.x + (double)(1 - step.x) / 2)
|
||||
/ rayDir.x;
|
||||
perp_wall_dist = (pos_i.x - data->player.pos.x + \
|
||||
(double)(1 - step.x) / 2) / ray_dir.x;
|
||||
else
|
||||
perpWallDist = (pos_i.y - data->player.pos.y + (double)(1 - step.y) / 2)
|
||||
/ rayDir.y;
|
||||
draw_(side, perpWallDist, step, x, data);
|
||||
perp_wall_dist = (pos_i.y - data->player.pos.y + \
|
||||
(double)(1 - step.y) / 2) / ray_dir.y;
|
||||
draw_(side, perp_wall_dist, step, x, data);
|
||||
}
|
||||
|
||||
int render_frame(t_info *data)
|
||||
{
|
||||
double camera_x;
|
||||
double coef;
|
||||
double camera_x;
|
||||
double coef;
|
||||
int x;
|
||||
|
||||
x = 0;
|
||||
coef = 2 * tan(deg2rad(FOV) / 2) / (double)data->screen_size.x;
|
||||
ft_bzero(data->camera.img_addr, data->screen_size.x * data->screen_size.y * (data->camera.bpp / 8));
|
||||
for(int x = 0; x < data->screen_size.x; x++)
|
||||
ft_bzero(data->camera.img_addr, data->screen_size.x * data->screen_size.y \
|
||||
* (data->camera.bpp / 8));
|
||||
while (x < data->screen_size.x)
|
||||
{
|
||||
camera_x = x * coef - 1;
|
||||
column_handler(data->player.pos_i,
|
||||
(t_dpoint){
|
||||
data->player.dir.x + data->player.plane.x * camera_x,
|
||||
data->player.dir.y + data->player.plane.y * camera_x},
|
||||
column_handler(data->player.pos_i, (t_dpoint){\
|
||||
data->player.dir.x + data->player.plane.x * camera_x, \
|
||||
data->player.dir.y + data->player.plane.y * camera_x}, \
|
||||
data, x);
|
||||
x++;
|
||||
}
|
||||
mlx_put_image_to_window(data->mlx_ptr, data->win_ptr, data->camera.screen_buff, 0, 0);
|
||||
mlx_put_image_to_window(data->mlx_ptr, data->win_ptr, \
|
||||
data->camera.screen_buff, 0, 0);
|
||||
return (0);
|
||||
}
|
||||
|
||||
// Return 42 is irrelevant check mlx_loop to see that mlx doesn't care for the
|
||||
// return of the function...
|
||||
// (Why 'int (*)(void*)' when you dont use the int)
|
||||
|
|
@ -139,12 +128,11 @@ int render_frame(t_info *data)
|
|||
// struct.
|
||||
// As a pure artefact of using mlx this function will likely be mooved to
|
||||
// mlx_layer in the final repo.
|
||||
int c3_frame_update(void *inf_ptr)
|
||||
int c3_frame_update(void *inf_ptr)
|
||||
{
|
||||
t_info *info;
|
||||
t_info *info;
|
||||
|
||||
info = inf_ptr;
|
||||
mlx_clear_window(info->mlx_ptr, info->win_ptr);
|
||||
// ft_putendl_fd("update called\n", STDOUT_FILENO);
|
||||
return (EXIT_SUCCESS);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue