Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 947 vs 1004 for /trunk/Source Code/Utility/Headers/Colours.h

Diff revisions: vs.
  @@ -38,20 +38,20 @@
38 38 namespace DefaultColours {
39 39
40 40 /// Random stuff added for convenience
41 - static vec4<F32> WHITE(1.0f, 1.0f, 1.0f, 1.0f);
42 - static vec4<F32> BLACK(0.0f, 0.0f, 0.0f, 1.0f);
43 - static vec4<F32> RED (1.0f, 0.0f, 0.0f, 1.0f);
44 - static vec4<F32> GREEN(0.0f, 1.0f, 0.0f, 1.0f);
45 - static vec4<F32> BLUE (0.0f, 0.0f, 1.0f, 1.0f);
41 + static FColour WHITE(1.0f, 1.0f, 1.0f, 1.0f);
42 + static FColour BLACK(0.0f, 0.0f, 0.0f, 1.0f);
43 + static FColour RED (1.0f, 0.0f, 0.0f, 1.0f);
44 + static FColour GREEN(0.0f, 1.0f, 0.0f, 1.0f);
45 + static FColour BLUE (0.0f, 0.0f, 1.0f, 1.0f);
46 46
47 - static vec4<U8> WHITE_U8(255, 255, 255, 255);
48 - static vec4<U8> BLACK_U8(0, 0, 0, 255);
49 - static vec4<U8> RED_U8 (255, 0, 0, 255);
50 - static vec4<U8> GREEN_U8(0, 255, 0, 255);
51 - static vec4<U8> BLUE_U8 (0, 0, 255, 255);
47 + static UColour WHITE_U8(255, 255, 255, 255);
48 + static UColour BLACK_U8(0, 0, 0, 255);
49 + static UColour RED_U8 (255, 0, 0, 255);
50 + static UColour GREEN_U8(0, 255, 0, 255);
51 + static UColour BLUE_U8 (0, 0, 255, 255);
52 52
53 - static vec4<F32> DIVIDE_BLUE(0.1f, 0.1f, 0.8f, 1.0f);
54 - static vec4<U8> DIVIDE_BLUE_U8(26, 26, 204, 255);
53 + static FColour DIVIDE_BLUE(0.1f, 0.1f, 0.8f, 1.0f);
54 + static UColour DIVIDE_BLUE_U8(26, 26, 204, 255);
55 55
56 56 inline vec4<U8> RANDOM() {
57 57 return vec4<U8>(Random<U8>(255),