Selaa lähdekoodia

Review code formatting on ColorFromHSV()

Following raylib notation rules
Ray 6 vuotta sitten
vanhempi
commit
e811279a75
2 muutettua tiedostoa jossa 27 lisäystä ja 27 poistoa
  1. 26 26
      src/core.c
  2. 1 1
      src/raylib.h

+ 26 - 26
src/core.c

@@ -1446,36 +1446,36 @@ Vector3 ColorToHSV(Color color)
 }
 
 // Returns a Color from HSV values
+// Implementation reference: https://en.wikipedia.org/wiki/HSL_and_HSV#Alternative_HSV_conversion
 // NOTE: Color->HSV->Color conversion will not yield exactly the same color due to rounding errors
-Color ColorFromHSV(Vector3 hsv, unsigned char alpha) 
+Color ColorFromHSV(Vector3 hsv) 
 {
-    // implementation details at https://en.wikipedia.org/wiki/HSL_and_HSV#Alternative_HSV_conversion
-    float h = hsv.x, s=hsv.y, v=hsv.z;
-    Color color = {0,0,0,alpha};
+    Color color = { 0, 0, 0, 255 };
+    float h = hsv.x, s = hsv.y, v = hsv.z;
     
-    //red
-    float k = fmod((5.+h/60.),6);
-    float t = 4.-k;
-    k = t<k?t:k;
-    k = k<1?k:1;
-    k = k>0?k:0;
-    color.r = (v-v*s*k)*255;
-
-    //green
-    k = fmod((3.+h/60.),6);
-    t = 4.-k;
-    k = t<k?t:k;
-    k = k<1?k:1;
-    k = k>0?k:0;
-    color.g =(v-v*s*k)*255;
+    // Red channel
+    float k = fmod((5.0f + h/60.0f), 6);
+    float t = 4.0f - k;
+    k = (t < k) ? t : k;
+    k = (k < 1) ? k : 1;
+    k = (k > 0) ? k : 0;
+    color.r = (v - v*s*k)*255;
+
+    // Green channel
+    k = fmod((3.0f + h/60.0f), 6);
+    t = 4.0f - k;
+    k = (t < k) ? t : k;
+    k = (k < 1) ? k : 1;
+    k = (k > 0) ? k : 0;
+    color.g = (v - v*s*k)*255;
     
-    //blue
-    k = fmod((1.+h/60.),6);
-    t = 4.-k;
-    k = t<k?t:k;
-    k = k<1?k:1;
-    k = k>0?k:0;
-    color.b = (v-v*s*k)*255;
+    // Blue channel
+    k = fmod((1.0f + h/60.0f), 6);
+    t = 4.0f - k;
+    k = (t < k) ? t : k;
+    k = (k < 1) ? k : 1;
+    k = (k > 0) ? k : 0;
+    color.b = (v - v*s*k)*255;
 	
     return color;
 }

+ 1 - 1
src/raylib.h

@@ -891,7 +891,7 @@ RLAPI double GetTime(void);                                       // Returns ela
 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 ColorFromHSV(Vector3 hsv, unsigned char alpha);       // Returns a Color from HSV values (NOTE: some precision is lost due to rounding errors)
+RLAPI Color ColorFromHSV(Vector3 hsv);                            // Returns a Color from HSV values
 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