From 786cd63057d77e7987fe68986da6bca103c96415 Mon Sep 17 00:00:00 2001 From: Wilhem Barbier Date: Wed, 28 Jun 2017 17:27:47 +0200 Subject: [PATCH] Add a density parameter to GenImageRadialGradient --- examples/textures/textures_image_generation.c | 2 +- src/raylib.h | 2 +- src/textures.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/textures/textures_image_generation.c b/examples/textures/textures_image_generation.c index 7525e8a28..f6343297a 100644 --- a/examples/textures/textures_image_generation.c +++ b/examples/textures/textures_image_generation.c @@ -22,7 +22,7 @@ int main() Image verticalGradient = GenImageGradientV(screenWidth, screenHeight, RED, BLUE); Image horizontalGradient = GenImageGradientH(screenWidth, screenHeight, RED, BLUE); - Image radialGradient = GenImageRadialGradient(screenWidth, screenHeight, WHITE, BLACK); + Image radialGradient = GenImageRadialGradient(screenWidth, screenHeight, 0.f, WHITE, BLACK); Image checked = GenImageChecked(screenWidth, screenHeight, 32, 32, RED, BLUE); Image whiteNoise = GenImageWhiteNoise(screenWidth, screenHeight, 0.5f); Image perlinNoise = GenImagePerlinNoise(screenWidth, screenHeight, 8.f); diff --git a/src/raylib.h b/src/raylib.h index a9483f317..0a4ce091f 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -877,7 +877,7 @@ RLAPI void ImageColorBrightness(Image *image, int brightness); // Image generation functions RLAPI Image GenImageGradientV(int width, int height, Color top, Color bottom); // Generate image: vertical gradient RLAPI Image GenImageGradientH(int width, int height, Color left, Color right); // Generate image: horizontal gradient -RLAPI Image GenImageRadialGradient(int width, int height, Color inner, Color outer); // Generate image: radial gradient +RLAPI Image GenImageRadialGradient(int width, int height, float density, Color inner, Color outer); // Generate image: radial gradient RLAPI Image GenImageChecked(int width, int height, int checksX, int checksY, Color col1, Color col2); // Generate image: checked RLAPI Image GenImageWhiteNoise(int width, int height, float factor); // Generate image: white noise RLAPI Image GenImagePerlinNoise(int width, int height, float scale); // Generate image: perlin noise diff --git a/src/textures.c b/src/textures.c index 67d03d8dd..9b0067cf4 100644 --- a/src/textures.c +++ b/src/textures.c @@ -1493,7 +1493,7 @@ Image GenImageGradientH(int width, int height, Color left, Color right) } // Generate image: radial gradient -Image GenImageRadialGradient(int width, int height, Color inner, Color outer) +Image GenImageRadialGradient(int width, int height, float density, Color inner, Color outer) { Color *pixels = (Color*)malloc(width * height * sizeof(Color)); float radius = (width < height) ? (float)width / 2.f : (float)height / 2.f; @@ -1505,7 +1505,8 @@ Image GenImageRadialGradient(int width, int height, Color inner, Color outer) for (int x = 0; x < width; x++) { float dist = hypotf((float)x - center_x, (float)y - center_y); - float factor = dist / radius; + float factor = (dist - radius * density) / (radius * (1.f - density)); + factor = fmax(factor, 0.f); factor = fmin(factor, 1.f); // dist can be bigger than radius so we have to check pixels[y*width + x].r = (int)((float)outer.r * factor + (float)inner.r * (1.f - factor)); pixels[y*width + x].g = (int)((float)outer.g * factor + (float)inner.g * (1.f - factor));