Rename colour to color in public API code

* Following the principle of least surprise, color tends to be more
  commonly used in APIs and graphics code even outside the USA.
This commit is contained in:
baldurk
2017-04-18 14:57:37 +01:00
parent d94f387399
commit 637d4089e2
47 changed files with 149 additions and 150 deletions
+3 -3
View File
@@ -64,7 +64,7 @@ struct MeshFormat
bool32 bgraOrder;
SpecialFormat specialFormat;
FloatVector meshColour;
FloatVector meshColor;
bool showAlpha;
@@ -127,8 +127,8 @@ struct TextureDisplay
float offx, offy;
FloatVector lightBackgroundColour;
FloatVector darkBackgroundColour;
FloatVector lightBackgroundColor;
FloatVector darkBackgroundColor;
DebugOverlay overlay;
};
+2 -2
View File
@@ -374,7 +374,7 @@ struct DrawcallDescription
eventID = 0;
drawcallID = 0;
flags = DrawFlags::NoFlags;
markerColour[0] = markerColour[1] = markerColour[2] = markerColour[3] = 0.0f;
markerColor[0] = markerColor[1] = markerColor[2] = markerColor[3] = 0.0f;
numIndices = 0;
numInstances = 0;
indexOffset = 0;
@@ -406,7 +406,7 @@ struct DrawcallDescription
DrawFlags flags;
float markerColour[4];
float markerColor[4];
uint32_t numIndices;
uint32_t numInstances;
+4 -4
View File
@@ -274,7 +274,7 @@ enum class ShaderBuiltin : uint32_t
PatchNumVertices,
OuterTessFactor,
InsideTessFactor,
ColourOutput,
ColorOutput,
DepthOutput,
DepthOutputGreaterEqual,
DepthOutputLessEqual,
@@ -335,7 +335,7 @@ enum class AlphaMapping : uint32_t
{
Discard,
First = Discard,
BlendToColour,
BlendToColor,
BlendToCheckerboard,
Preserve,
Count,
@@ -621,7 +621,7 @@ enum class ResourceUsage : uint32_t
All_RWResource,
InputTarget,
ColourTarget,
ColorTarget,
DepthStencilTarget,
Indirect,
@@ -696,7 +696,7 @@ enum class DrawFlags : uint32_t
Instanced = 0x020000,
Auto = 0x040000,
Indirect = 0x080000,
ClearColour = 0x100000,
ClearColor = 0x100000,
ClearDepthStencil = 0x200000,
BeginPass = 0x400000,
EndPass = 0x800000,