Remove unused leftover headers Complex.h and CoordinateAxisConvention…

….h from the repository.
juj · Jun 6, 2013 · ba9b73d · ba9b73d
1 parent b1992fe
commit ba9b73d
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 157 deletions.
diff --git a/src/Geometry/Circle.cpp b/src/Geometry/Circle.cpp
@@ -19,6 +19,8 @@
 #include "Plane.h"
 #include "../Math/MathFunc.h"
 #include "../Math/float3x3.h"
+#include "../Math/float3x4.h"
+#include "../Math/float4x4.h"
 #include "../Math/Quat.h"
 #include "Ray.h"
 #include "AABB.h"

diff --git a/src/Geometry/Frustum.cpp b/src/Geometry/Frustum.cpp
@@ -31,6 +31,7 @@
 #include "../Math/float2.h"
 #include "../Math/float3x3.h"
 #include "../Math/float3x4.h"
+#include "../Math/float4x4.h"
 #include "../Math/float4.h"
 #include "../Math/Quat.h"
 #include "../Algorithm/Random/LCG.h"

diff --git a/src/Geometry/Plane.cpp b/src/Geometry/Plane.cpp
@@ -31,6 +31,7 @@
 #include "LineSegment.h"
 #include "../Math/float3x3.h"
 #include "../Math/float3x4.h"
+#include "../Math/float4x4.h"
 #include "../Math/float4.h"
 #include "../Math/Quat.h"
 #include "Frustum.h"

diff --git a/src/Geometry/Polyhedron.cpp b/src/Geometry/Polyhedron.cpp
@@ -23,7 +23,9 @@
 #include <sstream>
 #include "../Math/assume.h"
 #include "../Math/MathFunc.h"
+#include "../Math/float3x3.h"
 #include "../Math/float3x4.h"
+#include "../Math/float4x4.h"
 #include "../Math/Quat.h"
 #include "AABB.h"
 #include "OBB.h"

diff --git a/src/Math/Complex.h b/src/Math/Complex.h
diff --git a/src/Math/CoordinateAxisConvention.h b/src/Math/CoordinateAxisConvention.h
diff --git a/src/Math/MathAll.h b/src/Math/MathAll.h
@@ -22,8 +22,6 @@
 #include "MathNamespace.h"
 
 #include "BitOps.h"
-#include "Complex.h"
-#include "CoordinateAxisConvention.h"
 #include "FixedPoint.h"
 #include "float2.h"
 #include "float3.h"

diff --git a/src/Math/TransformOps.cpp b/src/Math/TransformOps.cpp
@@ -18,6 +18,7 @@
 #include "TransformOps.h"
 #include "MathFunc.h"
 #include "float4.h"
+#include "float3x3.h"
 #include "float3x4.h"
 #include "float4x4.h"
 

diff --git a/src/Math/float3x3.h b/src/Math/float3x3.h
@@ -25,7 +25,6 @@
 #include "../MathGeoLibFwd.h"
 #include "MatrixProxy.h"
 #include "../Math/float3.h"
-#include "CoordinateAxisConvention.h"
 
 #ifdef MATH_OGRE_INTEROP
 #include <OgreMatrix3.h>

diff --git a/src/Math/float3x4.h b/src/Math/float3x4.h
@@ -22,9 +22,9 @@
 #endif
 
 #include "../MathGeoLibFwd.h"
-#include "MatrixProxy.h"
-#include "CoordinateAxisConvention.h"
 #include "../MathBuildConfig.h"
+#include "MatrixProxy.h"
+#include "float3.h"
 #include "SSEMath.h"
 
 MATH_BEGIN_NAMESPACE

diff --git a/src/Math/float4x4.h b/src/Math/float4x4.h
@@ -25,7 +25,6 @@
 #endif
 #include "../MathGeoLibFwd.h"
 #include "MatrixProxy.h"
-#include "CoordinateAxisConvention.h"
 
 #ifdef MATH_OGRE_INTEROP
 #include <OgreMatrix4.h>

diff --git a/src/MathGeoLibFwd.h b/src/MathGeoLibFwd.h
@@ -69,10 +69,6 @@ class ScaleOp;
 class AABB;
 class Capsule;
 class Circle;
-#ifdef Complex
-#undef Complex
-#endif
-class Complex;
 class Cone;
 class Cylinder;
 class Ellipsoid;