From b7a9f07d5e153db30c3e45c48f545fe6939d5919 Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Sat, 9 Aug 2014 20:46:26 -0700
Subject: [PATCH] Lots of little niggling compiler errors

---
 src/basics/color.cc  |  4 ++++
 src/basics/vector.cc |  4 ++--
 src/charles.cc       | 11 ++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/basics/color.cc b/src/basics/color.cc
index 68d1a77..f9db9cd 100644
--- a/src/basics/color.cc
+++ b/src/basics/color.cc
@@ -5,6 +5,10 @@
 
 #include <ostream>
 
+#include "basics/color.hh"
+
+#include "basics/types.hh"
+
 
 namespace charles {
 namespace basics {
diff --git a/src/basics/vector.cc b/src/basics/vector.cc
index af09696..815196c 100644
--- a/src/basics/vector.cc
+++ b/src/basics/vector.cc
@@ -252,8 +252,8 @@ LinearCombination(const Double k1, const Vector4& v1,
 /*
  * charles::basics::operator<< --
  */
-std::ostream &
-operator<<(std::ostream &os, const Vector3 &v)
+std::ostream&
+operator<<(std::ostream& os, const Vector4& v)
 {
     // Stream the vector like this: <x, y, z>
     os << "<" << v.X() << ", " << v.Y() << ", " << v.Z() << ">";
diff --git a/src/charles.cc b/src/charles.cc
index 00ccb37..d684b86 100644
--- a/src/charles.cc
+++ b/src/charles.cc
@@ -8,18 +8,19 @@
 #include <cstdio>
 #include <unistd.h>
 
-#include "basics.h"
 #include "log.hh"
 #include "light.hh"
 #include "reader_yaml.hh"
 #include "scene.hh"
 #include "writer_png.h"
+#include "basics/basics.hh"
 
 #define LOG_NAME "ROOT"
 #include "logModule.hh"
 
 
 using namespace charles;
+using namespace charles::basics;
 
 
 static void
@@ -38,8 +39,8 @@ main(int argc,
 
     Scene scene;
 
-    PointLight *l1 = new PointLight(Vector3(4.0, 6.0, 1.0), Color::White, 0.8);
-    scene.add_light(l1);
+    PointLight *l1 = new PointLight(Vector4(4.0, 6.0, 1.0), Color::White, 0.8);
+    scene.AddLight(l1);
 
     std::string logFilename;
     unsigned int logLevel = 0;
@@ -96,11 +97,11 @@ main(int argc,
 
     /* Call tracer. */
     LOG_INFO << "Beginning render";
-    scene.render();
+    scene.Render();
 
     /* Write rendered scene to PNG file. */
     PNGWriter writer;
-    scene.write(writer, outfile);
+    scene.Write(writer, outfile);
 
     if (logLevel > 0) {
         Log::Close();