Put the common #includes in shape.h

Almost every shape needs these, so it's not worth it to try and avoid
unnecessary headers in the base class.

diff --git a/source/geometry/compositeshape.h b/source/geometry/compositeshape.h
index 4c640be22f4c5045076b9659ce7734d517f1127c..846607689df582a8a9f0ae46ae79c75eb832ed81 100644 (file)
--- a/source/geometry/compositeshape.h
+++ b/source/geometry/compositeshape.h
@@ -3,7 +3,6 @@
 
 #include <stdexcept>
 #include <vector>
-#include "boundingbox.h"
 #include "shape.h"
 
 namespace Msp {

diff --git a/source/geometry/halfspace.h b/source/geometry/halfspace.h
index 60f040350b0f63ac3ac48409701db028cece4353..5fdea34c885eaf2dbf17296b07d4677984589fef 100644 (file)
--- a/source/geometry/halfspace.h
+++ b/source/geometry/halfspace.h
@@ -1,7 +1,6 @@
 #ifndef MSP_GEOMETRY_HALFSPACE_H_
 #define MSP_GEOMETRY_HALFSPACE_H_
 
-#include "boundingbox.h"
 #include "shape.h"
 
 namespace Msp {

diff --git a/source/geometry/hyperbox.h b/source/geometry/hyperbox.h
index da500910e4f100d57f865b644bd719d71a3ee34c..e45fadc12ae92d4752b523302328adeaa8df650d 100644 (file)
--- a/source/geometry/hyperbox.h
+++ b/source/geometry/hyperbox.h
@@ -5,10 +5,7 @@
 #include <cmath>
 #include <stdexcept>
 #include <msp/linal/vector.h>
-#include "boundingbox.h"
-#include "ray.h"
 #include "shape.h"
-#include "surfacepoint.h"
 
 namespace Msp {
 namespace Geometry {

diff --git a/source/geometry/hypersphere.h b/source/geometry/hypersphere.h
index 3c0412564fcc1cf055842c9d325943935812746a..e2e3102014a1f73a9cfb9411d9b90638c937f851 100644 (file)
--- a/source/geometry/hypersphere.h
+++ b/source/geometry/hypersphere.h
@@ -4,10 +4,7 @@
 #include <cmath>
 #include <stdexcept>
 #include <msp/linal/vector.h>
-#include "boundingbox.h"
-#include "ray.h"
 #include "shape.h"
-#include "surfacepoint.h"
 
 namespace Msp {
 namespace Geometry {

diff --git a/source/geometry/negation.h b/source/geometry/negation.h
index beb3e4e7b845d91edcaff45555add550a8165cd3..c01763d1c8eed6fa399090c27210e51c54553a20 100644 (file)
--- a/source/geometry/negation.h
+++ b/source/geometry/negation.h
@@ -1,7 +1,6 @@
 #ifndef MSP_GEOMETRY_NEGATION_H_
 #define MSP_GEOMETRY_NEGATION_H_
 
-#include "boundingbox.h"
 #include "shape.h"
 
 namespace Msp {

diff --git a/source/geometry/shape.h b/source/geometry/shape.h
index bbe255f9054f919792ca748a7c25468b62bfabc8..22b18876620657e9f2858ea568196cc66a2d3f9c 100644 (file)
--- a/source/geometry/shape.h
+++ b/source/geometry/shape.h
@@ -3,19 +3,13 @@
 
 #include <vector>
 #include <msp/linal/vector.h>
+#include "boundingbox.h"
+#include "ray.h"
+#include "surfacepoint.h"
 
 namespace Msp {
 namespace Geometry {
 
-template<typename T, unsigned D>
-class BoundingBox;
-
-template<typename T, unsigned D>
-class Ray;
-
-template<typename T, unsigned D>
-class SurfacePoint;
-
 /**
 Base class and interface for geometric shapes.  Shapes may be bounded or
 unbounded.  They are always considered to be solid, i.e. have a distinct inside

diff --git a/source/geometry/transformedshape.h b/source/geometry/transformedshape.h
index 58e571a9db389a058cdb8ab3de1343b4ee87cb3e..74912aa0b904cf1786c2efb7d78f6ec37c56d6d7 100644 (file)
--- a/source/geometry/transformedshape.h
+++ b/source/geometry/transformedshape.h
@@ -2,8 +2,6 @@
 #define MSP_GEOMETRY_TRANSFORMEDSHAPE_H_
 
 #include "affinetransformation.h"
-#include "boundingbox.h"
-#include "ray.h"
 #include "shape.h"
 
 namespace Msp {