Removed redundant headers - reduced build time.

include/ForwardDeclarations.h

@@ -1,6 +1,8 @@
 #ifndef __ForwardDeclarations_H__
 #define __ForwardDeclarations_H__
 
+#include "boost/cstdint.hpp"
+
 namespace PolyVox
 {
 	class Block;
@@ -12,7 +14,23 @@ namespace PolyVox
 	class SurfaceTriange;
 	class SurfaceTypes;
 	class SurfaceVertex;
-	class Vector;
+	template <boost::uint32_t Size, typename Type> class Vector;
+	typedef Vector<2,float> Vector2DFloat;
+    typedef Vector<2,double> Vector2DDouble;
+	typedef Vector<2,boost::int32_t> Vector2DInt32;
+	typedef Vector<2,boost::uint32_t> Vector2DUint32;
+	typedef Vector<3,float> Vector3DFloat;
+    typedef Vector<3,double> Vector3DDouble;
+	typedef Vector<3,boost::int32_t> Vector3DInt32;
+	typedef Vector<3,boost::uint32_t> Vector3DUint32;
+	/*class Vector2DFloat;
+	class Vector2DDouble;
+	class Vector2DInt32;
+	class Vector2DUint32;
+	class Vector3DFloat;
+	class Vector3DDouble;
+	class Vector3DInt32;
+	class Vector3DUint32;*/
 	class Volume;
 	class VolumeIterator;
 }

include/IndexedSurfacePatch.h

@@ -6,8 +6,7 @@
 #include "boost/cstdint.hpp"
 
 #include "Constants.h"
-#include "SurfaceTypes.h"
+#include "ForwardDeclarations.h"
-#include "SurfaceVertex.h"
 #include "TypeDef.h"
 
 namespace PolyVox

include/PolyVoxSceneManager.h

@@ -24,13 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "boost/cstdint.hpp"
 
 #include "Constants.h"
-#include "IndexedSurfacePatch.h"
+#include "ForwardDeclarations.h"
-#include "SurfaceTriangle.h"
 #include "TypeDef.h"
-#include "Volume.h"
-#include "SurfaceVertex.h"
-#include "RegionGeometry.h"
-#include "Vector.h"
 
 namespace PolyVox
 {	

include/RegionGeometry.h

@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define __RegionGeometry_H__
 
 #include "IndexedSurfacePatch.h"
+#include "Vector.h"
 
 namespace PolyVox
 {

include/SurfaceVertex.h

@@ -20,9 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #ifndef __SurfaceVertex_H__
 #define __SurfaceVertex_H__
 
-#include "TypeDef.h"
-
 #include "SurfaceTypes.h"
+#include "TypeDef.h"
 #include "Vector.h"
 
 namespace PolyVox

include/Vector.h

@@ -1,10 +1,10 @@
 #ifndef VECTOR_HEADER_INCLUDED
 #define VECTOR_HEADER_INCLUDED
 
-#include <boost\operators.hpp>
+#include <iostream>
 
-//#include "..\Base\Typedef.hpp"
 #include "boost/cstdint.hpp"
+#include <boost\operators.hpp>
 
 namespace PolyVox
 {

include/Volume.h

@@ -21,9 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "boost/cstdint.hpp"
 
-
-#include "Block.h"
 #include "Constants.h"
+#include "ForwardDeclarations.h"
 #include "TypeDef.h"
 #include "Vector.h"
 

source/IndexedSurfacePatch.cpp

@@ -1,4 +1,6 @@
 #include "IndexedSurfacePatch.h"
+#include "SurfaceTypes.h"
+#include "SurfaceVertex.h"
 
 using namespace boost;
 

source/PolyVoxSceneManager.cpp

@@ -17,8 +17,13 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ******************************************************************************/
 
+#include "IndexedSurfacePatch.h"
 #include "MarchingCubesTables.h"
 #include "PolyVoxSceneManager.h"
+#include "RegionGeometry.h"
+#include "SurfaceVertex.h"
+#include "Vector.h"
+#include "Volume.h"
 #include "VolumeIterator.h"
 
 using namespace boost;

source/SurfaceEdge.cpp

@@ -1,9 +1,9 @@
+#include <sstream>
+
 #include "SurfaceEdge.h"
 #include "SurfaceTriangle.h"
 #include "SurfaceVertex.h"
 
-#include <sstream>
-
 namespace PolyVox
 {
 	SurfaceEdge::SurfaceEdge(const SurfaceVertexIterator& targetToSet,const SurfaceVertexIterator& sourceToSet)

source/Volume.cpp

@@ -17,13 +17,14 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ******************************************************************************/
 
-#include "Volume.h"
-#include "VolumeIterator.h"
-
 #include <fstream>
 #include <iostream> //FIXME - remove this...
 #include <queue>
 
+#include "Block.h"
+#include "Volume.h"
+#include "VolumeIterator.h" //Maybe this shouldn't be here?
+
 using namespace boost;
 
 namespace PolyVox

source/VolumeIterator.cpp

@@ -17,6 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ******************************************************************************/
 
+#include "block.h"
 #include "Volume.h"
 #include "VolumeIterator.h"