From c3da70cdd9daedbb6e507161a766050acbc6d760 Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Sat, 9 Aug 2014 20:34:23 -0700
Subject: [PATCH] Clean up some dependencies between scene, material, and color

---
 src/material.hh |  4 ++--
 src/object.hh   |  4 +---
 src/scene.cc    |  3 ++-
 src/scene.hh    | 11 ++++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/material.hh b/src/material.hh
index e154a32..64feb5c 100644
--- a/src/material.hh
+++ b/src/material.hh
@@ -46,12 +46,12 @@ private:
     // Diffuse parameters.
     DiffuseShaderModel mDiffuseModel;
     Double mDiffuseIntensity;
-    Color mDiffuseColor;
+    basics::Color mDiffuseColor;
 
     // Specular parameters.
     SpecularShaderModel mSpecularModel;
     Double mSpecularIntensity;
-    Color mSpecularColor;
+    basics::Color mSpecularColor;
 };
 
 } /* namespace charles */
diff --git a/src/object.hh b/src/object.hh
index 4ac3225..6696d72 100644
--- a/src/object.hh
+++ b/src/object.hh
@@ -10,10 +10,8 @@
 #include <memory>
 #include <vector>
 
-#include "material.h"
+#include "material.hh"
 #include "stats.hh"
-#include "texture.h"
-#include "types.hh"
 #include "basics/basics.hh"
 
 
diff --git a/src/scene.cc b/src/scene.cc
index d64a05a..49d1aea 100644
--- a/src/scene.cc
+++ b/src/scene.cc
@@ -13,7 +13,7 @@
 #include "scene.hh"
 
 #include "basics.h"
-#include "light.h"
+#include "light.hh"
 #include "log.hh"
 #include "object.hh"
 #include "writer.h"
@@ -23,6 +23,7 @@
 #include "logModule.hh"
 
 
+using charles::basics::Color;
 using charles::basics::Ray;
 using charles::basics::Vector4;
 
diff --git a/src/scene.hh b/src/scene.hh
index e1f428d..7283d62 100644
--- a/src/scene.hh
+++ b/src/scene.hh
@@ -11,6 +11,7 @@
 
 #include "camera.hh"
 #include "light.hh"
+#include "lightPoint.hh"
 #include "object.hh"
 #include "stats.hh"
 #include "basics/basics.hh"
@@ -42,16 +43,16 @@ struct Scene
 
     void Render();
     bool IsRendered() const;
-    const Color* GetPixels() const;
+    const basics::Color* GetPixels() const;
 
     AmbientLight& GetAmbient();
     void AddObject(Object::Ptr obj);
     void AddLight(PointLight* light);
 
 private:
-    Color TraceRay(const basics::Ray &ray,
-                   const int depth = 0,
-                   const Double weight = 1.0);
+    basics::Color TraceRay(const basics::Ray &ray,
+                           const int depth = 0,
+                           const Double weight = 1.0);
 
     void LogCamera() const;
     void LogObjects() const;
@@ -78,7 +79,7 @@ private:
 
     // Rendering output.
     bool mIsRendered;
-    Color *mPixels;
+    basics::Color *mPixels;
 };
 
 } /* namespace charles */