Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename color constants #41019

Closed
wants to merge 29 commits into from
Closed

Rename color constants #41019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
ed9cdc5
Correct C# named color constants
Aug 4, 2020
e0dedf8
Correct C++ named colors
Aug 4, 2020
4e1e13e
Correct Color GDScript docs
Aug 4, 2020
3b11808
Add the pedantic versions of color names
Aug 4, 2020
c37a4df
Update, per suggestions to stick with .NET, X11, HTML5 schemes
Aug 4, 2020
530e98d
Replace the weird comment
Aug 5, 2020
65d3e2e
Arrange entries in lexicographic order
Aug 5, 2020
bd709b4
Replace with UPPERCASE_NAMES
Aug 5, 2020
0b0617e
Separate UPPERCASE_NAMES map for sole use in _VariantCall
Aug 5, 2020
7458a37
Acknowledge Microsoft .NET docs
Aug 5, 2020
c5992d9
Implement new normalisation, change back _VariantCall, remove old names
Aug 5, 2020
502186e
Remove commented code from color.cpp
Aug 13, 2020
b23e333
Implement _to_uppercase_name for transforming normalised names to UPP…
Aug 13, 2020
479201d
Fix wrong index
Aug 13, 2020
814aa76
Rename append -> insert
Aug 13, 2020
2c5d7d9
Use Godot Vectors
Aug 13, 2020
534d434
Debug using print
Aug 13, 2020
d8ce60c
Debug using prints
Aug 13, 2020
d098dc1
Correct implementation
Aug 13, 2020
1059469
Make alpha of "transparent: a float literal
Aug 13, 2020
63526de
Separate the transformation code to a new .inc file to prevent linker…
Aug 16, 2020
2f3f285
Add deepksyblue as an edge case
Aug 16, 2020
f63dab2
Make _to_uppercase_name() static as intended
Aug 16, 2020
ec06353
Add descriptive comments and remove Vectors
Nov 15, 2020
b321a2f
Merge pull request #1 from godotengine/master
Nov 15, 2020
85312e9
Merge branch 'master' of https://github.com/ShivamMukherjee/godot
Nov 15, 2020
50fb362
Adopt changes with new code organisation
Nov 15, 2020
d2033a2
Remove to_lower transformation
Nov 15, 2020
acd7168
Remove transformation code
Nov 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
295 changes: 148 additions & 147 deletions core/math/color_names.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Names from https://en.wikipedia.org/wiki/X11_color_names
// and https://docs.microsoft.com/en-us/dotnet/api/system.windows.media.colors?view=netcore-3.1

// So this in a way that does not require memory allocation
// the old way leaked memory
Expand All @@ -10,151 +11,151 @@ struct NamedColor {
};

static NamedColor named_colors[] = {
{ "aliceblue", Color(0.94, 0.97, 1.00) },
{ "antiquewhite", Color(0.98, 0.92, 0.84) },
{ "aqua", Color(0.00, 1.00, 1.00) },
{ "aquamarine", Color(0.50, 1.00, 0.83) },
{ "azure", Color(0.94, 1.00, 1.00) },
{ "beige", Color(0.96, 0.96, 0.86) },
{ "bisque", Color(1.00, 0.89, 0.77) },
{ "black", Color(0.00, 0.00, 0.00) },
{ "blanchedalmond", Color(1.00, 0.92, 0.80) },
{ "blue", Color(0.00, 0.00, 1.00) },
{ "blueviolet", Color(0.54, 0.17, 0.89) },
{ "brown", Color(0.65, 0.16, 0.16) },
{ "burlywood", Color(0.87, 0.72, 0.53) },
{ "cadetblue", Color(0.37, 0.62, 0.63) },
{ "chartreuse", Color(0.50, 1.00, 0.00) },
{ "chocolate", Color(0.82, 0.41, 0.12) },
{ "coral", Color(1.00, 0.50, 0.31) },
{ "cornflower", Color(0.39, 0.58, 0.93) },
{ "cornsilk", Color(1.00, 0.97, 0.86) },
{ "crimson", Color(0.86, 0.08, 0.24) },
{ "cyan", Color(0.00, 1.00, 1.00) },
{ "darkblue", Color(0.00, 0.00, 0.55) },
{ "darkcyan", Color(0.00, 0.55, 0.55) },
{ "darkgoldenrod", Color(0.72, 0.53, 0.04) },
{ "darkgray", Color(0.66, 0.66, 0.66) },
{ "darkgreen", Color(0.00, 0.39, 0.00) },
{ "darkkhaki", Color(0.74, 0.72, 0.42) },
{ "darkmagenta", Color(0.55, 0.00, 0.55) },
{ "darkolivegreen", Color(0.33, 0.42, 0.18) },
{ "darkorange", Color(1.00, 0.55, 0.00) },
{ "darkorchid", Color(0.60, 0.20, 0.80) },
{ "darkred", Color(0.55, 0.00, 0.00) },
{ "darksalmon", Color(0.91, 0.59, 0.48) },
{ "darkseagreen", Color(0.56, 0.74, 0.56) },
{ "darkslateblue", Color(0.28, 0.24, 0.55) },
{ "darkslategray", Color(0.18, 0.31, 0.31) },
{ "darkturquoise", Color(0.00, 0.81, 0.82) },
{ "darkviolet", Color(0.58, 0.00, 0.83) },
{ "deeppink", Color(1.00, 0.08, 0.58) },
{ "deepskyblue", Color(0.00, 0.75, 1.00) },
{ "dimgray", Color(0.41, 0.41, 0.41) },
{ "dodgerblue", Color(0.12, 0.56, 1.00) },
{ "firebrick", Color(0.70, 0.13, 0.13) },
{ "floralwhite", Color(1.00, 0.98, 0.94) },
{ "forestgreen", Color(0.13, 0.55, 0.13) },
{ "fuchsia", Color(1.00, 0.00, 1.00) },
{ "gainsboro", Color(0.86, 0.86, 0.86) },
{ "ghostwhite", Color(0.97, 0.97, 1.00) },
{ "gold", Color(1.00, 0.84, 0.00) },
{ "goldenrod", Color(0.85, 0.65, 0.13) },
{ "gray", Color(0.75, 0.75, 0.75) },
{ "green", Color(0.00, 1.00, 0.00) },
{ "greenyellow", Color(0.68, 1.00, 0.18) },
{ "honeydew", Color(0.94, 1.00, 0.94) },
{ "hotpink", Color(1.00, 0.41, 0.71) },
{ "indianred", Color(0.80, 0.36, 0.36) },
{ "indigo", Color(0.29, 0.00, 0.51) },
{ "ivory", Color(1.00, 1.00, 0.94) },
{ "khaki", Color(0.94, 0.90, 0.55) },
{ "lavender", Color(0.90, 0.90, 0.98) },
{ "lavenderblush", Color(1.00, 0.94, 0.96) },
{ "lawngreen", Color(0.49, 0.99, 0.00) },
{ "lemonchiffon", Color(1.00, 0.98, 0.80) },
{ "lightblue", Color(0.68, 0.85, 0.90) },
{ "lightcoral", Color(0.94, 0.50, 0.50) },
{ "lightcyan", Color(0.88, 1.00, 1.00) },
{ "lightgoldenrod", Color(0.98, 0.98, 0.82) },
{ "lightgray", Color(0.83, 0.83, 0.83) },
{ "lightgreen", Color(0.56, 0.93, 0.56) },
{ "lightpink", Color(1.00, 0.71, 0.76) },
{ "lightsalmon", Color(1.00, 0.63, 0.48) },
{ "lightseagreen", Color(0.13, 0.70, 0.67) },
{ "lightskyblue", Color(0.53, 0.81, 0.98) },
{ "lightslategray", Color(0.47, 0.53, 0.60) },
{ "lightsteelblue", Color(0.69, 0.77, 0.87) },
{ "lightyellow", Color(1.00, 1.00, 0.88) },
{ "lime", Color(0.00, 1.00, 0.00) },
{ "limegreen", Color(0.20, 0.80, 0.20) },
{ "linen", Color(0.98, 0.94, 0.90) },
{ "magenta", Color(1.00, 0.00, 1.00) },
{ "maroon", Color(0.69, 0.19, 0.38) },
{ "mediumaquamarine", Color(0.40, 0.80, 0.67) },
{ "mediumblue", Color(0.00, 0.00, 0.80) },
{ "mediumorchid", Color(0.73, 0.33, 0.83) },
{ "mediumpurple", Color(0.58, 0.44, 0.86) },
{ "mediumseagreen", Color(0.24, 0.70, 0.44) },
{ "mediumslateblue", Color(0.48, 0.41, 0.93) },
{ "mediumspringgreen", Color(0.00, 0.98, 0.60) },
{ "mediumturquoise", Color(0.28, 0.82, 0.80) },
{ "mediumvioletred", Color(0.78, 0.08, 0.52) },
{ "midnightblue", Color(0.10, 0.10, 0.44) },
{ "mintcream", Color(0.96, 1.00, 0.98) },
{ "mistyrose", Color(1.00, 0.89, 0.88) },
{ "moccasin", Color(1.00, 0.89, 0.71) },
{ "navajowhite", Color(1.00, 0.87, 0.68) },
{ "navyblue", Color(0.00, 0.00, 0.50) },
{ "oldlace", Color(0.99, 0.96, 0.90) },
{ "olive", Color(0.50, 0.50, 0.00) },
{ "olivedrab", Color(0.42, 0.56, 0.14) },
{ "orange", Color(1.00, 0.65, 0.00) },
{ "orangered", Color(1.00, 0.27, 0.00) },
{ "orchid", Color(0.85, 0.44, 0.84) },
{ "palegoldenrod", Color(0.93, 0.91, 0.67) },
{ "palegreen", Color(0.60, 0.98, 0.60) },
{ "paleturquoise", Color(0.69, 0.93, 0.93) },
{ "palevioletred", Color(0.86, 0.44, 0.58) },
{ "papayawhip", Color(1.00, 0.94, 0.84) },
{ "peachpuff", Color(1.00, 0.85, 0.73) },
{ "peru", Color(0.80, 0.52, 0.25) },
{ "pink", Color(1.00, 0.75, 0.80) },
{ "plum", Color(0.87, 0.63, 0.87) },
{ "powderblue", Color(0.69, 0.88, 0.90) },
{ "purple", Color(0.63, 0.13, 0.94) },
{ "rebeccapurple", Color(0.40, 0.20, 0.60) },
{ "red", Color(1.00, 0.00, 0.00) },
{ "rosybrown", Color(0.74, 0.56, 0.56) },
{ "royalblue", Color(0.25, 0.41, 0.88) },
{ "saddlebrown", Color(0.55, 0.27, 0.07) },
{ "salmon", Color(0.98, 0.50, 0.45) },
{ "sandybrown", Color(0.96, 0.64, 0.38) },
{ "seagreen", Color(0.18, 0.55, 0.34) },
{ "seashell", Color(1.00, 0.96, 0.93) },
{ "sienna", Color(0.63, 0.32, 0.18) },
{ "silver", Color(0.75, 0.75, 0.75) },
{ "skyblue", Color(0.53, 0.81, 0.92) },
{ "slateblue", Color(0.42, 0.35, 0.80) },
{ "slategray", Color(0.44, 0.50, 0.56) },
{ "snow", Color(1.00, 0.98, 0.98) },
{ "springgreen", Color(0.00, 1.00, 0.50) },
{ "steelblue", Color(0.27, 0.51, 0.71) },
{ "tan", Color(0.82, 0.71, 0.55) },
{ "teal", Color(0.00, 0.50, 0.50) },
{ "thistle", Color(0.85, 0.75, 0.85) },
{ "tomato", Color(1.00, 0.39, 0.28) },
{ "transparent", Color(1.00, 1.00, 1.00, 0.00) },
{ "turquoise", Color(0.25, 0.88, 0.82) },
{ "violet", Color(0.93, 0.51, 0.93) },
{ "webgray", Color(0.50, 0.50, 0.50) },
{ "webgreen", Color(0.00, 0.50, 0.00) },
{ "webmaroon", Color(0.50, 0.00, 0.00) },
{ "webpurple", Color(0.50, 0.00, 0.50) },
{ "wheat", Color(0.96, 0.87, 0.70) },
{ "white", Color(1.00, 1.00, 1.00) },
{ "whitesmoke", Color(0.96, 0.96, 0.96) },
{ "yellow", Color(1.00, 1.00, 0.00) },
{ "yellowgreen", Color(0.60, 0.80, 0.20) },
{ nullptr, Color(0.60, 0.80, 0.20) },
{ "aliceblue", Color(0.94f, 0.97f, 1.00f) },
{ "antiquewhite", Color(0.98f, 0.92f, 0.84f) },
{ "aqua", Color(0.00f, 1.00f, 1.00f) },
{ "aquamarine", Color(0.50f, 1.00f, 0.83f) },
{ "azure", Color(0.94f, 1.00f, 1.00f) },
{ "beige", Color(0.96f, 0.96f, 0.86f) },
{ "bisque", Color(1.00f, 0.89f, 0.77f) },
{ "black", Color(0.00f, 0.00f, 0.00f) },
{ "blanchedalmond", Color(1.00f, 0.92f, 0.80f) },
{ "blue", Color(0.00f, 0.00f, 1.00f) },
{ "blueviolet", Color(0.54f, 0.17f, 0.89f) },
{ "brown", Color(0.65f, 0.16f, 0.16f) },
{ "burlywood", Color(0.87f, 0.72f, 0.53f) },
{ "cadetblue", Color(0.37f, 0.62f, 0.63f) },
{ "chartreuse", Color(0.50f, 1.00f, 0.00f) },
{ "chocolate", Color(0.82f, 0.41f, 0.12f) },
{ "coral", Color(1.00f, 0.50f, 0.31f) },
{ "cornflowerblue", Color(0.39f, 0.58f, 0.93f) },
{ "cornsilk", Color(1.00f, 0.97f, 0.86f) },
{ "crimson", Color(0.86f, 0.08f, 0.24f) },
{ "cyan", Color(0.00f, 1.00f, 1.00f) },
{ "darkblue", Color(0.00f, 0.00f, 0.55f) },
{ "darkcyan", Color(0.00f, 0.55f, 0.55f) },
{ "darkgoldenrod", Color(0.72f, 0.53f, 0.04f) },
{ "darkgray", Color(0.66f, 0.66f, 0.66f) },
{ "darkgreen", Color(0.00f, 0.39f, 0.00f) },
{ "darkkhaki", Color(0.74f, 0.72f, 0.42f) },
{ "darkmagenta", Color(0.55f, 0.00f, 0.55f) },
{ "darkolivegreen", Color(0.33f, 0.42f, 0.18f) },
{ "darkorange", Color(1.00f, 0.55f, 0.00f) },
{ "darkorchid", Color(0.60f, 0.20f, 0.80f) },
{ "darkred", Color(0.55f, 0.00f, 0.00f) },
{ "darksalmon", Color(0.91f, 0.59f, 0.48f) },
{ "darkseagreen", Color(0.56f, 0.74f, 0.56f) },
{ "darkslateblue", Color(0.28f, 0.24f, 0.55f) },
{ "darkslategray", Color(0.18f, 0.31f, 0.31f) },
{ "darkturquoise", Color(0.00f, 0.81f, 0.82f) },
{ "darkviolet", Color(0.58f, 0.00f, 0.83f) },
{ "deeppink", Color(1.00f, 0.08f, 0.58f) },
{ "deepskyblue", Color(0.00f, 0.75f, 1.00f) },
{ "dimgray", Color(0.41f, 0.41f, 0.41f) },
{ "dodgerblue", Color(0.12f, 0.56f, 1.00f) },
{ "firebrick", Color(0.70f, 0.13f, 0.13f) },
{ "floralwhite", Color(1.00f, 0.98f, 0.94f) },
{ "forestgreen", Color(0.13f, 0.55f, 0.13f) },
{ "fuchsia", Color(1.00f, 0.00f, 1.00f) },
{ "gainsboro", Color(0.86f, 0.86f, 0.86f) },
{ "ghostwhite", Color(0.97f, 0.97f, 1.00f) },
{ "gold", Color(1.00f, 0.84f, 0.00f) },
{ "goldenrod", Color(0.85f, 0.65f, 0.13f) },
{ "gray", Color(0.75f, 0.75f, 0.75f) },
{ "green", Color(0.00f, 1.00f, 0.00f) },
{ "greenyellow", Color(0.68f, 1.00f, 0.18f) },
{ "honeydew", Color(0.94f, 1.00f, 0.94f) },
{ "hotpink", Color(1.00f, 0.41f, 0.71f) },
{ "indianred", Color(0.80f, 0.36f, 0.36f) },
{ "indigo", Color(0.29f, 0.00f, 0.51f) },
{ "ivory", Color(1.00f, 1.00f, 0.94f) },
{ "khaki", Color(0.94f, 0.90f, 0.55f) },
{ "lavender", Color(0.90f, 0.90f, 0.98f) },
{ "lavenderblush", Color(1.00f, 0.94f, 0.96f) },
{ "lawngreen", Color(0.49f, 0.99f, 0.00f) },
{ "lemonchiffon", Color(1.00f, 0.98f, 0.80f) },
{ "lightblue", Color(0.68f, 0.85f, 0.90f) },
{ "lightcoral", Color(0.94f, 0.50f, 0.50f) },
{ "lightcyan", Color(0.88f, 1.00f, 1.00f) },
{ "lightgoldenrod", Color(0.98f, 0.98f, 0.82f) },
{ "lightgray", Color(0.83f, 0.83f, 0.83f) },
{ "lightgreen", Color(0.56f, 0.93f, 0.56f) },
{ "lightpink", Color(1.00f, 0.71f, 0.76f) },
{ "lightsalmon", Color(1.00f, 0.63f, 0.48f) },
{ "lightseagreen", Color(0.13f, 0.70f, 0.67f) },
{ "lightskyblue", Color(0.53f, 0.81f, 0.98f) },
{ "lightslategray", Color(0.47f, 0.53f, 0.60f) },
{ "lightsteelblue", Color(0.69f, 0.77f, 0.87f) },
{ "lightyellow", Color(1.00f, 1.00f, 0.88f) },
{ "lime", Color(0.00f, 1.00f, 0.00f) },
{ "limegreen", Color(0.20f, 0.80f, 0.20f) },
{ "linen", Color(0.98f, 0.94f, 0.90f) },
{ "magenta", Color(1.00f, 0.00f, 1.00f) },
{ "maroon", Color(0.69f, 0.19f, 0.38f) },
{ "mediumaquamarine", Color(0.40f, 0.80f, 0.67f) },
{ "mediumblue", Color(0.00f, 0.00f, 0.80f) },
{ "mediumorchid", Color(0.73f, 0.33f, 0.83f) },
{ "mediumpurple", Color(0.58f, 0.44f, 0.86f) },
{ "mediumseagreen", Color(0.24f, 0.70f, 0.44f) },
{ "mediumslateblue", Color(0.48f, 0.41f, 0.93f) },
{ "mediumspringgreen", Color(0.00f, 0.98f, 0.60f) },
{ "mediumturquoise", Color(0.28f, 0.82f, 0.80f) },
{ "mediumvioletred", Color(0.78f, 0.08f, 0.52f) },
{ "midnightblue", Color(0.10f, 0.10f, 0.44f) },
{ "mintcream", Color(0.96f, 1.00f, 0.98f) },
{ "mistyrose", Color(1.00f, 0.89f, 0.88f) },
{ "moccasin", Color(1.00f, 0.89f, 0.71f) },
{ "navajowhite", Color(1.00f, 0.87f, 0.68f) },
{ "navyblue", Color(0.00f, 0.00f, 0.50f) },
{ "oldlace", Color(0.99f, 0.96f, 0.90f) },
{ "olive", Color(0.50f, 0.50f, 0.00f) },
{ "olivedrab", Color(0.42f, 0.56f, 0.14f) },
{ "orange", Color(1.00f, 0.65f, 0.00f) },
{ "orangered", Color(1.00f, 0.27f, 0.00f) },
{ "orchid", Color(0.85f, 0.44f, 0.84f) },
{ "palegoldenrod", Color(0.93f, 0.91f, 0.67f) },
{ "palegreen", Color(0.60f, 0.98f, 0.60f) },
{ "paleturquoise", Color(0.69f, 0.93f, 0.93f) },
{ "palevioletred", Color(0.86f, 0.44f, 0.58f) },
{ "papayawhip", Color(1.00f, 0.94f, 0.84f) },
{ "peachpuff", Color(1.00f, 0.85f, 0.73f) },
{ "peru", Color(0.80f, 0.52f, 0.25f) },
{ "pink", Color(1.00f, 0.75f, 0.80f) },
{ "plum", Color(0.87f, 0.63f, 0.87f) },
{ "powderblue", Color(0.69f, 0.88f, 0.90f) },
{ "purple", Color(0.63f, 0.13f, 0.94f) },
{ "rebeccapurple", Color(0.40f, 0.20f, 0.60f) },
{ "red", Color(1.00f, 0.00f, 0.00f) },
{ "rosybrown", Color(0.74f, 0.56f, 0.56f) },
{ "royalblue", Color(0.25f, 0.41f, 0.88f) },
{ "saddlebrown", Color(0.55f, 0.27f, 0.07f) },
{ "salmon", Color(0.98f, 0.50f, 0.45f) },
{ "sandybrown", Color(0.96f, 0.64f, 0.38f) },
{ "seagreen", Color(0.18f, 0.55f, 0.34f) },
{ "seashell", Color(1.00f, 0.96f, 0.93f) },
{ "sienna", Color(0.63f, 0.32f, 0.18f) },
{ "silver", Color(0.75f, 0.75f, 0.75f) },
{ "skyblue", Color(0.53f, 0.81f, 0.92f) },
{ "slateblue", Color(0.42f, 0.35f, 0.80f) },
{ "slategray", Color(0.44f, 0.50f, 0.56f) },
{ "snow", Color(1.00f, 0.98f, 0.98f) },
{ "springgreen", Color(0.00f, 1.00f, 0.50f) },
{ "steelblue", Color(0.27f, 0.51f, 0.71f) },
{ "tan", Color(0.82f, 0.71f, 0.55f) },
{ "teal", Color(0.00f, 0.50f, 0.50f) },
{ "thistle", Color(0.85f, 0.75f, 0.85f) },
{ "tomato", Color(1.00f, 0.39f, 0.28f) },
{ "turquoise", Color(0.25f, 0.88f, 0.82f) },
{ "transparent", Color(1.00f, 1.00f, 1.00f, 0.00f) },
{ "violet", Color(0.93f, 0.51f, 0.93f) },
{ "webgray", Color(0.50f, 0.50f, 0.50f) },
{ "webgreen", Color(0.00f, 0.50f, 0.00f) },
{ "webmaroon", Color(0.50f, 0.00f, 0.00f) },
{ "webpurple", Color(0.50f, 0.00f, 0.50f) },
{ "wheat", Color(0.96f, 0.87f, 0.70f) },
{ "white", Color(1.00f, 1.00f, 1.00f) },
{ "whitesmoke", Color(0.96f, 0.96f, 0.96f) },
{ "yellow", Color(1.00f, 1.00f, 0.00f) },
{ "yellowgreen", Color(0.60f, 0.80f, 0.20f) },
{ nullptr, Color(0.60f, 0.80f, 0.20f) }
};
Loading