Renamed all files and removed some warnings

CamelotUtility/CamelotUtility.vcxproj

@@ -66,35 +66,35 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="Include\asm_math.h" />
+    <ClInclude Include="Include\CmMathAsm.h" />
     <ClInclude Include="Include\CmTypes.h" />
     <ClInclude Include="Include\CmFwdDeclUtil.h" />
-    <ClInclude Include="Include\OgreAxisAlignedBox.h" />
-    <ClInclude Include="Include\OgreMath.h" />
-    <ClInclude Include="Include\OgreMatrix3.h" />
-    <ClInclude Include="Include\OgreMatrix4.h" />
-    <ClInclude Include="Include\OgrePlane.h" />
+    <ClInclude Include="Include\CmAxisAlignedBox.h" />
+    <ClInclude Include="Include\CmMath.h" />
+    <ClInclude Include="Include\CmMatrix3.h" />
+    <ClInclude Include="Include\CmMatrix4.h" />
+    <ClInclude Include="Include\CmPlane.h" />
     <ClInclude Include="Include\CmPlatform.h" />
     <ClInclude Include="Include\CmPrerequisitesUtil.h" />
-    <ClInclude Include="Include\OgreQuaternion.h" />
-    <ClInclude Include="Include\OgreRay.h" />
-    <ClInclude Include="Include\OgreSphere.h" />
+    <ClInclude Include="Include\CmQuaternion.h" />
+    <ClInclude Include="Include\CmRay.h" />
+    <ClInclude Include="Include\CmSphere.h" />
     <ClInclude Include="Include\CmStdHeaders.h" />
     <ClInclude Include="Include\CmThreadDefines.h" />
-    <ClInclude Include="Include\OgreVector2.h" />
-    <ClInclude Include="Include\OgreVector3.h" />
-    <ClInclude Include="Include\OgreVector4.h" />
+    <ClInclude Include="Include\CmVector2.h" />
+    <ClInclude Include="Include\CmVector3.h" />
+    <ClInclude Include="Include\CmVector4.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Include\OgreAxisAlignedBox.cpp" />
-    <ClCompile Include="Source\OgreMath.cpp" />
-    <ClCompile Include="Source\OgreMatrix3.cpp" />
-    <ClCompile Include="Source\OgreMatrix4.cpp" />
-    <ClCompile Include="Source\OgrePlane.cpp" />
-    <ClCompile Include="Source\OgreQuaternion.cpp" />
-    <ClCompile Include="Source\OgreVector2.cpp" />
-    <ClCompile Include="Source\OgreVector3.cpp" />
-    <ClCompile Include="Source\OgreVector4.cpp" />
+    <ClCompile Include="Include\CmAxisAlignedBox.cpp" />
+    <ClCompile Include="Source\CmMath.cpp" />
+    <ClCompile Include="Source\CmMatrix3.cpp" />
+    <ClCompile Include="Source\CmMatrix4.cpp" />
+    <ClCompile Include="Source\CmPlane.cpp" />
+    <ClCompile Include="Source\CmQuaternion.cpp" />
+    <ClCompile Include="Source\CmVector2.cpp" />
+    <ClCompile Include="Source\CmVector3.cpp" />
+    <ClCompile Include="Source\CmVector4.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

CamelotUtility/CamelotUtility.vcxproj.filters

@@ -16,44 +16,14 @@
     <Filter Include="Header Files\Prerequisites">
       <UniqueIdentifier>{1a68be3e-3394-4b01-9532-2fe9db03afe0}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\Math">
+      <UniqueIdentifier>{5423fdfe-e418-4fcd-8eae-9ab4e77856ef}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Math">
+      <UniqueIdentifier>{6f183461-d042-41e0-9c81-aa8bc8462641}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Include\asm_math.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\OgreAxisAlignedBox.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\OgreMath.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\OgreMatrix3.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\OgreMatrix4.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\OgrePlane.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\OgreQuaternion.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\OgreRay.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\OgreSphere.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\OgreVector2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\OgreVector3.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\OgreVector4.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Include\CmTypes.h">
       <Filter>Header Files\Prerequisites</Filter>
     </ClInclude>
@@ -72,34 +42,70 @@
     <ClInclude Include="Include\CmFwdDeclUtil.h">
       <Filter>Header Files\Prerequisites</Filter>
     </ClInclude>
+    <ClInclude Include="Include\CmMathAsm.h">
+      <Filter>Header Files\Math</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\CmAxisAlignedBox.h">
+      <Filter>Header Files\Math</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\CmMath.h">
+      <Filter>Header Files\Math</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\CmMatrix3.h">
+      <Filter>Header Files\Math</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\CmMatrix4.h">
+      <Filter>Header Files\Math</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\CmPlane.h">
+      <Filter>Header Files\Math</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\CmQuaternion.h">
+      <Filter>Header Files\Math</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\CmRay.h">
+      <Filter>Header Files\Math</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\CmSphere.h">
+      <Filter>Header Files\Math</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\CmVector2.h">
+      <Filter>Header Files\Math</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\CmVector3.h">
+      <Filter>Header Files\Math</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\CmVector4.h">
+      <Filter>Header Files\Math</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Source\OgreMath.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="Include\CmAxisAlignedBox.cpp">
+      <Filter>Source Files\Math</Filter>
     </ClCompile>
-    <ClCompile Include="Source\OgreMatrix3.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="Source\CmMath.cpp">
+      <Filter>Source Files\Math</Filter>
     </ClCompile>
-    <ClCompile Include="Source\OgreMatrix4.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="Source\CmMatrix3.cpp">
+      <Filter>Source Files\Math</Filter>
     </ClCompile>
-    <ClCompile Include="Source\OgrePlane.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="Source\CmMatrix4.cpp">
+      <Filter>Source Files\Math</Filter>
     </ClCompile>
-    <ClCompile Include="Source\OgreQuaternion.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="Source\CmPlane.cpp">
+      <Filter>Source Files\Math</Filter>
     </ClCompile>
-    <ClCompile Include="Source\OgreVector2.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="Source\CmQuaternion.cpp">
+      <Filter>Source Files\Math</Filter>
     </ClCompile>
-    <ClCompile Include="Source\OgreVector3.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="Source\CmVector2.cpp">
+      <Filter>Source Files\Math</Filter>
     </ClCompile>
-    <ClCompile Include="Source\OgreVector4.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="Source\CmVector3.cpp">
+      <Filter>Source Files\Math</Filter>
     </ClCompile>
-    <ClCompile Include="Include\OgreAxisAlignedBox.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="Source\CmVector4.cpp">
+      <Filter>Source Files\Math</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>

CamelotUtility/Include/OgreAxisAlignedBox.cpp → CamelotUtility/Include/CmAxisAlignedBox.cpp

@@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreAxisAlignedBox.h"
+#include "CmAxisAlignedBox.h"
 
 namespace CamelotEngine
 {

CamelotUtility/Include/OgreAxisAlignedBox.h → CamelotUtility/Include/CmAxisAlignedBox.h

@@ -31,8 +31,8 @@ THE SOFTWARE.
 // Precompiler options
 #include "CmPrerequisitesUtil.h"
 
-#include "OgreVector3.h"
-#include "OgreMatrix4.h"
+#include "CmVector3.h"
+#include "CmMatrix4.h"
 
 namespace CamelotEngine {
 	/** \addtogroup Core
@@ -280,7 +280,7 @@ namespace CamelotEngine {
 		@remarks
 		If the order of these corners is important, they are as
 		follows: The 4 points of the minimum Z face (note that
-		because Ogre uses right-handed coordinates, the minimum Z is
+		because Engine uses right-handed coordinates, the minimum Z is
 		at the 'back' of the box) starting with the minimum point of
 		all, then anticlockwise around this face (if you are looking
 		onto the face from outside the box). Then the 4 points of the

CamelotUtility/Include/OgreMatrix3.h → CamelotUtility/Include/CmMatrix3.h

@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 #include "CmPrerequisitesUtil.h"
 
-#include "OgreVector3.h"
+#include "CmVector3.h"
 
 // NB All code adapted from Wild Magic 0.2 Matrix math (free source code)
 // http://www.geometrictools.com/

CamelotUtility/Include/OgreMatrix4.h → CamelotUtility/Include/CmMatrix4.h

@@ -31,10 +31,11 @@ THE SOFTWARE.
 // Precompiler options
 #include "CmPrerequisitesUtil.h"
 
-#include "OgreVector3.h"
-#include "OgreMatrix3.h"
-#include "OgreVector4.h"
-#include "OgrePlane.h"
+#include "CmVector3.h"
+#include "CmMatrix3.h"
+#include "CmVector4.h"
+#include "CmPlane.h"
+
 namespace CamelotEngine
 {
 	/** \addtogroup Core
@@ -45,7 +46,7 @@ namespace CamelotEngine
 	*/
 	/** Class encapsulating a standard 4x4 homogeneous matrix.
         @remarks
-            OGRE uses column vectors when applying matrix multiplications,
+            We use column vectors when applying matrix multiplications,
             This means a vector is represented as a single column, 4-row
             matrix. This has the effect that the transformations implemented
             by the matrices happens right-to-left e.g. if vector V is to be
@@ -60,10 +61,10 @@ namespace CamelotEngine
             inexplicably chosen to differ from the accepted standard and uses
             row vectors and left-to-right matrix multiplication.
         @par
-            OGRE deals with the differences between D3D and OpenGL etc.
-            internally when operating through different render systems. OGRE
-            users only need to conform to standard maths conventions, i.e.
-            right-to-left matrix multiplication, (OGRE transposes matrices it
+            We deal with the differences between D3D and OpenGL etc.
+            internally when operating through different render systems. 
+            Users only need to conform to standard maths conventions, i.e.
+            right-to-left matrix multiplication, (Engine transposes matrices it
             passes to D3D to compensate).
         @par
             The generic form M * V which shows the layout of the matrix 
@@ -640,7 +641,7 @@ namespace CamelotEngine
     };
 
     /* Removed from Vector4 and made a non-member here because otherwise
-       OgreMatrix4.h and OgreVector4.h have to try to include and inline each 
+       CmMatrix4.h and CmVector4.h have to try to include and inline each 
        other, which frankly doesn't work ;)
    */
     inline Vector4 operator * (const Vector4& v, const Matrix4& mat)

CamelotUtility/Include/OgrePlane.h → CamelotUtility/Include/CmPlane.h

@@ -38,7 +38,7 @@ THE SOFTWARE.
 
 #include "CmPrerequisitesUtil.h"
 
-#include "OgreVector3.h"
+#include "CmVector3.h"
 
 namespace CamelotEngine {
 

CamelotUtility/Include/OgreQuaternion.h → CamelotUtility/Include/CmQuaternion.h

@@ -37,7 +37,7 @@ THE SOFTWARE.
 #define __Quaternion_H__
 
 #include "CmPrerequisitesUtil.h"
-#include "OgreMath.h"
+#include "CmMath.h"
 
 namespace CamelotEngine {
 

CamelotUtility/Include/OgreRay.h → CamelotUtility/Include/CmRay.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 // Precompiler options
 #include "CmPrerequisitesUtil.h"
 
-#include "OgreVector3.h"
+#include "CmVector3.h"
 
 namespace CamelotEngine {
 

CamelotUtility/Include/OgreSphere.h → CamelotUtility/Include/CmSphere.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 // Precompiler options
 #include "CmPrerequisitesUtil.h"
 
-#include "OgreVector3.h"
+#include "CmVector3.h"
 
 namespace CamelotEngine {
 
@@ -45,7 +45,7 @@ namespace CamelotEngine {
 	/** A sphere primitive, mostly used for bounds checking. 
     @remarks
         A sphere in math texts is normally represented by the function
-        x^2 + y^2 + z^2 = r^2 (for sphere's centered on the origin). Ogre stores spheres
+        x^2 + y^2 + z^2 = r^2 (for sphere's centered on the origin). Engine stores spheres
         simply as a center point and a radius.
     */
     class CM_EXPORT Sphere

CamelotUtility/Include/CmStdHeaders.h

@@ -12,7 +12,7 @@
  * See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20218
  *
  * Due to a more strict linker included with Xcode 4, this is disabled on Mac OS X and iOS.
- * The reason? It changes the visibility of Boost functions.  The mismatch between visibility Boost when used in Ogre (default)
+ * The reason? It changes the visibility of Boost functions.  The mismatch between visibility Boost when used in the engine (default)
  * and Boost when compiled (hidden) results in mysterious link errors such as "Bad codegen, pointer diff".
  */
 #   pragma GCC visibility push(default)

CamelotUtility/Include/OgreVector2.h → CamelotUtility/Include/CmVector2.h

@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 
 #include "CmPrerequisitesUtil.h"
-#include "OgreMath.h"
+#include "CmMath.h"
 
 namespace CamelotEngine
 {

CamelotUtility/Include/OgreVector3.h → CamelotUtility/Include/CmVector3.h

@@ -29,8 +29,8 @@ THE SOFTWARE.
 #define __Vector3_H__
 
 #include "CmPrerequisitesUtil.h"
-#include "OgreMath.h"
-#include "OgreQuaternion.h"
+#include "CmMath.h"
+#include "CmQuaternion.h"
 
 namespace CamelotEngine
 {
@@ -473,7 +473,7 @@ namespace CamelotEngine
                 returned vector will be on the side from which the arc from 'this'
                 to rkVector is anticlockwise, e.g. UNIT_Y.crossProduct(UNIT_Z)
                 = UNIT_X, whilst UNIT_Z.crossProduct(UNIT_Y) = -UNIT_X.
-				This is because OGRE uses a right-handed coordinate system.
+				This is because engine uses a right-handed coordinate system.
             @par
                 For a clearer explanation, look a the left and the bottom edges
                 of your monitor's screen. Assume that the first vector is the

CamelotUtility/Include/OgreVector4.h → CamelotUtility/Include/CmVector4.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __Vector4_H__
 
 #include "CmPrerequisitesUtil.h"
-#include "OgreVector3.h"
+#include "CmVector3.h"
 
 namespace CamelotEngine
 {

CamelotUtility/Source/OgreMath.cpp → CamelotUtility/Source/CmMath.cpp

@@ -25,15 +25,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreMath.h"
-#include "asm_math.h"
-#include "OgreVector2.h"
-#include "OgreVector3.h"
-#include "OgreVector4.h"
-#include "OgreRay.h"
-#include "OgreSphere.h"
-#include "OgreAxisAlignedBox.h"
-#include "OgrePlane.h"
+#include "CmMath.h"
+#include "CmMathAsm.h"
+#include "CmVector2.h"
+#include "CmVector3.h"
+#include "CmVector4.h"
+#include "CmRay.h"
+#include "CmSphere.h"
+#include "CmAxisAlignedBox.h"
+#include "CmPlane.h"
 
 
 namespace CamelotEngine
@@ -342,7 +342,7 @@ namespace CamelotEngine
         if (Math::Abs(denom) < std::numeric_limits<float>::epsilon())
         {
             // Parallel
-            return std::pair<bool, float>(false, 0);
+            return std::pair<bool, float>(false, 0.0f);
         }
         else
         {
@@ -458,7 +458,7 @@ namespace CamelotEngine
         // Check origin inside first
         if (rayorig.squaredLength() <= radius*radius && discardInside)
         {
-            return std::pair<bool, float>(true, 0);
+            return std::pair<bool, float>(true, 0.0f);
         }
 
         // Mmm, quadratics
@@ -473,7 +473,7 @@ namespace CamelotEngine
         if (d < 0)
         {
             // No intersection
-            return std::pair<bool, float>(false, 0);
+            return std::pair<bool, float>(false, 0.0f);
         }
         else
         {
@@ -491,8 +491,8 @@ namespace CamelotEngine
     //-----------------------------------------------------------------------
 	std::pair<bool, float> Math::intersects(const Ray& ray, const AxisAlignedBox& box)
 	{
-		if (box.isNull()) return std::pair<bool, float>(false, 0);
-		if (box.isInfinite()) return std::pair<bool, float>(true, 0);
+		if (box.isNull()) return std::pair<bool, float>(false, 0.0f);
+		if (box.isInfinite()) return std::pair<bool, float>(true, 0.0f);
 
 		float lowt = 0.0f;
 		float t;
@@ -506,7 +506,7 @@ namespace CamelotEngine
 		// Check origin inside first
 		if ( rayorig > min && rayorig < max )
 		{
-			return std::pair<bool, float>(true, 0);
+			return std::pair<bool, float>(true, 0.0f);
 		}
 
 		// Check each face in turn, only check closest 3
@@ -720,18 +720,18 @@ namespace CamelotEngine
             if (denom > + std::numeric_limits<float>::epsilon())
             {
                 if (!negativeSide)
-                    return std::pair<bool, float>(false, 0);
+                    return std::pair<bool, float>(false, 0.0f);
             }
             else if (denom < - std::numeric_limits<float>::epsilon())
             {
                 if (!positiveSide)
-                    return std::pair<bool, float>(false, 0);
+                    return std::pair<bool, float>(false, 0.0f);
             }
             else
             {
                 // Parallel or triangle area is close to zero when
                 // the plane normal not normalised.
-                return std::pair<bool, float>(false, 0);
+                return std::pair<bool, float>(false, 0.0f);
             }
 
             t = normal.dotProduct(a - ray.getOrigin()) / denom;
@@ -739,7 +739,7 @@ namespace CamelotEngine
             if (t < 0)
             {
                 // Intersection is behind origin
-                return std::pair<bool, float>(false, 0);
+                return std::pair<bool, float>(false, 0.0f);
             }
         }
 
@@ -786,12 +786,12 @@ namespace CamelotEngine
             if (area > 0)
             {
                 if (alpha < tolerance || beta < tolerance || alpha+beta > area-tolerance)
-                    return std::pair<bool, float>(false, 0);
+                    return std::pair<bool, float>(false, 0.0f);
             }
             else
             {
                 if (alpha > tolerance || beta > tolerance || alpha+beta < area-tolerance)
-                    return std::pair<bool, float>(false, 0);
+                    return std::pair<bool, float>(false, 0.0f);
             }
         }
 

CamelotUtility/Source/OgreMatrix3.cpp → CamelotUtility/Source/CmMatrix3.cpp

@@ -25,9 +25,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreMatrix3.h"
+#include "CmMatrix3.h"
 
-#include "OgreMath.h"
+#include "CmMath.h"
 
 // Adapted from Matrix math by Wild Magic http://www.geometrictools.com/
 

CamelotUtility/Source/OgreMatrix4.cpp → CamelotUtility/Source/CmMatrix4.cpp

@@ -25,10 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreMatrix4.h"
+#include "CmMatrix4.h"
 
-#include "OgreVector3.h"
-#include "OgreMatrix3.h"
+#include "CmVector3.h"
+#include "CmMatrix3.h"
 
 namespace CamelotEngine
 {

CamelotUtility/Source/OgrePlane.cpp → CamelotUtility/Source/CmPlane.cpp

@@ -26,9 +26,9 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgrePlane.h"
-#include "OgreMatrix3.h"
-#include "OgreAxisAlignedBox.h" 
+#include "CmPlane.h"
+#include "CmMatrix3.h"
+#include "CmAxisAlignedBox.h" 
 
 namespace CamelotEngine {
 	//-----------------------------------------------------------------------

CamelotUtility/Source/OgreQuaternion.cpp → CamelotUtility/Source/CmQuaternion.cpp

@@ -33,11 +33,11 @@ THE SOFTWARE.
 // http://www.boost.org/LICENSE_1_0.txt
 // http://www.geometrictools.com/License/Boost/LICENSE_1_0.txt
 
-#include "OgreQuaternion.h"
+#include "CmQuaternion.h"
 
-#include "OgreMath.h"
-#include "OgreMatrix3.h"
-#include "OgreVector3.h"
+#include "CmMath.h"
+#include "CmMatrix3.h"
+#include "CmVector3.h"
 
 namespace CamelotEngine {
 

CamelotUtility/Source/OgreVector2.cpp → CamelotUtility/Source/CmVector2.cpp

@@ -26,8 +26,8 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreVector2.h"
-#include "OgreMath.h"
+#include "CmVector2.h"
+#include "CmMath.h"
 
 namespace CamelotEngine
 {

CamelotUtility/Source/OgreVector3.cpp → CamelotUtility/Source/CmVector3.cpp

@@ -25,8 +25,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreVector3.h"
-#include "OgreMath.h"
+#include "CmVector3.h"
+#include "CmMath.h"
 
 namespace CamelotEngine
 {

CamelotUtility/Source/OgreVector4.cpp → CamelotUtility/Source/CmVector4.cpp

@@ -25,8 +25,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreVector4.h"
-#include "OgreMath.h"
+#include "CmVector4.h"
+#include "CmMath.h"
 
 namespace CamelotEngine
 {