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

fixed blur issue on opaque pictures & added example (#2775)

Browse Source 
Co-authored-by: nobytesgiven <nobytesgiven@users.noreply.github.com>
This commit is contained in:
nobytesgiven 2022-10-26 10:11:14 +03:00 committed by GitHub
parent 865f823835
commit c4abf68351
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/textures/textures_image_processing.c
View File

@ -17,7 +17,7 @@
#include <stdlib.h> // Required for: free() #include <stdlib.h> // Required for: free()
#define NUM_PROCESSES 8 #define NUM_PROCESSES 9
typedef enum { typedef enum {
NONE = 0, NONE = 0,
@ -26,6 +26,7 @@ typedef enum {
COLOR_INVERT, COLOR_INVERT,
COLOR_CONTRAST, COLOR_CONTRAST,
COLOR_BRIGHTNESS, COLOR_BRIGHTNESS,
GAUSSIAN_BLUR,
FLIP_VERTICAL, FLIP_VERTICAL,
FLIP_HORIZONTAL FLIP_HORIZONTAL
} ImageProcess; } ImageProcess;
@ -37,6 +38,7 @@ static const char *processText[] = {
"COLOR INVERT", "COLOR INVERT",
"COLOR CONTRAST", "COLOR CONTRAST",
"COLOR BRIGHTNESS", "COLOR BRIGHTNESS",
"GAUSSIAN BLUR",
"FLIP VERTICAL", "FLIP VERTICAL",
"FLIP HORIZONTAL" "FLIP HORIZONTAL"
}; };
@ -125,6 +127,7 @@ int main(void)
case COLOR_INVERT: ImageColorInvert(&imCopy); break; case COLOR_INVERT: ImageColorInvert(&imCopy); break;
case COLOR_CONTRAST: ImageColorContrast(&imCopy, -40); break; case COLOR_CONTRAST: ImageColorContrast(&imCopy, -40); break;
case COLOR_BRIGHTNESS: ImageColorBrightness(&imCopy, -80); break; case COLOR_BRIGHTNESS: ImageColorBrightness(&imCopy, -80); break;
case GAUSSIAN_BLUR: ImageBlurGaussian(&imCopy, 10); break;
case FLIP_VERTICAL: ImageFlipVertical(&imCopy); break; case FLIP_VERTICAL: ImageFlipVertical(&imCopy); break;
case FLIP_HORIZONTAL: ImageFlipHorizontal(&imCopy); break; case FLIP_HORIZONTAL: ImageFlipHorizontal(&imCopy); break;
default: break; default: break;

5
src/rtextures.c
View File

@ -1506,7 +1506,6 @@ void ImageBlurGaussian(Image *image, int blurSize) {
ImageAlphaPremultiply(image); ImageAlphaPremultiply(image);
Color *pixels = LoadImageColors(*image); Color *pixels = LoadImageColors(*image);
Color *pixelsCopy = LoadImageColors(*image);
// Loop switches between pixelsCopy1 and pixelsCopy2 // Loop switches between pixelsCopy1 and pixelsCopy2
Vector4 *pixelsCopy1 = RL_MALLOC((image->height)*(image->width)*sizeof(Vector4)); Vector4 *pixelsCopy1 = RL_MALLOC((image->height)*(image->width)*sizeof(Vector4));
@ -1623,14 +1622,14 @@ void ImageBlurGaussian(Image *image, int blurSize) {
// Reverse premultiply // Reverse premultiply
for (int i = 0; i < (image->width)*(image->height); i++) for (int i = 0; i < (image->width)*(image->height); i++)
{ {
if (pixelsCopy1[i].w == 0) if (pixelsCopy1[i].w == 0.0f)
{ {
pixels[i].r = 0; pixels[i].r = 0;
pixels[i].g = 0; pixels[i].g = 0;
pixels[i].b = 0; pixels[i].b = 0;
pixels[i].a = 0; pixels[i].a = 0;
} }
else if (pixelsCopy1[i].w < 255.0f) else if (pixelsCopy1[i].w <= 255.0f)
{ {
float alpha = (float)pixelsCopy1[i].w/255.0f; float alpha = (float)pixelsCopy1[i].w/255.0f;
pixels[i].r = (unsigned char)((float)pixelsCopy1[i].x/alpha); pixels[i].r = (unsigned char)((float)pixelsCopy1[i].x/alpha);