Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove blend from draw.aaline #2550

Merged
merged 4 commits into from
Nov 9, 2023
+32 −43
Merged

Remove blend from draw.aaline #2550

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4146298
Remove blend from draw.aaline
MightyJosip Nov 6, 2023
45fce7b
Remove blend from draw.aaline
MightyJosip Nov 6, 2023
b91bfbc
Remove blend from draw.aaline
MightyJosip Nov 6, 2023
02cf4f4
Remove blend from draw.aaline
MightyJosip Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 32 additions & 43 deletions src_c/draw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,36 +973,26 @@ compare_int(const void *a, const void *b)

static Uint32
get_antialiased_color(SDL_Surface *surf, int x, int y, Uint32 original_color,
float brightness, int blend)
float brightness)
{
Uint8 color_part[4], background_color[4];
Uint32 *pixels = (Uint32 *)surf->pixels;
SDL_GetRGBA(original_color, surf->format, &color_part[0], &color_part[1],
&color_part[2], &color_part[3]);
if (blend) {
if (x < surf->clip_rect.x ||
x >= surf->clip_rect.x + surf->clip_rect.w ||
y < surf->clip_rect.y ||
y >= surf->clip_rect.y + surf->clip_rect.h)
return original_color;
MightyJosip marked this conversation as resolved.
Show resolved Hide resolved
SDL_GetRGBA(pixels[(y * surf->w) + x], surf->format,
&background_color[0], &background_color[1],
&background_color[2], &background_color[3]);
color_part[0] = (Uint8)(brightness * color_part[0] +
(1 - brightness) * background_color[0]);
color_part[1] = (Uint8)(brightness * color_part[1] +
(1 - brightness) * background_color[1]);
color_part[2] = (Uint8)(brightness * color_part[2] +
(1 - brightness) * background_color[2]);
color_part[3] = (Uint8)(brightness * color_part[3] +
(1 - brightness) * background_color[3]);
}
else {
color_part[0] = (Uint8)(brightness * color_part[0]);
color_part[1] = (Uint8)(brightness * color_part[1]);
color_part[2] = (Uint8)(brightness * color_part[2]);
color_part[3] = (Uint8)(brightness * color_part[3]);
}
if (x < surf->clip_rect.x || x >= surf->clip_rect.x + surf->clip_rect.w ||
y < surf->clip_rect.y || y >= surf->clip_rect.y + surf->clip_rect.h)
return original_color;
SDL_GetRGBA(pixels[(y * surf->w) + x], surf->format, &background_color[0],
&background_color[1], &background_color[2],
&background_color[3]);
color_part[0] = (Uint8)(brightness * color_part[0] +
(1 - brightness) * background_color[0]);
color_part[1] = (Uint8)(brightness * color_part[1] +
(1 - brightness) * background_color[1]);
color_part[2] = (Uint8)(brightness * color_part[2] +
(1 - brightness) * background_color[2]);
color_part[3] = (Uint8)(brightness * color_part[3] +
(1 - brightness) * background_color[3]);
original_color = SDL_MapRGBA(surf->format, color_part[0], color_part[1],
color_part[2], color_part[3]);
return original_color;
Expand Down Expand Up @@ -1123,7 +1113,6 @@ draw_aaline(SDL_Surface *surf, Uint32 color, float from_x, float from_y,
Uint32 pixel_color;
float x_gap, y_endpoint, clip_left, clip_right, clip_top, clip_bottom;
int steep, y;
int blend = 1;

dx = to_x - from_x;
dy = to_y - from_y;
Expand All @@ -1133,7 +1122,7 @@ draw_aaline(SDL_Surface *surf, Uint32 color, float from_x, float from_y,
if (fabs(dx) < 0.0001 && fabs(dy) < 0.0001) {
pixel_color =
get_antialiased_color(surf, (int)floor(from_x + 0.5),
(int)floor(from_y + 0.5), color, 1, blend);
(int)floor(from_y + 0.5), color, 1);
set_and_check_rect(surf, (int)floor(from_x + 0.5),
(int)floor(from_y + 0.5), pixel_color, drawn_area);
return;
Expand Down Expand Up @@ -1236,8 +1225,8 @@ draw_aaline(SDL_Surface *surf, Uint32 color, float from_x, float from_y,
y = (int)y_endpoint;
}
if ((int)y_endpoint < y_endpoint) {
pixel_color = get_antialiased_color(surf, x, y, color,
brightness * x_gap, blend);
pixel_color =
get_antialiased_color(surf, x, y, color, brightness * x_gap);
set_and_check_rect(surf, x, y, pixel_color, drawn_area);
}
if (steep) {
Expand All @@ -1247,8 +1236,8 @@ draw_aaline(SDL_Surface *surf, Uint32 color, float from_x, float from_y,
y--;
}
brightness = 1 - brightness;
pixel_color = get_antialiased_color(surf, x, y, color,
brightness * x_gap, blend);
pixel_color =
get_antialiased_color(surf, x, y, color, brightness * x_gap);
set_and_check_rect(surf, x, y, pixel_color, drawn_area);
intersect_y += gradient;
x_pixel_start++;
Expand All @@ -1268,8 +1257,8 @@ draw_aaline(SDL_Surface *surf, Uint32 color, float from_x, float from_y,
y = (int)y_endpoint;
}
if ((int)y_endpoint < y_endpoint) {
pixel_color = get_antialiased_color(surf, x, y, color,
brightness * x_gap, blend);
pixel_color =
get_antialiased_color(surf, x, y, color, brightness * x_gap);
set_and_check_rect(surf, x, y, pixel_color, drawn_area);
}
if (steep) {
Expand All @@ -1279,8 +1268,8 @@ draw_aaline(SDL_Surface *surf, Uint32 color, float from_x, float from_y,
y--;
}
brightness = 1 - brightness;
pixel_color = get_antialiased_color(surf, x, y, color,
brightness * x_gap, blend);
pixel_color =
get_antialiased_color(surf, x, y, color, brightness * x_gap);
set_and_check_rect(surf, x, y, pixel_color, drawn_area);
}

Expand All @@ -1289,25 +1278,25 @@ draw_aaline(SDL_Surface *surf, Uint32 color, float from_x, float from_y,
y = (int)intersect_y;
if (steep) {
brightness = 1 - intersect_y + y;
pixel_color = get_antialiased_color(surf, y - 1, x, color,
brightness, blend);
pixel_color =
get_antialiased_color(surf, y - 1, x, color, brightness);
set_and_check_rect(surf, y - 1, x, pixel_color, drawn_area);
if (y < intersect_y) {
brightness = 1 - brightness;
pixel_color = get_antialiased_color(surf, y, x, color,
brightness, blend);
pixel_color =
get_antialiased_color(surf, y, x, color, brightness);
set_and_check_rect(surf, y, x, pixel_color, drawn_area);
}
}
else {
brightness = 1 - intersect_y + y;
pixel_color = get_antialiased_color(surf, x, y - 1, color,
brightness, blend);
pixel_color =
get_antialiased_color(surf, x, y - 1, color, brightness);
set_and_check_rect(surf, x, y - 1, pixel_color, drawn_area);
if (y < intersect_y) {
brightness = 1 - brightness;
pixel_color = get_antialiased_color(surf, x, y, color,
brightness, blend);
pixel_color =
get_antialiased_color(surf, x, y, color, brightness);
set_and_check_rect(surf, x, y, pixel_color, drawn_area);
}
}
Expand Down