accomodate the new modules

1 files changed, 11 insertions, 9 deletions

diff --git a/src/gl/box.h b/src/gl/box.h
index 8fb4c45..ce4a650 100644
--- a/src/gl/box.h
+++ b/src/gl/box.h
@@ -4,10 +4,11 @@
    the terms of the GNU General Public License version 2 
 */
 
-#ifndef __INCLUDED_BOX_H__
-#define __INCLUDED_BOX_H__
+#ifndef __INCLUDED_GL_BOX_H__
+#define __INCLUDED_GL_BOX_H__
 
-#include "osiriongl.h"
+#include "gl/gllib.h"
+#include "math/mathlib.h"
 
 namespace gl {
 
@@ -16,7 +17,7 @@ class Box
 {
 public:
 	/// create a new standard cube with edge length 1
-	Box(Vector3f const & tl, Vector3f const &br);
+	Box(math::Vector3f const & tl, math::Vector3f const &br);
 	/// copy constructor
 	Box(const Box &other);
 	
@@ -24,19 +25,20 @@ public:
  	Box& operator=(const Box &other);
 
 	/// top left vertex (1,1,1)
-	Vector3f topleft;
+	math::Vector3f topleft;
 	/// bottom right vertex (-1,-1,-1)
-	Vector3f bottomright;
+	math::Vector3f bottomright;
 
 	/// draw the block
 	void draw();
 
 	/// Top color
-	Color topcolor;
+	math::Color topcolor;
 	/// bottom color
-	Color bottomcolor;
+	math::Color bottomcolor;
 };
 
 } // namespace gl
 
-#endif // __INCLUDED_BOX_H__
+#endif // __INCLUDED_GL_BOX_H__
+