added Color::yellow, finished shapes/Box, added a couple boxes to sample scene

git-svn-id: svn://anubis/fart/trunk@121 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
Josh Holtrop committed 2009-02-17 05:36:48 +00:00
1 parent 13fedccf4c
commit 4b0f506522
5 files changed
+29 -4

No files matched your search

+1
View File
@@ -6,6 +6,7 @@ const Color Color::white = Color(1, 1, 1);
const Color Color::red = Color(1, 0, 0);
const Color Color::green = Color(0, 1, 0);
const Color Color::blue = Color(0, 0, 1);
const Color Color::yellow = Color(1, 1, 0);
Color::Color()
{
+1
View File
@@ -25,6 +25,7 @@ class Color
static const Color red;
static const Color green;
static const Color blue;
static const Color yellow;
};
Color operator+(const Color & c1, const Color & c2);