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

check limit a little earlier but nothing great

Browse Source
This commit is contained in:
asus
2024-01-13 15:43:42 +01:00
parent 98db1cc51a
commit cebfe75798
8 changed files with 57 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
builds/draw_bonus.o
View File

Binary file not shown.

BIN
builds/fdf.o
View File

Binary file not shown.

BIN
builds/keypress_bonus.o
View File

Binary file not shown.

BIN
builds/modifs.o
View File

Binary file not shown.

BIN
builds/parse.o
View File

Binary file not shown.

BIN
fdf
View File

Binary file not shown.

3
includes/fdf.h
View File

@@ -54,6 +54,9 @@ void draw_grid(t_fdf *fdf, int i, int j);
void draw_lines(t_fdf *fdf, int *start, int *end); void draw_lines(t_fdf *fdf, int *start, int *end);
void draw_color_pixel(t_fdf *fdf, int new_x, int new_y, int z); void draw_color_pixel(t_fdf *fdf, int new_x, int new_y, int z);
void draw_pixel(t_fdf *fdf, int x, int y, int color); void draw_pixel(t_fdf *fdf, int x, int y, int color);
int is_outise_screen(t_fdf *fdf, int x, int y);
int get_primary_color(char primar, int percent);
int color_percent(t_fdf *fdf, int *p_start, int *p_end, int p_numerator, int p_denominator);
// keypress.c // keypress.c
void keypress_more(int keycode, t_fdf *fdf); void keypress_more(int keycode, t_fdf *fdf);

97
srcs/draw_bonus.c
View File

@@ -32,16 +32,44 @@ void draw_grid(t_fdf *fdf, int i, int j)
if (i + 1 < fdf->map_width) if (i + 1 < fdf->map_width)
point_end = new_coordinates(fdf, i + 1, j); point_end = new_coordinates(fdf, i + 1, j);
draw_lines(fdf, point_start, point_end); draw_lines(fdf, point_start, point_end);
free(point_end);
point_end = NULL;
if (j + 1 < fdf->map_height) if (j + 1 < fdf->map_height)
{
free(point_end);
point_end = new_coordinates(fdf, i, j + 1); point_end = new_coordinates(fdf, i, j + 1);
}
draw_lines(fdf, point_start, point_end); draw_lines(fdf, point_start, point_end);
free(point_start); free(point_start);
free(point_end); free(point_end);
} }
void draw_lines(t_fdf *fdf, int *start, int *end)
{
int dx;
int dy;
int i;
int j;
int percent;
if (end)
{
dx = end[0] - start[0];
dy = end[1] - start[1];
i = 0;
j = 0;
while (ft_abs(i) <= ft_abs(dx) && ft_abs(j) <= ft_abs(dy))
{
if (!is_outise_screen(fdf, start[0] + i, start[1] + j))
{
percent = color_percent(fdf, start, end, ft_abs(i) + ft_abs(j), ft_abs(dx) + ft_abs(dy));
draw_color_pixel(fdf, start[0] + i, start[1] + j, percent);
}
if (!ft_abs(dx) || ft_abs(j) < ft_abs(i * dy / dx))
j += ft_sign(dy);
else
i += ft_sign(dx);
}
}
}
// return the position of the point p // return the position of the point p
// in percentage of the total height of the map : // in percentage of the total height of the map :
// z_min---start---point---end----z_max // z_min---start---point---end----z_max
@@ -59,7 +87,8 @@ void draw_grid(t_fdf *fdf, int i, int j)
// - line : end - start // - line : end - start
// - p_numerator : px + py // - p_numerator : px + py
// - p_denominator : ex + ey // - p_denominator : ex + ey
int color_percent(t_fdf *fdf, int *p_start, int *p_end, int p_numerator, int p_denominator) { int color_percent(t_fdf *fdf, int *p_start, int *p_end, int p_numerator, int p_denominator)
{
int z_total; int z_total;
int start; int start;
int line; int line;
@@ -88,30 +117,18 @@ int color_percent(t_fdf *fdf, int *p_start, int *p_end, int p_numerator, int p_d
return (percent); return (percent);
} }
void draw_lines(t_fdf *fdf, int *start, int *end) void draw_color_pixel(t_fdf *fdf, int new_x, int new_y, int percent)
{ {
int dx; int color_r;
int dy; int color_g;
int i; int color_b;
int j; int color;
int percent;
if (end) color_r = get_primary_color('r', percent);
{ color_g = get_primary_color('g', percent);
dx = end[0] - start[0]; color_b = get_primary_color('b', percent);
dy = end[1] - start[1]; color = (color_r << 16) + (color_g << 8) + color_b;
i = 0; draw_pixel(fdf, new_x, new_y, color);
j = 0;
while (ft_abs(i) <= ft_abs(dx) && ft_abs(j) <= ft_abs(dy))
{
percent = color_percent(fdf, start, end, ft_abs(i) + ft_abs(j), ft_abs(dx) + ft_abs(dy));
draw_color_pixel(fdf, start[0] + i, start[1] + j, percent);
if (!ft_abs(dx) || ft_abs(j) < ft_abs(i * dy / dx))
j += ft_sign(dy);
else
i += ft_sign(dx);
}
}
} }
int get_primary_color(char primar, int percent) int get_primary_color(char primar, int percent)
@@ -136,30 +153,24 @@ int get_primary_color(char primar, int percent)
return (new_primary_color); return (new_primary_color);
} }
void draw_color_pixel(t_fdf *fdf, int new_x, int new_y, int percent)
{
int color_r;
int color_g;
int color_b;
int color;
color_r = get_primary_color('r', percent);
color_g = get_primary_color('g', percent);
color_b = get_primary_color('b', percent);
color = (color_r << 16) + (color_g << 8) + color_b;
draw_pixel(fdf, new_x, new_y, color);
}
void draw_pixel(t_fdf *fdf, int x, int y, int color) void draw_pixel(t_fdf *fdf, int x, int y, int color)
{ {
int position; int position;
if (is_outise_screen(fdf, x, y))
return ;
position = y * fdf->img_sizel + x * fdf->img_bpp / 8;
*(unsigned int *)(fdf->img_addr + position) = color;
}
int is_outise_screen(t_fdf *fdf, int x, int y)
{
int xmax; int xmax;
int ymax; int ymax;
xmax = fdf->img_sizel / (fdf->img_bpp / 8); xmax = fdf->img_sizel / (fdf->img_bpp / 8);
ymax = fdf->img_size_y; ymax = fdf->img_size_y;
if (x < 0 || y < 0 || x > xmax || y > ymax) if (x < 0 || y < 0 || x > xmax || y > ymax)
return ; return (1);
position = y * fdf->img_sizel + x * fdf->img_bpp / 8; return (0);
*(unsigned int *)(fdf->img_addr + position) = color;
} }