From dff10284666ad30823fa88ec57d0ae8eac7e7fad Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 29 Apr 2018 18:39:46 +0200 Subject: [PATCH] Replaced ColorToFloat() by ColorNormalize() --- src/core.c | 26 +++++++++++++------------- src/raylib.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/core.c b/src/core.c index d1ef6522f..3f071fc6f 100644 --- a/src/core.c +++ b/src/core.c @@ -1156,25 +1156,25 @@ double GetTime(void) #endif } -// Returns normalized float array for a Color -float *ColorToFloat(Color color) -{ - static float buffer[4]; - - buffer[0] = (float)color.r/255; - buffer[1] = (float)color.g/255; - buffer[2] = (float)color.b/255; - buffer[3] = (float)color.a/255; - - return buffer; -} - // Returns hexadecimal value for a Color int ColorToInt(Color color) { return (((int)color.r << 24) | ((int)color.g << 16) | ((int)color.b << 8) | (int)color.a); } +// Returns color normalized as float [0..1] +Vector4 ColorNormalize(Color color) +{ + Vector4 result; + + result.x = (float)color.r/255.0f; + result.y = (float)color.g/255.0f; + result.z = (float)color.b/255.0f; + result.w = (float)color.a/255.0f; + + return result; +} + // Returns HSV values for a Color // NOTE: Hue is returned as degrees [0..360] Vector3 ColorToHSV(Color color) diff --git a/src/raylib.h b/src/raylib.h index 4315afc56..b03a93f30 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -745,8 +745,8 @@ RLAPI float GetFrameTime(void); // Returns tim RLAPI double GetTime(void); // Returns elapsed time in seconds since InitWindow() // Color-related functions -RLAPI float *ColorToFloat(Color color); // Returns normalized float array for a Color RLAPI int ColorToInt(Color color); // Returns hexadecimal value for a Color +RLAPI Vector4 ColorNormalize(Color color); // Returns color normalized as float [0..1] RLAPI Vector3 ColorToHSV(Color color); // Returns HSV values for a Color RLAPI Color GetColor(int hexValue); // Returns a Color struct from hexadecimal value RLAPI Color Fade(Color color, float alpha); // Color fade-in or fade-out, alpha goes from 0.0f to 1.0f