Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Optimize Color.html()

Browse source
This commit is contained in:
MewPurPur 2025-04-02 01:27:05 +03:00
parent 4b36c0491e
commit 45b1071e7c
1 changed files with 27 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

63
core/math/color.cpp
View file

@ -316,47 +316,38 @@ Color Color::inverted() const {
} }
Color Color::html(const String &p_rgba) { Color Color::html(const String &p_rgba) {
String color = p_rgba; if (p_rgba.is_empty()) {
if (color.length() == 0) {
return Color(); return Color();
} }
if (color[0] == '#') {
color = color.substr(1);
}
// If enabled, use 1 hex digit per channel instead of 2. const int current_pos = (p_rgba[0] == '#') ? 1 : 0;
// Other sizes aren't in the HTML/CSS spec but we could add them if desired. const int num_of_digits = p_rgba.length() - current_pos;
bool is_shorthand = color.length() < 5;
bool alpha = false;
if (color.length() == 8) { float r, g, b, a = 1.0f;
alpha = true;
} else if (color.length() == 6) { if (num_of_digits == 3) {
alpha = false; // #rgb
} else if (color.length() == 4) { r = _parse_col4(p_rgba, current_pos) / 15.0f;
alpha = true; g = _parse_col4(p_rgba, current_pos + 1) / 15.0f;
} else if (color.length() == 3) { b = _parse_col4(p_rgba, current_pos + 2) / 15.0f;
alpha = false; } else if (num_of_digits == 4) {
r = _parse_col4(p_rgba, current_pos) / 15.0f;
g = _parse_col4(p_rgba, current_pos + 1) / 15.0f;
b = _parse_col4(p_rgba, current_pos + 2) / 15.0f;
a = _parse_col4(p_rgba, current_pos + 3) / 15.0f;
} else if (num_of_digits == 6) {
r = _parse_col8(p_rgba, current_pos) / 255.0f;
g = _parse_col8(p_rgba, current_pos + 2) / 255.0f;
b = _parse_col8(p_rgba, current_pos + 4) / 255.0f;
} else if (num_of_digits == 8) {
r = _parse_col8(p_rgba, current_pos) / 255.0f;
g = _parse_col8(p_rgba, current_pos + 2) / 255.0f;
b = _parse_col8(p_rgba, current_pos + 4) / 255.0f;
a = _parse_col8(p_rgba, current_pos + 6) / 255.0f;
} else { } else {
ERR_FAIL_V_MSG(Color(), "Invalid color code: " + p_rgba + "."); ERR_FAIL_V_MSG(Color(), "Invalid color code: " + p_rgba + ".");
} }
float r, g, b, a = 1.0f;
if (is_shorthand) {
r = _parse_col4(color, 0) / 15.0f;
g = _parse_col4(color, 1) / 15.0f;
b = _parse_col4(color, 2) / 15.0f;
if (alpha) {
a = _parse_col4(color, 3) / 15.0f;
}
} else {
r = _parse_col8(color, 0) / 255.0f;
g = _parse_col8(color, 2) / 255.0f;
b = _parse_col8(color, 4) / 255.0f;
if (alpha) {
a = _parse_col8(color, 6) / 255.0f;
}
}
ERR_FAIL_COND_V_MSG(r < 0.0f, Color(), "Invalid color code: " + p_rgba + "."); ERR_FAIL_COND_V_MSG(r < 0.0f, Color(), "Invalid color code: " + p_rgba + ".");
ERR_FAIL_COND_V_MSG(g < 0.0f, Color(), "Invalid color code: " + p_rgba + "."); ERR_FAIL_COND_V_MSG(g < 0.0f, Color(), "Invalid color code: " + p_rgba + ".");
ERR_FAIL_COND_V_MSG(b < 0.0f, Color(), "Invalid color code: " + p_rgba + "."); ERR_FAIL_COND_V_MSG(b < 0.0f, Color(), "Invalid color code: " + p_rgba + ".");
@ -372,9 +363,9 @@ bool Color::html_is_valid(const String &p_color) {
return false; return false;
} }
int current_pos = (color[0] == '#') ? 1 : 0; const int current_pos = (color[0] == '#') ? 1 : 0;
int len = color.length(); const int len = color.length();
int num_of_digits = len - current_pos; const int num_of_digits = len - current_pos;
if (!(num_of_digits == 3 || num_of_digits == 4 || num_of_digits == 6 || num_of_digits == 8)) { if (!(num_of_digits == 3 || num_of_digits == 4 || num_of_digits == 6 || num_of_digits == 8)) {
return false; return false;
} }