Skip to content

Commit cbc3650

Browse files
authored
fix(color): Fix implicit use of double instead of float (#529)
1 parent 7d7cb79 commit cbc3650

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

components/color/src/color.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Rgb::Rgb(const float &_r, const float &_g, const float &_b)
66
: r(_r)
77
, g(_g)
88
, b(_b) {
9-
if (r > 1.0 || g > 1.0 || b > 1.0) {
10-
r /= 255.;
11-
g /= 255.;
12-
b /= 255.;
9+
if (r > 1.0f || g > 1.0f || b > 1.0f) {
10+
r /= 255.0f;
11+
g /= 255.0f;
12+
b /= 255.0f;
1313
}
1414
r = std::clamp(r, 0.0f, 1.0f);
1515
g = std::clamp(g, 0.0f, 1.0f);
@@ -124,27 +124,27 @@ Rgb Hsv::rgb() const {
124124

125125
float H = h, S = s, V = v, P, Q, T, fract;
126126

127-
(H == 360.) ? (H = 0.) : (H /= 60.);
128-
fract = H - floor(H);
127+
(H == 360.0f) ? (H = 0.0f) : (H /= 60.0f);
128+
fract = H - floorf(H);
129129

130-
P = V * (1. - S);
131-
Q = V * (1. - S * fract);
132-
T = V * (1. - S * (1. - fract));
130+
P = V * (1.0f - S);
131+
Q = V * (1.0f - S * fract);
132+
T = V * (1.0f - S * (1.0f - fract));
133133

134-
if (0. <= H && H < 1.)
134+
if (0.0f <= H && H < 1.0f)
135135
RGB = Rgb(V, T, P);
136-
else if (1. <= H && H < 2.)
136+
else if (1.0f <= H && H < 2.0f)
137137
RGB = Rgb(Q, V, P);
138-
else if (2. <= H && H < 3.)
138+
else if (2.0f <= H && H < 3.0f)
139139
RGB = Rgb(P, V, T);
140-
else if (3. <= H && H < 4.)
140+
else if (3.0f <= H && H < 4.0f)
141141
RGB = Rgb(P, Q, V);
142-
else if (4. <= H && H < 5.)
142+
else if (4.0f <= H && H < 5.0f)
143143
RGB = Rgb(T, P, V);
144-
else if (5. <= H && H < 6.)
144+
else if (5.0f <= H && H < 6.0f)
145145
RGB = Rgb(V, P, Q);
146146
else
147-
RGB = Rgb(0., 0., 0.);
147+
RGB = Rgb(0.0f, 0.0f, 0.0f);
148148

149149
return RGB;
150150
}

0 commit comments

Comments
 (0)