aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libjin/Graphics/Color.cpp3
-rw-r--r--src/libjin/Graphics/Color.h11
2 files changed, 9 insertions, 5 deletions
diff --git a/src/libjin/Graphics/Color.cpp b/src/libjin/Graphics/Color.cpp
index 4ddbf7e..414b248 100644
--- a/src/libjin/Graphics/Color.cpp
+++ b/src/libjin/Graphics/Color.cpp
@@ -10,7 +10,8 @@ namespace graphics
const Color Color::RED = Color(255, 0, 0);
const Color Color::GREEN = Color(0, 255, 0);
const Color Color::BLUE = Color(0, 0, 255);
- const Color Color::MAGENTA = Color(255, 255, 0);
+ const Color Color::MAGENTA = Color(255, 0, 255);
+ const Color Color::YELLOW = Color(255, 255, 0);
}
} \ No newline at end of file
diff --git a/src/libjin/Graphics/Color.h b/src/libjin/Graphics/Color.h
index 170ee0b..a5bc5d0 100644
--- a/src/libjin/Graphics/Color.h
+++ b/src/libjin/Graphics/Color.h
@@ -23,6 +23,7 @@ namespace graphics
static const Color GREEN;
static const Color BLUE;
static const Color MAGENTA;
+ static const Color YELLOW;
Color() { r = g = b = a = 0; };
@@ -63,11 +64,13 @@ namespace graphics
return !(r == c.r && g == c.g && b == c.b && a == c.a);
}
- #if LIBJIN_BYTEORDER == LIBJIN_BIG_ENDIAN
unsigned char r, g, b, a;
- #else
- unsigned char a, b, g, r;
- #endif
+
+ //#if LIBJIN_BYTEORDER == LIBJIN_BIG_ENDIAN
+ // unsigned char r, g, b, a;
+ //#else
+ // unsigned char a, b, g, r;
+ //#endif
};