Moar Utility changes

CamelotUtility/CamelotUtility.vcxproj

@@ -68,19 +68,19 @@
   <ItemGroup>
     <ClInclude Include="Include\asm_math.h" />
     <ClInclude Include="Include\CmTypes.h" />
+    <ClInclude Include="Include\CmUtilFwdDecl.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\OgrePlatform.h" />
-    <ClInclude Include="Include\OgrePlatformInformation.h" />
+    <ClInclude Include="Include\CmPlatform.h" />
     <ClInclude Include="Include\CmUtilPrerequisites.h" />
     <ClInclude Include="Include\OgreQuaternion.h" />
     <ClInclude Include="Include\OgreRay.h" />
     <ClInclude Include="Include\OgreSphere.h" />
-    <ClInclude Include="Include\OgreStdHeaders.h" />
-    <ClInclude Include="Include\OgreThreadDefines.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" />

CamelotUtility/CamelotUtility.vcxproj.filters

@@ -54,22 +54,22 @@
     <ClInclude Include="Include\OgreVector4.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Include\OgrePlatform.h">
+    <ClInclude Include="Include\CmUtilPrerequisites.h">
       <Filter>Header Files\Prerequisites</Filter>
     </ClInclude>
-    <ClInclude Include="Include\OgrePlatformInformation.h">
+    <ClInclude Include="Include\CmTypes.h">
       <Filter>Header Files\Prerequisites</Filter>
     </ClInclude>
-    <ClInclude Include="Include\OgreStdHeaders.h">
+    <ClInclude Include="Include\CmPlatform.h">
       <Filter>Header Files\Prerequisites</Filter>
     </ClInclude>
-    <ClInclude Include="Include\OgreThreadDefines.h">
+    <ClInclude Include="Include\CmStdHeaders.h">
       <Filter>Header Files\Prerequisites</Filter>
     </ClInclude>
-    <ClInclude Include="Include\CmUtilPrerequisites.h">
+    <ClInclude Include="Include\CmThreadDefines.h">
       <Filter>Header Files\Prerequisites</Filter>
     </ClInclude>
-    <ClInclude Include="Include\CmTypes.h">
+    <ClInclude Include="Include\CmUtilFwdDecl.h">
       <Filter>Header Files\Prerequisites</Filter>
     </ClInclude>
   </ItemGroup>

CamelotUtility/Include/OgrePlatform.h → CamelotUtility/Include/CmPlatform.h

@@ -25,10 +25,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#ifndef __Platform_H_
-#define __Platform_H_
+#pragma once
 
-namespace Ogre {
+namespace CamelotEngine {
 /* Initial platform/compiler-related stuff to set.
 */
 #define OGRE_PLATFORM_WIN32 1
@@ -41,9 +40,6 @@ namespace Ogre {
 #define OGRE_COMPILER_WINSCW 4
 #define OGRE_COMPILER_GCCE 5
 
-#define OGRE_ENDIAN_LITTLE 1
-#define OGRE_ENDIAN_BIG 2
-
 #define OGRE_ARCHITECTURE_32 1
 #define OGRE_ARCHITECTURE_64 2
 
@@ -202,15 +198,49 @@ namespace Ogre {
 
 //----------------------------------------------------------------------------
 
-//----------------------------------------------------------------------------
-// Endian Settings
-// check for BIG_ENDIAN config flag, set OGRE_ENDIAN correctly
-#ifdef OGRE_CONFIG_BIG_ENDIAN
-#    define OGRE_ENDIAN OGRE_ENDIAN_BIG
+/* Initial CPU stuff to set.
+*/
+#define OGRE_CPU_UNKNOWN    0
+#define OGRE_CPU_X86        1
+#define OGRE_CPU_PPC        2
+
+/* Find CPU type
+*/
+#if (defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))) || \
+    (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))
+#   define OGRE_CPU OGRE_CPU_X86
+
+#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE && defined(__BIG_ENDIAN__)
+#   define OGRE_CPU OGRE_CPU_PPC
+#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+#	define OGRE_CPU OGRE_CPU_X86
 #else
-#    define OGRE_ENDIAN OGRE_ENDIAN_LITTLE
+#   define OGRE_CPU OGRE_CPU_UNKNOWN
 #endif
 
-}
+/* Find how to declare aligned variable.
+*/
+#if OGRE_COMPILER == OGRE_COMPILER_MSVC
+#   define OGRE_ALIGNED_DECL(type, var, alignment)  __declspec(align(alignment)) type var
 
+#elif OGRE_COMPILER == OGRE_COMPILER_GNUC
+#   define OGRE_ALIGNED_DECL(type, var, alignment)  type var __attribute__((__aligned__(alignment)))
+
+#else
+#   define OGRE_ALIGNED_DECL(type, var, alignment)  type var
 #endif
+
+/** Find perfect alignment (should supports SIMD alignment if SIMD available)
+*/
+#if OGRE_CPU == OGRE_CPU_X86
+#   define OGRE_SIMD_ALIGNMENT  16
+
+#else
+#   define OGRE_SIMD_ALIGNMENT  16
+#endif
+
+/* Declare variable aligned to SIMD alignment.
+*/
+#define OGRE_SIMD_ALIGNED_DECL(type, var)   OGRE_ALIGNED_DECL(type, var, OGRE_SIMD_ALIGNMENT)
+
+}

CamelotUtility/Include/OgreStdHeaders.h → CamelotUtility/Include/CmStdHeaders.h

@@ -1,11 +1,10 @@
-#ifndef __StdHeaders_H__
-#define __StdHeaders_H__
+#pragma once
 
 #ifdef __BORLANDC__
     #define __STD_ALGORITHM
 #endif
 
-#if defined ( OGRE_GCC_VISIBILITY ) && (OGRE_PLATFORM != OGRE_PLATFORM_APPLE && OGRE_PLATFORM != OGRE_PLATFORM_IPHONE)
+#if defined ( OGRE_GCC_VISIBILITY ) && (OGRE_PLATFORM != OGRE_PLATFORM_APPLE)
 /* Until libstdc++ for gcc 4.2 is released, we have to declare all
  * symbols in libstdc++.so externally visible, otherwise we end up
  * with them marked as hidden by -fvisible=hidden.
@@ -41,7 +40,7 @@
 
 // Note - not in the original STL, but exists in SGI STL and STLport
 // For gcc 4.3 see http://gcc.gnu.org/gcc-4.3/changes.html
-#if (OGRE_COMPILER == OGRE_COMPILER_GNUC) && !defined(STLPORT)
+#if (OGRE_COMPILER == OGRE_COMPILER_GNUC)
 #   if OGRE_COMP_VER >= 430
 #       include <tr1/unordered_map>
 #       include <tr1/unordered_set> 
@@ -50,7 +49,7 @@
 #       include <ext/hash_set>
 #   endif
 #else
-#   if (OGRE_COMPILER == OGRE_COMPILER_MSVC) && !defined(STLPORT) && OGRE_COMP_VER >= 1600 // VC++ 10.0
+#   if (OGRE_COMPILER == OGRE_COMPILER_MSVC) && OGRE_COMP_VER >= 1600 // VC++ 10.0
 #    	include <unordered_map>
 #    	include <unordered_set>
 #	else
@@ -71,7 +70,7 @@
 #include <sstream>
 
 #ifdef __BORLANDC__
-namespace Ogre
+namespace CamelotEngine
 {
     using namespace std;
 }
@@ -104,7 +103,7 @@ extern "C" {
 }
 #endif
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_IPHONE
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
 extern "C" {
 #   include <unistd.h>
 #   include <sys/param.h>
@@ -112,11 +111,35 @@ extern "C" {
 }
 #endif
 
-#if OGRE_THREAD_SUPPORT
-#   include "Threading/OgreThreadHeaders.h"
-#endif
-
-#if defined ( OGRE_GCC_VISIBILITY ) && (OGRE_PLATFORM != OGRE_PLATFORM_APPLE && OGRE_PLATFORM != OGRE_PLATFORM_IPHONE)
+#if defined ( OGRE_GCC_VISIBILITY ) && (OGRE_PLATFORM != OGRE_PLATFORM_APPLE)
 #   pragma GCC visibility pop
 #endif
+
+namespace CamelotEngine
+{
+#if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310
+#   if OGRE_COMP_VER >= 430
+#       define HashMap ::std::tr1::unordered_map
+#		define HashSet ::std::tr1::unordered_set
+#    else
+#       define HashMap ::__gnu_cxx::hash_map
+#       define HashSet ::__gnu_cxx::hash_set
+#    endif
+#else
+#   if OGRE_COMPILER == OGRE_COMPILER_MSVC
+#       if OGRE_COMP_VER >= 1600 // VC++ 10.0
+#			define HashMap ::std::tr1::unordered_map
+#           define HashSet ::std::tr1::unordered_set
+#		elif OGRE_COMP_VER > 1300 && !defined(_STLP_MSVC)
+#           define HashMap ::stdext::hash_map
+#           define HashSet ::stdext::hash_set
+#       else
+#           define HashMap ::std::hash_map
+#           define HashSet ::std::hash_set
+#       endif
+#   else
+#       define HashMap ::std::hash_map
+#       define HashSet ::std::hash_set
+#   endif
 #endif
+}

CamelotUtility/Include/OgreThreadDefines.h → CamelotUtility/Include/CmThreadDefines.h

@@ -23,8 +23,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE
 -------------------------------------------------------------------------*/
-#ifndef __OgreThreadDefines_H__
-#define __OgreThreadDefines_H__
+#pragma once
 
 #define OGRE_AUTO_MUTEX_NAME mutex
 #define OGRE_AUTO_MUTEX
@@ -56,6 +55,3 @@ THE SOFTWARE
 #define OGRE_THREAD_POINTER_DELETE(var) { OGRE_DELETE var; var = 0; }
 #define OGRE_THREAD_SLEEP(ms)
 #define OGRE_THREAD_WORKER_INHERIT
-
-#endif
-

CamelotUtility/Include/CmTypes.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "OgrePlatform.h"
+#include "CmPlatform.h"
 
 namespace CamelotEngine
 {

CamelotUtility/Include/CmUtilFwdDecl.h

@@ -0,0 +1,21 @@
+#pragma once
+
+namespace CamelotEngine {
+	// Pre-declare classes
+	// Allows use of pointers in header files without including individual .h
+	// so decreases dependencies between files
+	class Angle;
+	class AxisAlignedBox;
+	class Degree;
+	class Math;
+	class Matrix3;
+	class Matrix4;
+	class Plane;
+	class Quaternion;
+	class Radian;
+	class Ray;
+	class Sphere;
+	class Vector2;
+	class Vector3;
+	class Vector4;
+}

CamelotUtility/Include/CmUtilPrerequisites.h

@@ -23,71 +23,27 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE
 -------------------------------------------------------------------------*/
-#ifndef __OgrePrerequisites_H__
-#define __OgrePrerequisites_H__
+#pragma once
 
 #include <assert.h>
 
 // Platform-specific stuff
-#include "OgrePlatform.h"
+#include "CmPlatform.h"
+
+// Short-hand names for various built-in types
 #include "CmTypes.h"
 
-namespace Ogre {
-    #if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310 && !defined(STLPORT)
-	#   if OGRE_COMP_VER >= 430
-	#       define HashMap ::std::tr1::unordered_map
-	#		define HashSet ::std::tr1::unordered_set
-	#    else
-	#       define HashMap ::__gnu_cxx::hash_map
-	#       define HashSet ::__gnu_cxx::hash_set
-	#    endif
-    #else
-    #   if OGRE_COMPILER == OGRE_COMPILER_MSVC
-    #       if OGRE_COMP_VER >= 1600 // VC++ 10.0
-	#			define HashMap ::std::tr1::unordered_map
-	#           define HashSet ::std::tr1::unordered_set
-	#		elif OGRE_COMP_VER > 1300 && !defined(_STLP_MSVC)
-    #           define HashMap ::stdext::hash_map
-	#           define HashSet ::stdext::hash_set
-    #       else
-    #           define HashMap ::std::hash_map
-	#           define HashSet ::std::hash_set
-    #       endif
-    #   else
-    #       define HashMap ::std::hash_map
-	#       define HashSet ::std::hash_set
-    #   endif
-    #endif
-
-	// Useful threading defines
-#include "OgreThreadDefines.h"
-
-// Pre-declare classes
-// Allows use of pointers in header files without including individual .h
-// so decreases dependencies between files
-    class Angle;
-    class AxisAlignedBox;
-    class Degree;
-    class Math;
-    class Matrix3;
-    class Matrix4;
-    class Plane;
-    class Quaternion;
-	class Radian;
-    class Ray;
-    class Sphere;
-    class Vector2;
-    class Vector3;
-    class Vector4;
-}
+// Useful threading defines
+#include "CmThreadDefines.h"
 
-/* Include all the standard header *after* all the configuration
-settings have been made.
-*/
-#include "OgreStdHeaders.h"
+// Forward declarations
+#include "CmUtilFwdDecl.h"
 
-//for stl containter
-namespace Ogre
+// Commonly used standard headers
+#include "CmStdHeaders.h"
+
+// Standard containers, for easier access in my own namespace
+namespace CamelotEngine
 { 
 	template <typename T, typename A = char > 
 	struct deque 
@@ -125,8 +81,4 @@ namespace Ogre
 		typedef typename std::multimap<K, V, P> type; 
 	}; 
 
-} // Ogre
-
-#endif // __OgrePrerequisites_H__
-
-
+}

CamelotUtility/Include/OgreAxisAlignedBox.cpp

@@ -27,7 +27,7 @@ THE SOFTWARE.
 */
 #include "OgreAxisAlignedBox.h"
 
-namespace Ogre
+namespace CamelotEngine
 {
 	const AxisAlignedBox AxisAlignedBox::BOX_NULL;
 	const AxisAlignedBox AxisAlignedBox::BOX_INFINITE(AxisAlignedBox::EXTENT_INFINITE);

CamelotUtility/Include/OgreAxisAlignedBox.h

@@ -34,7 +34,7 @@ THE SOFTWARE.
 #include "OgreVector3.h"
 #include "OgreMatrix4.h"
 
-namespace Ogre {
+namespace CamelotEngine {
 	/** \addtogroup Core
 	*  @{
 	*/
@@ -808,6 +808,6 @@ namespace Ogre {
 
 	/** @} */
 	/** @} */
-} // namespace Ogre
+} // namespace CamelotEngine
 
 #endif

CamelotUtility/Include/OgreMath.h

@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 #include "CmUtilPrerequisites.h"
 
-namespace Ogre
+namespace CamelotEngine
 {
 	/** \addtogroup Core
 	*  @{

CamelotUtility/Include/OgreMatrix3.h

@@ -50,7 +50,7 @@ THE SOFTWARE.
 //           0       0       1
 // where t > 0 indicates a counterclockwise rotation in the xy-plane.
 
-namespace Ogre
+namespace CamelotEngine
 {
 	/** \addtogroup Core
 	*  @{

CamelotUtility/Include/OgreMatrix4.h

@@ -35,7 +35,7 @@ THE SOFTWARE.
 #include "OgreMatrix3.h"
 #include "OgreVector4.h"
 #include "OgrePlane.h"
-namespace Ogre
+namespace CamelotEngine
 {
 	/** \addtogroup Core
 	*  @{

CamelotUtility/Include/OgrePlane.h

@@ -40,7 +40,7 @@ THE SOFTWARE.
 
 #include "OgreVector3.h"
 
-namespace Ogre {
+namespace CamelotEngine {
 
 	/** \addtogroup Core
 	*  @{
@@ -161,6 +161,6 @@ namespace Ogre {
 	/** @} */
 	/** @} */
 
-} // namespace Ogre
+} // namespace CamelotEngine
 
 #endif

CamelotUtility/Include/OgrePlatformInformation.h

@@ -1,121 +0,0 @@
-/*
------------------------------------------------------------------------------
-This source file is part of OGRE
-    (Object-oriented Graphics Rendering Engine)
-For the latest info, see http://www.ogre3d.org/
-
-Copyright (c) 2000-2011 Torus Knot Software Ltd
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
------------------------------------------------------------------------------
-*/
-#ifndef __PlatformInformation_H__
-#define __PlatformInformation_H__
-
-#include "CmUtilPrerequisites.h"
-
-namespace Ogre {
-//
-// TODO: Puts following macros into OgrePlatform.h?
-//
-
-/* Initial CPU stuff to set.
-*/
-#define OGRE_CPU_UNKNOWN    0
-#define OGRE_CPU_X86        1
-#define OGRE_CPU_PPC        2
-#define OGRE_CPU_ARM        3
-
-/* Find CPU type
-*/
-#if (defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))) || \
-    (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))
-#   define OGRE_CPU OGRE_CPU_X86
-
-#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE && defined(__BIG_ENDIAN__)
-#   define OGRE_CPU OGRE_CPU_PPC
-#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-#	define OGRE_CPU OGRE_CPU_X86
-#elif OGRE_PLATFORM == OGRE_PLATFORM_IPHONE && (defined(__i386__) || defined(__x86_64__))
-#	define OGRE_CPU OGRE_CPU_X86
-#elif defined(__arm__)
-#	define OGRE_CPU OGRE_CPU_ARM
-#else
-#   define OGRE_CPU OGRE_CPU_UNKNOWN
-#endif
-
-/* Find how to declare aligned variable.
-*/
-#if OGRE_COMPILER == OGRE_COMPILER_MSVC
-#   define OGRE_ALIGNED_DECL(type, var, alignment)  __declspec(align(alignment)) type var
-
-#elif OGRE_COMPILER == OGRE_COMPILER_GNUC
-#   define OGRE_ALIGNED_DECL(type, var, alignment)  type var __attribute__((__aligned__(alignment)))
-
-#else
-#   define OGRE_ALIGNED_DECL(type, var, alignment)  type var
-#endif
-
-/** Find perfect alignment (should supports SIMD alignment if SIMD available)
-*/
-#if OGRE_CPU == OGRE_CPU_X86
-#   define OGRE_SIMD_ALIGNMENT  16
-
-#else
-#   define OGRE_SIMD_ALIGNMENT  16
-#endif
-
-/* Declare variable aligned to SIMD alignment.
-*/
-#define OGRE_SIMD_ALIGNED_DECL(type, var)   OGRE_ALIGNED_DECL(type, var, OGRE_SIMD_ALIGNMENT)
-
-/* Define whether or not Ogre compiled with SSE supports.
-*/
-#if OGRE_DOUBLE_PRECISION == 0 && OGRE_CPU == OGRE_CPU_X86 && OGRE_COMPILER == OGRE_COMPILER_MSVC
-#   define __OGRE_HAVE_SSE  1
-#elif OGRE_DOUBLE_PRECISION == 0 && OGRE_CPU == OGRE_CPU_X86 && OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_PLATFORM != OGRE_PLATFORM_APPLE_IOS
-#   define __OGRE_HAVE_SSE  1
-#endif
-
-/* Define whether or not Ogre compiled with VFP supports.
- */
-#if OGRE_DOUBLE_PRECISION == 0 && OGRE_CPU == OGRE_CPU_ARM && OGRE_COMPILER == OGRE_COMPILER_GNUC && defined(__ARM_ARCH_6K__) && defined(__VFP_FP__)
-#   define __OGRE_HAVE_VFP  1
-#endif
-
-/* Define whether or not Ogre compiled with NEON supports.
- */
-#if OGRE_DOUBLE_PRECISION == 0 && OGRE_CPU == OGRE_CPU_ARM && OGRE_COMPILER == OGRE_COMPILER_GNUC && defined(__ARM_ARCH_7A__) && defined(__ARM_NEON__)
-#   define __OGRE_HAVE_NEON  1
-#endif
-
-#ifndef __OGRE_HAVE_SSE
-#   define __OGRE_HAVE_SSE  0
-#endif
-
-#ifndef __OGRE_HAVE_VFP
-#   define __OGRE_HAVE_VFP  0
-#endif
-
-#ifndef __OGRE_HAVE_NEON
-#   define __OGRE_HAVE_NEON  0
-#endif
-}
-
-#endif  // __PlatformInformation_H__

CamelotUtility/Include/OgreQuaternion.h

@@ -39,7 +39,7 @@ THE SOFTWARE.
 #include "CmUtilPrerequisites.h"
 #include "OgreMath.h"
 
-namespace Ogre {
+namespace CamelotEngine {
 
 	/** \addtogroup Core
 	*  @{

CamelotUtility/Include/OgreRay.h

@@ -33,7 +33,7 @@ THE SOFTWARE.
 
 #include "OgreVector3.h"
 
-namespace Ogre {
+namespace CamelotEngine {
 
 	/** \addtogroup Core
 	*  @{

CamelotUtility/Include/OgreSphere.h

@@ -33,7 +33,7 @@ THE SOFTWARE.
 
 #include "OgreVector3.h"
 
-namespace Ogre {
+namespace CamelotEngine {
 
 
 	/** \addtogroup Core

CamelotUtility/Include/OgreVector2.h

@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include "CmUtilPrerequisites.h"
 #include "OgreMath.h"
 
-namespace Ogre
+namespace CamelotEngine
 {
 
 	/** \addtogroup Core

CamelotUtility/Include/OgreVector3.h

@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include "OgreMath.h"
 #include "OgreQuaternion.h"
 
-namespace Ogre
+namespace CamelotEngine
 {
 
 	/** \addtogroup Core

CamelotUtility/Include/OgreVector4.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "CmUtilPrerequisites.h"
 #include "OgreVector3.h"
 
-namespace Ogre
+namespace CamelotEngine
 {
 
 	/** \addtogroup Core

CamelotUtility/Include/asm_math.h

@@ -8,7 +8,7 @@
 // disable "instruction may be inaccurate on some Pentiums"
 #  pragma warning (disable : 4725)
 #endif
-namespace Ogre
+namespace CamelotEngine
 {
 
 /*=============================================================================

CamelotUtility/Source/OgreMath.cpp

@@ -36,7 +36,7 @@ THE SOFTWARE.
 #include "OgrePlane.h"
 
 
-namespace Ogre
+namespace CamelotEngine
 {
 
     const float Math::POS_INFINITY = std::numeric_limits<float>::infinity();

CamelotUtility/Source/OgreMatrix3.cpp

@@ -31,7 +31,7 @@ THE SOFTWARE.
 
 // Adapted from Matrix math by Wild Magic http://www.geometrictools.com/
 
-namespace Ogre
+namespace CamelotEngine
 {
     const float Matrix3::EPSILON = 1e-06f;
     const Matrix3 Matrix3::ZERO(0,0,0,0,0,0,0,0,0);

CamelotUtility/Source/OgreMatrix4.cpp

@@ -30,7 +30,7 @@ THE SOFTWARE.
 #include "OgreVector3.h"
 #include "OgreMatrix3.h"
 
-namespace Ogre
+namespace CamelotEngine
 {
 
     const Matrix4 Matrix4::ZERO(

CamelotUtility/Source/OgrePlane.cpp

@@ -30,7 +30,7 @@ THE SOFTWARE.
 #include "OgreMatrix3.h"
 #include "OgreAxisAlignedBox.h" 
 
-namespace Ogre {
+namespace CamelotEngine {
 	//-----------------------------------------------------------------------
 	Plane::Plane ()
 	{
@@ -167,4 +167,4 @@ namespace Ogre {
 		o << "Plane(normal=" << p.normal << ", d=" << p.d << ")";
 		return o;
 	}
-} // namespace Ogre
+} // namespace CamelotEngine

CamelotUtility/Source/OgreQuaternion.cpp

@@ -39,7 +39,7 @@ THE SOFTWARE.
 #include "OgreMatrix3.h"
 #include "OgreVector3.h"
 
-namespace Ogre {
+namespace CamelotEngine {
 
     const float Quaternion::ms_fEpsilon = 1e-03f;
     const Quaternion Quaternion::ZERO(0.0,0.0,0.0,0.0);

CamelotUtility/Source/OgreVector2.cpp

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include "OgreVector2.h"
 #include "OgreMath.h"
 
-namespace Ogre
+namespace CamelotEngine
 {
     const Vector2 Vector2::ZERO( 0, 0);
 

CamelotUtility/Source/OgreVector3.cpp

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #include "OgreVector3.h"
 #include "OgreMath.h"
 
-namespace Ogre
+namespace CamelotEngine
 {
     const Vector3 Vector3::ZERO( 0, 0, 0 );
 

CamelotUtility/Source/OgreVector4.cpp

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #include "OgreVector4.h"
 #include "OgreMath.h"
 
-namespace Ogre
+namespace CamelotEngine
 {
     const Vector4 Vector4::ZERO( 0, 0, 0, 0 );
 }