MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ImageDrawLine: Replaced 3 functions with 1

Browse Source 
Removed both freshly added internal functions
Crammed it all into one
This commit is contained in:
Alexander Buhl 2021-07-20 21:46:09 +02:00 committed by GitHub
parent be83329b2d
commit 6a01c3f31a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 110 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

182
src/textures.c
View File

@ -2414,72 +2414,7 @@ void ImageDrawPixelV(Image *dst, Vector2 position, Color color)
{ {
ImageDrawPixel(dst, (int)position.x, (int)position.y, color); ImageDrawPixel(dst, (int)position.x, (int)position.y, color);
} }
void _ImageDrawLineHorizontal(Image *dst, int startPosX, int startPosY, int endPosX, int endPosY, Color color){
int changeInX = (endPosX - startPosX);
int abs_changeInX = changeInX < 0 ? -changeInX : changeInX;
int changeInY = (endPosY - startPosY);
int abs_changeInY = changeInY < 0 ? -changeInY : changeInY;
// we need to go up or down depending (-1 or 1);
int y_directional_unit = changeInY < 0 ? -1 : 1;
int A = 2* abs_changeInY;
int B = A - 2* abs_changeInX;
int P = A - abs_changeInX;
ImageDrawPixel(dst, startPosX, startPosY, color);
for (int x = startPosX+1, y = startPosY; x <= endPosX; x += 1)
{
if (P >= 0)
{
y += y_directional_unit;
P += B;
}
else
{
P += A;
}
ImageDrawPixel(dst, x, y, color);
}
}
void _ImageDrawLineVertical(Image *dst, int startPosX, int startPosY, int endPosX, int endPosY, Color color){
// same code as *Horizontal but with all x and y flipped
int changeInX = (endPosX - startPosX);
int abs_changeInX = changeInX < 0 ? -changeInX : changeInX;
int changeInY = (endPosY - startPosY);
int abs_changeInY = changeInY < 0 ? -changeInY : changeInY;
// we need to go left or right depending (-1 or 1)
int x_directional_unit = changeInX < 0 ? -1 : 1;
int A = 2* abs_changeInX;
int B = A - 2* abs_changeInY;
int P = A - abs_changeInY;
ImageDrawPixel(dst, startPosX, startPosY, color);
for (int y = startPosY+1, x = startPosX; y <= endPosY; y += 1)
{
if (P >= 0)
{
x += x_directional_unit;
P += B;
}
else
{
P += A;
}
ImageDrawPixel(dst, x, y, color);
}
}
// Draw line within an image // Draw line within an image
void ImageDrawLine (Image *dst, int startPosX, int startPosY, int endPosX, int endPosY, Color color){ void ImageDrawLine (Image *dst, int startPosX, int startPosY, int endPosX, int endPosY, Color color){
// Using Bresenham's algorithm as described in // Using Bresenham's algorithm as described in
@ -2495,26 +2430,129 @@ void ImageDrawLine (Image *dst, int startPosX, int startPosY, int endPosX, int e
{ {
if (changeInX > 0) if (changeInX > 0)
{ {
_ImageDrawLineHorizontal(dst, startPosX, startPosY, endPosX, endPosY, color); // we need to go up or down depending (-1 or 1);
int y_directional_unit = changeInY < 0 ? -1 : 1;
int A = 2* abs_changeInY;
int B = A - 2* abs_changeInX;
int P = A - abs_changeInX;
ImageDrawPixel(dst, startPosX, startPosY, color);
for (int x = startPosX+1, y = startPosY; x <= endPosX; x += 1)
{
if (P >= 0)
{
y += y_directional_unit;
P += B;
}
else
{
P += A;
}
ImageDrawPixel(dst, x, y, color);
}
} }
else else
{ {
_ImageDrawLineHorizontal(dst, endPosX, endPosY, startPosX, startPosY, color); // doing the equivalent of "calling" the branch above with inverted parameters:
changeInX = -changeInX;
changeInY = -changeInY;
int help;
help = startPosX;
startPosX = endPosX;
endPosX = help;
help = startPosY;
startPosY = endPosY;
endPosY = help;
int y_directional_unit = changeInY < 0 ? -1 : 1;
int A = 2* abs_changeInY;
int B = A - 2* abs_changeInX;
int P = A - abs_changeInX;
ImageDrawPixel(dst, startPosX, startPosY, color);
for (int x = startPosX+1, y = startPosY; x <= endPosX; x += 1)
{
if (P >= 0)
{
y += y_directional_unit;
P += B;
}
else
{
P += A;
}
ImageDrawPixel(dst, x, y, color);
}
} }
} }
else else
{ {
if (changeInY > 0) if (changeInY > 0)
{ {
_ImageDrawLineVertical(dst, startPosX, startPosY, endPosX, endPosY, color); int x_directional_unit = changeInX < 0 ? -1 : 1;
int A = 2* abs_changeInX;
int B = A - 2* abs_changeInY;
int P = A - abs_changeInY;
ImageDrawPixel(dst, startPosX, startPosY, color);
for (int y = startPosY+1, x = startPosX; y <= endPosY; y += 1)
{
if (P >= 0)
{
x += x_directional_unit;
P += B;
}
else
{
P += A;
}
ImageDrawPixel(dst, x, y, color);
}
} }
else else
{ {
_ImageDrawLineVertical(dst, endPosX, endPosY, startPosX, startPosY, color); // doing the equivalent of "calling" the branch above with inverted parameters:
changeInX = -changeInX;
changeInY = -changeInY;
int help;
help = startPosX;
startPosX = endPosX;
endPosX = help;
help = startPosY;
startPosY = endPosY;
endPosY = help;
int x_directional_unit = changeInX < 0 ? -1 : 1;
int A = 2* abs_changeInX;
int B = A - 2* abs_changeInY;
int P = A - abs_changeInY;
ImageDrawPixel(dst, startPosX, startPosY, color);
for (int y = startPosY+1, x = startPosX; y <= endPosY; y += 1)
{
if (P >= 0)
{
x += x_directional_unit;
P += B;
}
else
{
P += A;
}
ImageDrawPixel(dst, x, y, color);
}
} }
} }
} }
// Draw line within an image (Vector version) // Draw line within an image (Vector version)
void ImageDrawLineV(Image *dst, Vector2 start, Vector2 end, Color color) void ImageDrawLineV(Image *dst, Vector2 start, Vector2 end, Color color)
{ {