Browse Source

Change GetColor to take unsigned int (#1954)

pull/1959/head
Richard Smith 3 years ago
committed by GitHub
parent
commit
cac856119c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
  1. +1
    -1
      parser/raylib_api.txt
  2. +1
    -1
      projects/Notepad++/raylib_npp_parser/raylib_to_parse.h
  3. +2
    -2
      src/extras/raygui.h
  4. +1
    -1
      src/raylib.h
  5. +1
    -1
      src/textures.c

+ 1
- 1
parser/raylib_api.txt View File

@ -2505,7 +2505,7 @@ Function 308: GetColor() (1 input parameters)
Name: GetColor
Return type: Color
Description: Get Color structure from hexadecimal value
Param[1]: hexValue (type: int)
Param[1]: hexValue (type: unsigned int)
Function 309: GetPixelColor() (2 input parameters)
Name: GetPixelColor
Return type: Color

+ 1
- 1
projects/Notepad++/raylib_npp_parser/raylib_to_parse.h View File

@ -389,7 +389,7 @@ RLAPI Vector3 ColorToHSV(Color color); // R
RLAPI Color ColorFromHSV(float hue, float saturation, float value); // Returns a Color from HSV values
RLAPI Color ColorAlpha(Color color, float alpha); // Returns color with alpha applied, alpha goes from 0.0f to 1.0f
RLAPI Color ColorAlphaBlend(Color dst, Color src, Color tint); // Returns src alpha-blended into dst color with tint
RLAPI Color GetColor(int hexValue); // Get Color structure from hexadecimal value
RLAPI Color GetColor(unsigned int hexValue); // Get Color structure from hexadecimal value
RLAPI Color GetPixelColor(void *srcPtr, int format); // Get Color from a source pixel pointer of certain format
RLAPI void SetPixelColor(void *dstPtr, Color color, int format); // Set color formatted into destination pixel pointer
RLAPI int GetPixelDataSize(int width, int height, int format); // Get pixel data size in bytes for certain format

+ 2
- 2
src/extras/raygui.h View File

@ -1154,7 +1154,7 @@ static const char *GetDirectoryPath(const char *filePath); // -- GuiLoadStyle()
// raylib functions already implemented in raygui
//-------------------------------------------------------------------------------
static Color GetColor(int hexValue); // Returns a Color struct from hexadecimal value
static Color GetColor(unsigned int hexValue); // Returns a Color struct from hexadecimal value
static int ColorToInt(Color color); // Returns hexadecimal value for a Color
static Color Fade(Color color, float alpha); // Color fade-in or fade-out, alpha goes from 0.0f to 1.0f
static bool CheckCollisionPointRec(Vector2 point, Rectangle rec); // Check if point is inside rectangle
@ -4061,7 +4061,7 @@ static Vector3 ConvertHSVtoRGB(Vector3 hsv)
#if defined(RAYGUI_STANDALONE)
// Returns a Color struct from hexadecimal value
static Color GetColor(int hexValue)
static Color GetColor(unsigned int hexValue)
{
Color color;

+ 1
- 1
src/raylib.h View File

@ -1297,7 +1297,7 @@ RLAPI Vector3 ColorToHSV(Color color); // G
RLAPI Color ColorFromHSV(float hue, float saturation, float value); // Get a Color from HSV values, hue [0..360], saturation/value [0..1]
RLAPI Color ColorAlpha(Color color, float alpha); // Get color with alpha applied, alpha goes from 0.0f to 1.0f
RLAPI Color ColorAlphaBlend(Color dst, Color src, Color tint); // Get src alpha-blended into dst color with tint
RLAPI Color GetColor(int hexValue); // Get Color structure from hexadecimal value
RLAPI Color GetColor(unsigned int hexValue); // Get Color structure from hexadecimal value
RLAPI Color GetPixelColor(void *srcPtr, int format); // Get Color from a source pixel pointer of certain format
RLAPI void SetPixelColor(void *dstPtr, Color color, int format); // Set color formatted into destination pixel pointer
RLAPI int GetPixelDataSize(int width, int height, int format); // Get pixel data size in bytes for certain format

+ 1
- 1
src/textures.c View File

@ -3711,7 +3711,7 @@ Color ColorAlphaBlend(Color dst, Color src, Color tint)
}
// Get a Color struct from hexadecimal value
Color GetColor(int hexValue)
Color GetColor(unsigned int hexValue)
{
Color color;

Loading…
Cancel
Save