From 04b8ea5f9ed6ffbc1aa4e2a5dcd080d16d2b3a1b Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Fri, 30 Jan 2009 02:20:29 +0000
Subject: [PATCH] added main/Material module

git-svn-id: svn://anubis/fart/trunk@68 7f9b0f55-74a9-4bce-be96-3c2cd072584d
---
 main/Material.cc |  9 +++++++++
 main/Material.h  | 18 ++++++++++++++++++
 main/Scene.cc    |  1 +
 3 files changed, 28 insertions(+)
 create mode 100644 main/Material.cc
 create mode 100644 main/Material.h

diff --git a/main/Material.cc b/main/Material.cc
new file mode 100644
index 0000000..c78bd78
--- /dev/null
+++ b/main/Material.cc
@@ -0,0 +1,9 @@
+
+#include "Material.h"
+
+const Material Material::white(Color::white);
+
+Material::Material(const Color & rgb)
+{
+    m_rgb = rgb;
+}
diff --git a/main/Material.h b/main/Material.h
new file mode 100644
index 0000000..9a97c33
--- /dev/null
+++ b/main/Material.h
@@ -0,0 +1,18 @@
+
+#ifndef MATERIAL_H
+#define MATERIAL_H MATERIAL_H
+
+#include "util/Color.h"
+
+class Material
+{
+    public:
+        Material(const Color & rgb = Color::white);
+        static const Material white;
+
+    protected:
+        Color m_rgb;
+};
+
+#endif
+
diff --git a/main/Scene.cc b/main/Scene.cc
index 3458002..afc9c42 100644
--- a/main/Scene.cc
+++ b/main/Scene.cc
@@ -169,6 +169,7 @@ Color Scene::traceRay(const Ray & ray)
          it++)
     {
         /* compute the Phong lighting for each hit */
+        color = Color::white;
     }
 
     return color;