@@ -159,7 +159,7 @@ class Color {
159159
160160 inline Color blend (const Color &p_over) const {
161161 Color res;
162- float sa = ( real_t ) 1.0 - p_over.a ;
162+ float sa = 1.0 - p_over.a ;
163163 res.a = a * sa + p_over.a ;
164164 if (res.a == 0 ) {
165165 return Color (0 , 0 , 0 , 0 );
@@ -173,16 +173,16 @@ class Color {
173173
174174 inline Color to_linear () const {
175175 return Color (
176- r < ( real_t ) 0.04045 ? r * (real_t )( 1.0 / 12.92 ) : Math::pow ((r + ( real_t ) 0.055 ) * (real_t )( 1.0 / (1.0 + 0.055 )), ( real_t ) 2.4 ),
177- g < ( real_t ) 0.04045 ? g * (real_t )( 1.0 / 12.92 ) : Math::pow ((g + ( real_t ) 0.055 ) * (real_t )( 1.0 / (1.0 + 0.055 )), ( real_t ) 2.4 ),
178- b < ( real_t ) 0.04045 ? b * (real_t )( 1.0 / 12.92 ) : Math::pow ((b + ( real_t ) 0.055 ) * (real_t )( 1.0 / (1.0 + 0.055 )), ( real_t ) 2.4 ),
176+ r < 0.04045 ? r * (1.0 / 12.92 ) : Math::pow ((r + 0 . 055f ) * (1.0 / (1.0 + 0.055 )), 2.4 ),
177+ g < 0.04045 ? g * (1.0 / 12.92 ) : Math::pow ((g + 0 . 055f ) * (1.0 / (1.0 + 0.055 )), 2.4 ),
178+ b < 0.04045 ? b * (1.0 / 12.92 ) : Math::pow ((b + 0 . 055f ) * (1.0 / (1.0 + 0.055 )), 2.4 ),
179179 a);
180180 }
181181 inline Color to_srgb () const {
182182 return Color (
183- r < ( real_t ) 0.0031308 ? ( real_t ) 12.92 * r : (real_t )( 1.0 + 0.055 ) * Math::pow (r, ( real_t )( 1.0 / 2.4 )) - ( real_t ) 0.055 ,
184- g < ( real_t ) 0.0031308 ? ( real_t ) 12.92 * g : (real_t )( 1.0 + 0.055 ) * Math::pow (g, ( real_t )( 1.0 / 2.4 )) - ( real_t ) 0.055 ,
185- b < ( real_t ) 0.0031308 ? ( real_t ) 12.92 * b : (real_t )( 1.0 + 0.055 ) * Math::pow (b, ( real_t )( 1.0 / 2.4 )) - ( real_t ) 0.055 , a);
183+ r < 0 . 0031308f ? 12 .92f * r : (1 . 0f + 0 .055f ) * Math::pow (r, 1 . 0f / 2 .4f ) - 0 . 055f ,
184+ g < 0 . 0031308f ? 12 .92f * g : (1 . 0f + 0 .055f ) * Math::pow (g, 1 . 0f / 2 .4f ) - 0 . 055f ,
185+ b < 0 . 0031308f ? 12 .92f * b : (1 . 0f + 0 .055f ) * Math::pow (b, 1 . 0f / 2 .4f ) - 0 . 055f , a);
186186 }
187187
188188 static Color hex (uint32_t p_hex);
@@ -204,14 +204,14 @@ class Color {
204204 operator String () const ;
205205
206206 // For the binder.
207- inline void set_r8 (int32_t r8) { r = (Math::clamp (r8, 0 , 255 ) / ( real_t ) 255.0 ); }
208- inline int32_t get_r8 () const { return int32_t (Math::clamp (r * ( real_t ) 255.0 , ( real_t ) 0.0 , ( real_t ) 255.0 )); }
209- inline void set_g8 (int32_t g8) { g = (Math::clamp (g8, 0 , 255 ) / ( real_t ) 255.0 ); }
210- inline int32_t get_g8 () const { return int32_t (Math::clamp (g * ( real_t ) 255.0 , ( real_t ) 0.0 , ( real_t ) 255.0 )); }
211- inline void set_b8 (int32_t b8) { b = (Math::clamp (b8, 0 , 255 ) / ( real_t ) 255.0 ); }
212- inline int32_t get_b8 () const { return int32_t (Math::clamp (b * ( real_t ) 255.0 , ( real_t ) 0.0 , ( real_t ) 255.0 )); }
213- inline void set_a8 (int32_t a8) { a = (Math::clamp (a8, 0 , 255 ) / ( real_t ) 255.0 ); }
214- inline int32_t get_a8 () const { return int32_t (Math::clamp (a * ( real_t ) 255.0 , ( real_t ) 0.0 , ( real_t ) 255.0 )); }
207+ inline void set_r8 (int32_t r8) { r = (Math::clamp (r8, 0 , 255 ) / 255.0 ); }
208+ inline int32_t get_r8 () const { return int32_t (Math::clamp (r * 255.0 , 0.0 , 255.0 )); }
209+ inline void set_g8 (int32_t g8) { g = (Math::clamp (g8, 0 , 255 ) / 255.0 ); }
210+ inline int32_t get_g8 () const { return int32_t (Math::clamp (g * 255.0 , 0.0 , 255.0 )); }
211+ inline void set_b8 (int32_t b8) { b = (Math::clamp (b8, 0 , 255 ) / 255.0 ); }
212+ inline int32_t get_b8 () const { return int32_t (Math::clamp (b * 255.0 , 0.0 , 255.0 )); }
213+ inline void set_a8 (int32_t a8) { a = (Math::clamp (a8, 0 , 255 ) / 255.0 ); }
214+ inline int32_t get_a8 () const { return int32_t (Math::clamp (a * 255.0 , 0.0 , 255.0 )); }
215215
216216 inline void set_h (float p_h) { set_hsv (p_h, get_s (), get_v ()); }
217217 inline void set_s (float p_s) { set_hsv (get_h (), p_s, get_v ()); }
0 commit comments