moved main/Material to util/Material

git-svn-id: svn://anubis/fart/trunk@136 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-02-19 18:45:52 +00:00 · 2009-02-19 18:45:52 +00:00 · cda03ad45a
commit cda03ad45a
parent 7f9547c010
5 changed files with 4 additions and 3 deletions
--- a/main/Lighting.h
+++ b/main/Lighting.h
@ -3,9 +3,9 @@
 #define LIGHTING_H LIGHTING_H

 #include "Light.h"
-#include "Material.h"
 #include "util/Ray.h"
 #include "util/Color.h"
+#include "util/Material.h"
 #include "util/refptr.h"
 #include <vector>

--- a/main/Scene.h
+++ b/main/Scene.h
@ -9,6 +9,7 @@
 #include "util/refptr.h"
 #include "util/Ray.h"
 #include "util/Color.h"
+#include "util/Material.h"
 #include "shapes/Shape.h"
 #include "Light.h"

--- a/shapes/Shape.h
+++ b/shapes/Shape.h
@ -6,7 +6,7 @@
 #include "util/Ray.h"
 #include "util/Vector.h"
 #include "util/Transform.h"
-#include "main/Material.h"
+#include "util/Material.h"
 #include "util/refptr.h"
 #include <vector>

--- a/util/Material.cc
+++ b/util/Material.cc
--- a/util/Material.h
+++ b/util/Material.h
@ -2,7 +2,7 @@
 #ifndef MATERIAL_H
 #define MATERIAL_H MATERIAL_H

-#include "util/Color.h"
+#include "Color.h"

 class Material
 {