Renamed some more utility classes

CamelotRenderer/CamelotRenderer.cpp

@@ -5,15 +5,15 @@
 
 #include <string>
 
-#include "OgreColourValue.h"
+#include "CmColourValue.h"
 #include "CmMath.h"
 #include "CmMatrix3.h"
 #include "CmMatrix4.h"
 #include "CmPlane.h"
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 #include "CmQuaternion.h"
-#include "OgreString.h"
-#include "OgreStringConverter.h"
+#include "CmString.h"
+#include "CmStringConverter.h"
 #include "CmVector2.h"
 #include "CmVector3.h"
 #include "CmVector4.h"

CamelotRenderer/CamelotRenderer.vcxproj

@@ -95,12 +95,12 @@
     <ClInclude Include="CmD3D9RenderSystemFactory.h" />
     <ClInclude Include="CmRenderSystemFactory.h" />
     <ClInclude Include="CmRenderSystemManager.h" />
-    <ClInclude Include="OgreBitwise.h" />
-    <ClInclude Include="OgreBlendMode.h" />
+    <ClInclude Include="CmBitwise.h" />
+    <ClInclude Include="CmBlendMode.h" />
     <ClInclude Include="CmCamera.h" />
-    <ClInclude Include="OgreColourValue.h" />
-    <ClInclude Include="OgreCommon.h" />
-    <ClInclude Include="OgreConfigOptionMap.h" />
+    <ClInclude Include="CmColourValue.h" />
+    <ClInclude Include="CmCommon.h" />
+    <ClInclude Include="CmConfigOptionMap.h" />
     <ClInclude Include="CmD3D9Device.h" />
     <ClInclude Include="CmD3D9DeviceManager.h" />
     <ClInclude Include="CmD3D9Driver.h" />
@@ -127,7 +127,7 @@
     <ClInclude Include="CmD3D9VideoMode.h" />
     <ClInclude Include="CmD3D9VideoModeList.h" />
     <ClInclude Include="CmDefaultHardwareBufferManager.h" />
-    <ClInclude Include="OgreException.h" />
+    <ClInclude Include="CmException.h" />
     <ClInclude Include="CmFrustum.h" />
     <ClInclude Include="CmGpuProgram.h" />
     <ClInclude Include="CmGpuProgramManager.h" />
@@ -138,28 +138,28 @@
     <ClInclude Include="CmHardwareOcclusionQuery.h" />
     <ClInclude Include="CmHardwarePixelBuffer.h" />
     <ClInclude Include="CmHardwareVertexBuffer.h" />
-    <ClInclude Include="OgreHeaderPrefix.h" />
-    <ClInclude Include="OgreHeaderSuffix.h" />
+    <ClInclude Include="CmHeaderPrefix.h" />
+    <ClInclude Include="CmHeaderSuffix.h" />
     <ClInclude Include="CmHighLevelGpuProgram.h" />
     <ClInclude Include="CmHighLevelGpuProgramManager.h" />
-    <ClInclude Include="OgreImageResampler.h" />
-    <ClInclude Include="OgrePixelFormat.h" />
-    <ClInclude Include="OgrePrerequisites.h" />
-    <ClInclude Include="OgreRenderOperation.h" />
+    <ClInclude Include="CmImageResampler.h" />
+    <ClInclude Include="CmPixelFormat.h" />
+    <ClInclude Include="CmPrerequisites.h" />
+    <ClInclude Include="CmRenderOperation.h" />
     <ClInclude Include="CmRenderSystem.h" />
     <ClInclude Include="CmRenderSystemCapabilities.h" />
     <ClInclude Include="CmRenderTarget.h" />
     <ClInclude Include="CmRenderTexture.h" />
     <ClInclude Include="CmRenderWindow.h" />
-    <ClInclude Include="OgreSingleton.h" />
-    <ClInclude Include="OgreString.h" />
-    <ClInclude Include="OgreStringConverter.h" />
+    <ClInclude Include="CmSingleton.h" />
+    <ClInclude Include="CmString.h" />
+    <ClInclude Include="CmStringConverter.h" />
     <ClInclude Include="CmTexture.h" />
     <ClInclude Include="CmTextureManager.h" />
     <ClInclude Include="CmTextureState.h" />
     <ClInclude Include="CmVertexIndexData.h" />
     <ClInclude Include="CmViewport.h" />
-    <ClInclude Include="OgreWindowEventUtilities.h" />
+    <ClInclude Include="CmWindowEventUtilities.h" />
     <ClInclude Include="RenderSystemGL\Include\CmGLATIFSInit.h" />
     <ClInclude Include="RenderSystemGL\Include\CmGLContext.h" />
     <ClInclude Include="RenderSystemGL\Include\CmGLDefaultHardwareBufferManager.h" />
@@ -226,7 +226,7 @@
     <ClCompile Include="CmD3D9RenderSystemFactory.cpp" />
     <ClCompile Include="CmRenderSystemManager.cpp" />
     <ClCompile Include="CmCamera.cpp" />
-    <ClCompile Include="OgreColourValue.cpp" />
+    <ClCompile Include="CmColourValue.cpp" />
     <ClCompile Include="CmD3D9Device.cpp" />
     <ClCompile Include="CmD3D9DeviceManager.cpp" />
     <ClCompile Include="CmD3D9Driver.cpp" />
@@ -252,7 +252,7 @@
     <ClCompile Include="CmD3D9VideoMode.cpp" />
     <ClCompile Include="CmD3D9VideoModeList.cpp" />
     <ClCompile Include="CmDefaultHardwareBufferManager.cpp" />
-    <ClCompile Include="OgreException.cpp" />
+    <ClCompile Include="CmException.cpp" />
     <ClCompile Include="CmFrustum.cpp" />
     <ClCompile Include="CmGpuProgram.cpp" />
     <ClCompile Include="CmGpuProgramManager.cpp" />
@@ -264,20 +264,20 @@
     <ClCompile Include="CmHardwareVertexBuffer.cpp" />
     <ClCompile Include="CmHighLevelGpuProgram.cpp" />
     <ClCompile Include="CmHighLevelGpuProgramManager.cpp" />
-    <ClCompile Include="OgrePixelFormat.cpp" />
+    <ClCompile Include="CmPixelFormat.cpp" />
     <ClCompile Include="CmRenderSystem.cpp" />
     <ClCompile Include="CmRenderSystemCapabilities.cpp" />
     <ClCompile Include="CmRenderTarget.cpp" />
     <ClCompile Include="CmRenderTexture.cpp" />
     <ClCompile Include="CmRenderWindow.cpp" />
-    <ClCompile Include="OgreString.cpp" />
-    <ClCompile Include="OgreStringConverter.cpp" />
+    <ClCompile Include="CmString.cpp" />
+    <ClCompile Include="CmStringConverter.cpp" />
     <ClCompile Include="CmTexture.cpp" />
     <ClCompile Include="CmTextureManager.cpp" />
     <ClCompile Include="CmTextureState.cpp" />
     <ClCompile Include="CmVertexIndexData.cpp" />
     <ClCompile Include="CmViewport.cpp" />
-    <ClCompile Include="OgreWindowEventUtilities.cpp" />
+    <ClCompile Include="CmWindowEventUtilities.cpp" />
     <ClCompile Include="RenderSystemGL\Source\atifs\src\ATI_FS_GLGpuProgram.cpp" />
     <ClCompile Include="RenderSystemGL\Source\atifs\src\Compiler2Pass.cpp" />
     <ClCompile Include="RenderSystemGL\Source\atifs\src\ps_1_4.cpp" />

CamelotRenderer/CamelotRenderer.vcxproj.filters

@@ -65,51 +65,6 @@
     <ClInclude Include="targetver.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="OgreBitwise.h">
-      <Filter>Header Files\ForRemoval</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreException.h">
-      <Filter>Header Files\ForRemoval</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreHeaderPrefix.h">
-      <Filter>Header Files\ForRemoval</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreHeaderSuffix.h">
-      <Filter>Header Files\ForRemoval</Filter>
-    </ClInclude>
-    <ClInclude Include="OgrePrerequisites.h">
-      <Filter>Header Files\ForRemoval</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreSingleton.h">
-      <Filter>Header Files\ForRemoval</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreString.h">
-      <Filter>Header Files\ForRemoval</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreStringConverter.h">
-      <Filter>Header Files\ForRemoval</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreRenderOperation.h">
-      <Filter>Header Files\ForRemoval</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreBlendMode.h">
-      <Filter>Header Files\Utility</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreColourValue.h">
-      <Filter>Header Files\Utility</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreCommon.h">
-      <Filter>Header Files\Utility</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreImageResampler.h">
-      <Filter>Header Files\Utility</Filter>
-    </ClInclude>
-    <ClInclude Include="OgrePixelFormat.h">
-      <Filter>Header Files\Utility</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreWindowEventUtilities.h">
-      <Filter>Header Files\Utility</Filter>
-    </ClInclude>
     <ClInclude Include="CmRenderSystemFactory.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -185,9 +140,6 @@
     <ClInclude Include="RenderSystemGL\Include\CmGLRenderSystemFactory.h">
       <Filter>RenderSystemGL\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="OgreConfigOptionMap.h">
-      <Filter>Header Files\ForRemoval</Filter>
-    </ClInclude>
     <ClInclude Include="CmCamera.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -443,6 +395,54 @@
     <ClInclude Include="RenderSystemGL\Include\CmWin32Window.h">
       <Filter>RenderSystemGL\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="CmBitwise.h">
+      <Filter>Header Files\ForRemoval</Filter>
+    </ClInclude>
+    <ClInclude Include="CmConfigOptionMap.h">
+      <Filter>Header Files\ForRemoval</Filter>
+    </ClInclude>
+    <ClInclude Include="CmException.h">
+      <Filter>Header Files\ForRemoval</Filter>
+    </ClInclude>
+    <ClInclude Include="CmHeaderPrefix.h">
+      <Filter>Header Files\ForRemoval</Filter>
+    </ClInclude>
+    <ClInclude Include="CmHeaderSuffix.h">
+      <Filter>Header Files\ForRemoval</Filter>
+    </ClInclude>
+    <ClInclude Include="CmPrerequisites.h">
+      <Filter>Header Files\ForRemoval</Filter>
+    </ClInclude>
+    <ClInclude Include="CmRenderOperation.h">
+      <Filter>Header Files\ForRemoval</Filter>
+    </ClInclude>
+    <ClInclude Include="CmSingleton.h">
+      <Filter>Header Files\ForRemoval</Filter>
+    </ClInclude>
+    <ClInclude Include="CmString.h">
+      <Filter>Header Files\ForRemoval</Filter>
+    </ClInclude>
+    <ClInclude Include="CmStringConverter.h">
+      <Filter>Header Files\ForRemoval</Filter>
+    </ClInclude>
+    <ClInclude Include="CmBlendMode.h">
+      <Filter>Header Files\Utility</Filter>
+    </ClInclude>
+    <ClInclude Include="CmColourValue.h">
+      <Filter>Header Files\Utility</Filter>
+    </ClInclude>
+    <ClInclude Include="CmCommon.h">
+      <Filter>Header Files\Utility</Filter>
+    </ClInclude>
+    <ClInclude Include="CmImageResampler.h">
+      <Filter>Header Files\Utility</Filter>
+    </ClInclude>
+    <ClInclude Include="CmPixelFormat.h">
+      <Filter>Header Files\Utility</Filter>
+    </ClInclude>
+    <ClInclude Include="CmWindowEventUtilities.h">
+      <Filter>Header Files\Utility</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -451,24 +451,6 @@
     <ClCompile Include="CamelotRenderer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="OgreException.cpp">
-      <Filter>Source Files\ForRemoval</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreString.cpp">
-      <Filter>Source Files\ForRemoval</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreStringConverter.cpp">
-      <Filter>Source Files\ForRemoval</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreColourValue.cpp">
-      <Filter>Source Files\Utility</Filter>
-    </ClCompile>
-    <ClCompile Include="OgrePixelFormat.cpp">
-      <Filter>Source Files\Utility</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreWindowEventUtilities.cpp">
-      <Filter>Source Files\Utility</Filter>
-    </ClCompile>
     <ClCompile Include="CmD3D9RenderSystemFactory.cpp">
       <Filter>Source Files\D3D9RenderSystem</Filter>
     </ClCompile>
@@ -796,5 +778,23 @@
     <ClCompile Include="RenderSystemGL\Source\CmWin32Window.cpp">
       <Filter>RenderSystemGL\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="CmException.cpp">
+      <Filter>Source Files\ForRemoval</Filter>
+    </ClCompile>
+    <ClCompile Include="CmString.cpp">
+      <Filter>Source Files\ForRemoval</Filter>
+    </ClCompile>
+    <ClCompile Include="CmStringConverter.cpp">
+      <Filter>Source Files\ForRemoval</Filter>
+    </ClCompile>
+    <ClCompile Include="CmColourValue.cpp">
+      <Filter>Source Files\Utility</Filter>
+    </ClCompile>
+    <ClCompile Include="CmPixelFormat.cpp">
+      <Filter>Source Files\Utility</Filter>
+    </ClCompile>
+    <ClCompile Include="CmWindowEventUtilities.cpp">
+      <Filter>Source Files\Utility</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

CamelotRenderer/CmApplication.cpp

@@ -3,7 +3,7 @@
 #include "CmRenderSystem.h"
 #include "CmRenderSystemManager.h"
 
-#include "OgreWindowEventUtilities.h"
+#include "CmWindowEventUtilities.h"
 #include "CmHardwareBufferManager.h"
 #include "CmRenderWindow.h"
 #include "CmCamera.h"

CamelotRenderer/OgreBitwise.h → CamelotRenderer/CmBitwise.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef _Bitwise_H__
 #define _Bitwise_H__
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 
 namespace CamelotEngine {
 	/** \addtogroup Core

CamelotRenderer/OgreBlendMode.h → CamelotRenderer/CmBlendMode.h

@@ -28,8 +28,8 @@ THE SOFTWARE.
 #ifndef __BLENDMODE_H__
 #define __BLENDMODE_H__
 
-#include "OgrePrerequisites.h"
-#include "OgreColourValue.h"
+#include "CmPrerequisites.h"
+#include "CmColourValue.h"
 
 namespace CamelotEngine {
 	/** \addtogroup Core

CamelotRenderer/CmCamera.cpp

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "CmMatrix3.h"
 #include "CmAxisAlignedBox.h"
 #include "CmSphere.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmRenderSystem.h"
 
 #if CM_PLATFORM == OGRE_PLATFORM_IPHONE

CamelotRenderer/CmCamera.h

@@ -29,16 +29,16 @@ THE SOFTWARE.
 #define __Camera_H__
 
 // Default options
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 
-#include "OgreString.h"
+#include "CmString.h"
 
 // Matrices & Vectors
 #include "CmMatrix4.h"
 #include "CmVector3.h"
 #include "CmPlane.h"
 #include "CmQuaternion.h"
-#include "OgreCommon.h"
+#include "CmCommon.h"
 #include "CmFrustum.h"
 #include "CmRay.h"
 

CamelotRenderer/OgreColourValue.cpp → CamelotRenderer/CmColourValue.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreColourValue.h"
+#include "CmColourValue.h"
 #include "CmMath.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreColourValue.h → CamelotRenderer/CmColourValue.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef _COLOURVALUE_H__
 #define _COLOURVALUE_H__
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 
 namespace CamelotEngine {
 	/** \addtogroup Core

CamelotRenderer/OgreCommon.h → CamelotRenderer/CmCommon.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __Common_H__
 // Common stuff
 
-#include "OgreString.h"
+#include "CmString.h"
 
 #if defined ( CM_GCC_VISIBILITY )
 #   pragma GCC visibility push(default)

CamelotRenderer/OgreConfigOptionMap.h → CamelotRenderer/CmConfigOptionMap.h

@@ -29,9 +29,9 @@ THE SOFTWARE.
 #ifndef _ConfigOptionMap_H__
 #define _ConfigOptionMap_H__
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 
-#include "OgreString.h"
+#include "CmString.h"
 
 
 namespace CamelotEngine {

CamelotRenderer/CmD3D9Device.cpp

@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include "CmD3D9ResourceManager.h"
 #include "CmD3D9RenderWindow.h"
 #include "CmHardwareBufferManager.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine

CamelotRenderer/CmD3D9DeviceManager.cpp

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "CmD3D9RenderWindow.h"
 #include "CmD3D9Driver.h"
 #include "CmD3D9DriverList.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine

CamelotRenderer/CmD3D9Driver.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __D3D9DRIVER_H__
 
 #include "CmD3D9Prerequisites.h"
-#include "OgreString.h"
+#include "CmString.h"
 
 namespace CamelotEngine
 {

CamelotRenderer/CmD3D9DriverList.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 #include "CmD3D9DriverList.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmD3D9RenderSystem.h"
 
 namespace CamelotEngine 

CamelotRenderer/CmD3D9GpuProgram.cpp

@@ -27,7 +27,7 @@ THE SOFTWARE.
 */
 #include "CmD3D9GpuProgram.h"
 #include "CmMatrix4.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmD3D9Mappings.h"
 #include "CmD3D9RenderSystem.h"
 

CamelotRenderer/CmD3D9GpuProgramManager.cpp

@@ -27,7 +27,7 @@ THE SOFTWARE.
 */
 #include "CmD3D9GpuProgramManager.h"
 #include "CmD3D9GpuProgram.h"
-#include "OgreException.h"
+#include "CmException.h"
 
 namespace CamelotEngine {
     //-----------------------------------------------------------------------------

CamelotRenderer/CmD3D9HLSLProgram.cpp

@@ -27,9 +27,9 @@ THE SOFTWARE.
 */
 #include "CmD3D9HLSLProgram.h"
 #include "CmGpuProgramManager.h"
-#include "OgreStringConverter.h"
+#include "CmStringConverter.h"
 #include "CmD3D9GpuProgram.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmRenderSystem.h"
 #include "CmRenderSystemManager.h"
 

CamelotRenderer/CmD3D9HLSLProgramFactory.cpp

@@ -27,7 +27,7 @@ THE SOFTWARE.
 */
 
 #include "CmD3D9HLSLProgramFactory.h"
-#include "OgreString.h"
+#include "CmString.h"
 #include "CmD3D9HLSLProgram.h"
 
 namespace CamelotEngine {

CamelotRenderer/CmD3D9HardwareBufferManager.cpp

@@ -29,8 +29,8 @@ THE SOFTWARE.
 #include "CmD3D9HardwareVertexBuffer.h"
 #include "CmD3D9HardwareIndexBuffer.h"
 #include "CmD3D9VertexDeclaration.h"
-#include "OgreStringConverter.h"
-#include "OgreException.h"
+#include "CmStringConverter.h"
+#include "CmException.h"
 
 namespace CamelotEngine {
     //-----------------------------------------------------------------------

CamelotRenderer/CmD3D9HardwareIndexBuffer.cpp

@@ -27,7 +27,7 @@ THE SOFTWARE.
 */
 #include "CmD3D9HardwareIndexBuffer.h"
 #include "CmD3D9Mappings.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmD3D9HardwareBufferManager.h"
 #include "CmD3D9RenderSystem.h"
 #include "CmD3D9Device.h"

CamelotRenderer/CmD3D9HardwareOcclusionQuery.cpp

@@ -27,7 +27,7 @@ THE SOFTWARE.
 */
 #include "CmD3D9HardwareOcclusionQuery.h"
 #include "CmRenderSystemCapabilities.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmD3D9RenderSystem.h"
 
 namespace CamelotEngine {

CamelotRenderer/CmD3D9HardwarePixelBuffer.cpp

@@ -28,9 +28,9 @@ THE SOFTWARE.
 #include "CmD3D9HardwarePixelBuffer.h"
 #include "CmD3D9Texture.h"
 #include "CmD3D9Mappings.h"
-#include "OgreException.h"
-#include "OgreStringConverter.h"
-#include "OgreBitwise.h"
+#include "CmException.h"
+#include "CmStringConverter.h"
+#include "CmBitwise.h"
 #include "CmRenderSystem.h"
 #include "CmRenderSystemManager.h"
 

CamelotRenderer/CmD3D9HardwareVertexBuffer.cpp

@@ -27,7 +27,7 @@ THE SOFTWARE.
 */
 #include "CmD3D9HardwareVertexBuffer.h"
 #include "CmD3D9Mappings.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmD3D9HardwareBufferManager.h"
 #include "CmD3D9RenderSystem.h"
 #include "CmD3D9Device.h"

CamelotRenderer/CmD3D9Mappings.cpp

@@ -26,9 +26,9 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 #include "CmD3D9Mappings.h"
-#include "OgreString.h"
-#include "OgreStringConverter.h"
-#include "OgreException.h"
+#include "CmString.h"
+#include "CmStringConverter.h"
+#include "CmException.h"
 
 namespace CamelotEngine 
 {

CamelotRenderer/CmD3D9Mappings.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __D3D9MAPPINGS_H__
 
 #include "CmD3D9Prerequisites.h"
-#include "OgreCommon.h"
+#include "CmCommon.h"
 #include "CmRenderSystem.h"
 #include "CmHardwareBuffer.h"
 #include "CmHardwareIndexBuffer.h"

CamelotRenderer/CmD3D9MultiRenderTarget.cpp

@@ -27,9 +27,9 @@ THE SOFTWARE.
 */
 #include "CmD3D9MultiRenderTarget.h"
 #include "CmD3D9HardwarePixelBuffer.h"
-#include "OgreException.h"
-#include "OgreStringConverter.h"
-#include "OgreBitwise.h"
+#include "CmException.h"
+#include "CmStringConverter.h"
+#include "CmBitwise.h"
 #include "CmD3D9RenderSystem.h"
 #include "CmD3D9Device.h"
 #include "CmD3D9DeviceManager.h"

CamelotRenderer/CmD3D9MultiRenderTarget.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "CmD3D9Prerequisites.h"
 #include "CmTexture.h"
 #include "CmRenderTexture.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmD3D9HardwarePixelBuffer.h"
 
 namespace CamelotEngine {

CamelotRenderer/CmD3D9Prerequisites.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __D3D9PREREQUISITES_H__
 #define __D3D9PREREQUISITES_H__
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 #ifdef __MINGW32__
 #  include "WIN32/OgreMinGWSupport.h" // extra defines for MinGW to deal with DX SDK
 #endif

CamelotRenderer/CmD3D9RenderSystem.h

@@ -29,9 +29,9 @@ THE SOFTWARE.
 #define __D3D9RENDERSYSTEM_H__
 
 #include "CmD3D9Prerequisites.h"
-#include "OgreString.h"
-#include "OgreStringConverter.h"
-#include "OgreConfigOptionMap.h"
+#include "CmString.h"
+#include "CmStringConverter.h"
+#include "CmConfigOptionMap.h"
 #include "CmRenderSystem.h"
 #include "CmRenderSystemCapabilities.h"
 #include "CmD3D9Mappings.h"

CamelotRenderer/CmD3D9RenderWindow.cpp

@@ -27,12 +27,12 @@ THE SOFTWARE.
 */
 #include "CmD3D9RenderWindow.h"
 #include "CmViewport.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmD3D9RenderSystem.h"
 #include "CmRenderSystem.h"
-#include "OgreBitwise.h"
-#include "OgreStringConverter.h"
-#include "OgreWindowEventUtilities.h"
+#include "CmBitwise.h"
+#include "CmStringConverter.h"
+#include "CmWindowEventUtilities.h"
 #include "CmD3D9DeviceManager.h"
 #include "CmRenderSystemManager.h"
 

CamelotRenderer/CmD3D9Texture.cpp

@@ -27,9 +27,9 @@ THE SOFTWARE.
 */
 #include "CmD3D9Texture.h"
 #include "CmD3D9HardwarePixelBuffer.h"
-#include "OgreException.h"
-#include "OgreStringConverter.h"
-#include "OgreBitwise.h"
+#include "CmException.h"
+#include "CmStringConverter.h"
+#include "CmBitwise.h"
 #include "CmD3D9Mappings.h"
 #include "CmD3D9RenderSystem.h"
 #include "CmD3D9TextureManager.h"

CamelotRenderer/CmD3D9Texture.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "CmD3D9Prerequisites.h"
 #include "CmTexture.h"
 #include "CmRenderTexture.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmD3D9HardwarePixelBuffer.h"
 #include "CmD3D9Resource.h"
 

CamelotRenderer/CmD3D9TextureManager.cpp

@@ -27,8 +27,8 @@ THE SOFTWARE.
 */
 #include "CmD3D9TextureManager.h"
 #include "CmD3D9Texture.h"
-#include "OgreException.h"
-#include "OgreStringConverter.h"
+#include "CmException.h"
+#include "CmStringConverter.h"
 #include "CmD3D9Mappings.h"
 #include "CmD3D9RenderSystem.h"
 #include "CmRenderSystemManager.h"

CamelotRenderer/CmD3D9VertexDeclaration.cpp

@@ -27,7 +27,7 @@ THE SOFTWARE.
 */
 #include "CmD3D9VertexDeclaration.h"
 #include "CmD3D9Mappings.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmD3D9RenderSystem.h"
 
 namespace CamelotEngine {

CamelotRenderer/CmD3D9VideoMode.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __D3D9VIDEOMODE_H__
 
 #include "CmD3D9Prerequisites.h"
-#include "OgreString.h"
+#include "CmString.h"
 
 namespace CamelotEngine 
 {

CamelotRenderer/CmD3D9VideoModeList.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 #include "CmD3D9VideoModeList.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmD3D9RenderSystem.h"
 
 namespace CamelotEngine 

CamelotRenderer/CmDefaultHardwareBufferManager.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #ifndef __DefaultHardwareBufferManager_H__
 #define __DefaultHardwareBufferManager_H__
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 #include "CmHardwareBufferManager.h"
 #include "CmHardwareVertexBuffer.h"
 #include "CmHardwareIndexBuffer.h"

CamelotRenderer/OgreException.cpp → CamelotRenderer/CmException.cpp

@@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreException.h"
+#include "CmException.h"
 
 #ifdef __BORLANDC__
     #include <stdio.h>

CamelotRenderer/OgreException.h → CamelotRenderer/CmException.h

@@ -29,9 +29,9 @@ THE SOFTWARE.
 #define __Exception_H_
 
 // Precompiler options
-#include "OgrePrerequisites.h"
-#include "OgreHeaderPrefix.h"
-#include "OgreString.h"
+#include "CmPrerequisites.h"
+#include "CmHeaderPrefix.h"
+#include "CmString.h"
 #include <exception>
 
 // Backwards compatibility with old assert mode definitions
@@ -347,5 +347,5 @@ namespace CamelotEngine {
 
 } // namespace CamelotEngine
 
-#include "OgreHeaderSuffix.h"
+#include "CmHeaderSuffix.h"
 #endif

CamelotRenderer/CmFrustum.cpp

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "CmMath.h"
 #include "CmMatrix3.h"
 #include "CmSphere.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmHardwareBufferManager.h"
 #include "CmHardwareVertexBuffer.h"
 #include "CmHardwareIndexBuffer.h"

CamelotRenderer/CmFrustum.h

@@ -28,11 +28,11 @@ THE SOFTWARE.
 #ifndef __Frustum_H__
 #define __Frustum_H__
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 #include "CmVector2.h"
 #include "CmAxisAlignedBox.h"
 #include "CmVertexIndexData.h"
-#include "OgreString.h"
+#include "CmString.h"
 
 namespace CamelotEngine
 {

CamelotRenderer/CmGpuProgram.cpp

@@ -30,8 +30,8 @@ THE SOFTWARE.
 #include "CmVector3.h"
 #include "CmVector4.h"
 #include "CmRenderSystemCapabilities.h"
-#include "OgreStringConverter.h"
-#include "OgreException.h"
+#include "CmStringConverter.h"
+#include "CmException.h"
 #include "CmRenderSystem.h"
 #include "CmRenderSystemManager.h"
 

CamelotRenderer/CmGpuProgram.h

@@ -29,8 +29,8 @@ THE SOFTWARE.
 #define __GpuProgram_H_
 
 // Precompiler options
-#include "OgrePrerequisites.h"
-#include "OgreRenderOperation.h"
+#include "CmPrerequisites.h"
+#include "CmRenderOperation.h"
 #include "CmGpuProgramParams.h"
 
 namespace CamelotEngine {

CamelotRenderer/CmGpuProgramManager.h

@@ -29,10 +29,10 @@ THE SOFTWARE.
 #define __GpuProgramManager_H_
 
 // Precompiler options
-#include "OgrePrerequisites.h"
-#include "OgreException.h"
+#include "CmPrerequisites.h"
+#include "CmException.h"
 #include "CmGpuProgram.h"
-#include "OgreSingleton.h"
+#include "CmSingleton.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/CmGpuProgramParams.cpp

@@ -30,8 +30,8 @@ THE SOFTWARE.
 #include "CmVector3.h"
 #include "CmVector4.h"
 #include "CmRenderSystemCapabilities.h"
-#include "OgreStringConverter.h"
-#include "OgreException.h"
+#include "CmStringConverter.h"
+#include "CmException.h"
 
 
 namespace CamelotEngine

CamelotRenderer/CmGpuProgramParams.h

@@ -29,8 +29,8 @@ THE SOFTWARE.
 #define __GpuProgramParams_H_
 
 // Precompiler options
-#include "OgrePrerequisites.h"
-#include "OgreRenderOperation.h"
+#include "CmPrerequisites.h"
+#include "CmRenderOperation.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/CmHardwareBuffer.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __HardwareBuffer__
 
 // Precompiler options
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/CmHardwareBufferManager.h

@@ -29,9 +29,9 @@ THE SOFTWARE.
 #define __HardwareBufferManager__
 
 // Precompiler options
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 
-#include "OgreSingleton.h"
+#include "CmSingleton.h"
 #include "CmHardwareVertexBuffer.h"
 #include "CmHardwareIndexBuffer.h"
 

CamelotRenderer/CmHardwareIndexBuffer.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __HardwareIndexBuffer__
 
 // Precompiler options
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 #include "CmHardwareBuffer.h"
 
 namespace CamelotEngine {

CamelotRenderer/CmHardwareOcclusionQuery.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define _HardwareOcclusionQuery__
 
 // Precompiler options
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/CmHardwarePixelBuffer.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 #include "CmHardwarePixelBuffer.h"
-#include "OgreException.h"
+#include "CmException.h"
 
 namespace CamelotEngine 
 {

CamelotRenderer/CmHardwarePixelBuffer.h

@@ -29,9 +29,9 @@ THE SOFTWARE.
 #define __HardwarePixelBuffer__
 
 // Precompiler options
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 #include "CmHardwareBuffer.h"
-#include "OgrePixelFormat.h"
+#include "CmPixelFormat.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/CmHardwareVertexBuffer.cpp

@@ -27,9 +27,9 @@ THE SOFTWARE.
 */
 
 #include "CmHardwareVertexBuffer.h"
-#include "OgreColourValue.h"
-#include "OgreException.h"
-#include "OgreStringConverter.h"
+#include "CmColourValue.h"
+#include "CmException.h"
+#include "CmStringConverter.h"
 #include "CmHardwareBufferManager.h"
 #include "CmDefaultHardwareBufferManager.h"
 #include "CmRenderSystem.h"

CamelotRenderer/CmHardwareVertexBuffer.h

@@ -29,9 +29,9 @@ THE SOFTWARE.
 #define __HardwareVertexBuffer__
 
 // Precompiler options
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 #include "CmHardwareBuffer.h"
-#include "OgreColourValue.h"
+#include "CmColourValue.h"
 
 namespace CamelotEngine {
 	class HardwareBufferManagerBase;

CamelotRenderer/OgreHeaderPrefix.h → CamelotRenderer/CmHeaderPrefix.h

@@ -26,7 +26,7 @@ THE SOFTWARE
 #ifndef __OgreHeaderPrefix_H__
 #define __OgreHeaderPrefix_H__
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 
 #if CM_COMPILER == CM_COMPILER_MSVC
 

CamelotRenderer/OgreHeaderSuffix.h → CamelotRenderer/CmHeaderSuffix.h

@@ -26,7 +26,7 @@ THE SOFTWARE
 #ifndef __OgreHeaderPrefix_H__
 #define __OgreHeaderPrefix_H__
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 
 #if CM_COMPILER == CM_COMPILER_MSVC
 

CamelotRenderer/CmHighLevelGpuProgram.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 #include "CmHighLevelGpuProgram.h"
-#include "OgreException.h"
+#include "CmException.h"
 
 namespace CamelotEngine
 {

CamelotRenderer/CmHighLevelGpuProgram.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __HighLevelGpuProgram_H__
 #define __HighLevelGpuProgram_H__
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 #include "CmGpuProgram.h"
 
 namespace CamelotEngine {

CamelotRenderer/CmHighLevelGpuProgramManager.h

@@ -28,9 +28,9 @@ THE SOFTWARE.
 #ifndef __HighLevelGpuProgramManager_H__
 #define __HighLevelGpuProgramManager_H__
 
-#include "OgrePrerequisites.h"
-#include "OgreSingleton.h"
-#include "OgreException.h"
+#include "CmPrerequisites.h"
+#include "CmSingleton.h"
+#include "CmException.h"
 #include "CmHighLevelGpuProgram.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgrePixelFormat.cpp → CamelotRenderer/CmPixelFormat.cpp

@@ -26,11 +26,11 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgrePixelFormat.h"
-#include "OgreBitwise.h"
-#include "OgreColourValue.h"
-#include "OgreImageResampler.h"
-#include "OgreException.h"
+#include "CmPixelFormat.h"
+#include "CmBitwise.h"
+#include "CmColourValue.h"
+#include "CmImageResampler.h"
+#include "CmException.h"
 
 
 namespace CamelotEngine {

CamelotRenderer/OgrePixelFormat.h → CamelotRenderer/CmPixelFormat.h

@@ -28,8 +28,8 @@ THE SOFTWARE.
 #ifndef _PixelFormat_H__
 #define _PixelFormat_H__
 
-#include "OgrePrerequisites.h"
-#include "OgreCommon.h"
+#include "CmPrerequisites.h"
+#include "CmCommon.h"
 
 namespace CamelotEngine {
 	/** \addtogroup Core

CamelotRenderer/OgreRenderOperation.h → CamelotRenderer/CmRenderOperation.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef _RenderOperation_H__
 #define _RenderOperation_H__
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 #include "CmVertexIndexData.h"
 
 namespace CamelotEngine {

CamelotRenderer/CmRenderSystem.cpp

@@ -34,7 +34,7 @@ THE SOFTWARE.
 #include "CmRenderSystem.h"
 
 #include "CmViewport.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmRenderTarget.h"
 #include "CmRenderWindow.h"
 #include "CmHardwarePixelBuffer.h"

CamelotRenderer/CmRenderSystem.h

@@ -29,16 +29,16 @@ THE SOFTWARE.
 #define __RenderSystem_H_
 
 // Precompiler options
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 
 #include <memory>
 
-#include "OgreString.h"
+#include "CmString.h"
 
 #include "CmTextureState.h"
-#include "OgreCommon.h"
+#include "CmCommon.h"
 
-#include "OgreRenderOperation.h"
+#include "CmRenderOperation.h"
 #include "CmRenderSystemCapabilities.h"
 #include "CmRenderTarget.h"
 #include "CmRenderTexture.h"

CamelotRenderer/CmRenderSystemCapabilities.cpp

@@ -26,9 +26,9 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 #include "CmRenderSystemCapabilities.h"
-#include "OgreStringConverter.h"
-#include "OgreException.h"
-#include "OgreString.h"
+#include "CmStringConverter.h"
+#include "CmException.h"
+#include "CmString.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/CmRenderSystemCapabilities.h

@@ -29,9 +29,9 @@ THE SOFTWARE.
 #define __RenderSystemCapabilities__ 1
 
 // Precompiler options
-#include "OgrePrerequisites.h"
-#include "OgreString.h"
-#include "OgreStringConverter.h"
+#include "CmPrerequisites.h"
+#include "CmString.h"
+#include "CmStringConverter.h"
 
 // Because there are more than 32 possible Capabilities, more than 1 int is needed to store them all.
 // In fact, an array of integers is used to store capabilities. However all the capabilities are defined in the single

CamelotRenderer/CmRenderSystemManager.cpp

@@ -1,5 +1,5 @@
 #include "CmRenderSystemManager.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmRenderSystem.h"
 
 namespace CamelotEngine

CamelotRenderer/CmRenderTarget.cpp

@@ -26,10 +26,10 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 #include "CmRenderTarget.h"
-#include "OgreStringConverter.h"
+#include "CmStringConverter.h"
 
 #include "CmViewport.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmRenderSystem.h"
 #include "CmRenderSystemManager.h"
 

CamelotRenderer/CmRenderTarget.h

@@ -28,10 +28,10 @@ THE SOFTWARE.
 #ifndef __RenderTarget_H__
 #define __RenderTarget_H__
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 
-#include "OgreString.h"
-#include "OgrePixelFormat.h"
+#include "CmString.h"
+#include "CmPixelFormat.h"
 #include "CmViewport.h"
 
 /* Define the number of priority groups for the render system's render targets. */

CamelotRenderer/CmRenderTexture.cpp

@@ -27,7 +27,7 @@ THE SOFTWARE.
 */
 
 #include "CmRenderTexture.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmHardwarePixelBuffer.h"
 
 namespace CamelotEngine

CamelotRenderer/CmRenderTexture.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __RenderTexture_H__
 #define __RenderTexture_H__
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 
 #include "CmRenderTarget.h"
 

CamelotRenderer/CmRenderWindow.h

@@ -26,7 +26,7 @@ THE SOFTWARE
 #ifndef __RenderWindow_H__
 #define __RenderWindow_H__
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 
 #include "CmRenderTarget.h"
 

CamelotRenderer/OgreSingleton.h → CamelotRenderer/CmSingleton.h

@@ -38,8 +38,8 @@ THE SOFTWARE.
 #define _SINGLETON_H__
 
 // Added by Steve Streeting for Ogre
-#include "OgrePrerequisites.h"
-#include "OgreHeaderPrefix.h"
+#include "CmPrerequisites.h"
+#include "CmHeaderPrefix.h"
 
 #if CM_COMPILER == CM_COMPILER_MSVC
 // Turn off warnings generated by this singleton implementation
@@ -100,5 +100,5 @@ namespace CamelotEngine {
 #   pragma GCC visibility pop
 #endif
 
-#include "OgreHeaderSuffix.h"
+#include "CmHeaderSuffix.h"
 #endif

CamelotRenderer/OgreString.cpp → CamelotRenderer/CmString.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreString.h"
+#include "CmString.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreString.h → CamelotRenderer/CmString.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef _String_H__
 #define _String_H__
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 
 // If we're using the GCC 3.1 C++ Std lib
 #if CM_COMPILER == CM_COMPILER_GNUC && CM_COMP_VER >= 310 && !defined(STLPORT)

CamelotRenderer/OgreStringConverter.cpp → CamelotRenderer/CmStringConverter.cpp

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

CamelotRenderer/OgreStringConverter.h → CamelotRenderer/CmStringConverter.h

@@ -29,9 +29,9 @@ THE SOFTWARE.
 #ifndef __StringConverter_H__
 #define __StringConverter_H__
 
-#include "OgrePrerequisites.h"
-#include "OgreString.h"
-#include "OgreColourValue.h"
+#include "CmPrerequisites.h"
+#include "CmString.h"
+#include "CmColourValue.h"
 #include "CmMath.h"
 #include "CmMatrix3.h"
 #include "CmMatrix4.h"

CamelotRenderer/CmTexture.cpp

@@ -27,7 +27,7 @@ THE SOFTWARE.
 */
 #include "CmHardwarePixelBuffer.h"
 #include "CmTexture.h"
-#include "OgreException.h"
+#include "CmException.h"
 
 namespace CamelotEngine {
 	//--------------------------------------------------------------------------

CamelotRenderer/CmTexture.h

@@ -28,9 +28,9 @@ THE SOFTWARE.
 #ifndef _Texture_H__
 #define _Texture_H__
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 #include "CmHardwareBuffer.h"
-#include "OgrePixelFormat.h"
+#include "CmPixelFormat.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/CmTextureManager.cpp

@@ -26,8 +26,8 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 #include "CmTextureManager.h"
-#include "OgreException.h"
-#include "OgrePixelFormat.h"
+#include "CmException.h"
+#include "CmPixelFormat.h"
 
 namespace CamelotEngine {
     //-----------------------------------------------------------------------

CamelotRenderer/CmTextureManager.h

@@ -29,10 +29,10 @@ THE SOFTWARE.
 #define _TextureManager_H__
 
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 
 #include "CmTexture.h"
-#include "OgreSingleton.h"
+#include "CmSingleton.h"
 
 
 namespace CamelotEngine {

CamelotRenderer/CmTextureState.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 #include "CmTextureState.h"
-#include "OgreException.h"
+#include "CmException.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/CmTextureState.h

@@ -28,12 +28,12 @@ THE SOFTWARE.
 #ifndef __TextureState_H__
 #define __TextureState_H__
 
-#include "OgrePrerequisites.h"
-#include "OgreCommon.h"
-#include "OgreBlendMode.h"
+#include "CmPrerequisites.h"
+#include "CmCommon.h"
+#include "CmBlendMode.h"
 #include "CmMatrix4.h"
-#include "OgreString.h"
-#include "OgrePixelFormat.h"
+#include "CmString.h"
+#include "CmPixelFormat.h"
 #include "CmTexture.h"
 
 namespace CamelotEngine {

CamelotRenderer/CmVertexIndexData.cpp

@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include "CmHardwareIndexBuffer.h"
 #include "CmVector3.h"
 #include "CmAxisAlignedBox.h"
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmRenderSystem.h"
 #include "CmRenderSystemManager.h"
 

CamelotRenderer/CmVertexIndexData.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __VertexIndexData_H__
 #define __VertexIndexData_H__
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 #include "CmHardwareVertexBuffer.h"
 #include "CmHardwareIndexBuffer.h"
 

CamelotRenderer/CmViewport.cpp

@@ -27,7 +27,7 @@ THE SOFTWARE.
 */
 #include "CmViewport.h"
 
-#include "OgreException.h"
+#include "CmException.h"
 #include "CmRenderTarget.h"
 #include "CmMath.h"
 #include "CmRenderSystem.h"

CamelotRenderer/CmViewport.h

@@ -28,9 +28,9 @@ THE SOFTWARE.
 #ifndef __Viewport_H__
 #define __Viewport_H__
 
-#include "OgrePrerequisites.h"
-#include "OgreCommon.h"
-#include "OgreColourValue.h"
+#include "CmPrerequisites.h"
+#include "CmCommon.h"
+#include "CmColourValue.h"
 #include "CmFrustum.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreWindowEventUtilities.cpp → CamelotRenderer/CmWindowEventUtilities.cpp

@@ -25,10 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreWindowEventUtilities.h"
+#include "CmWindowEventUtilities.h"
 #include "CmRenderWindow.h"
-#include "OgreException.h"
-#include "OgreStringConverter.h"
+#include "CmException.h"
+#include "CmStringConverter.h"
 #if CM_PLATFORM == CM_PLATFORM_LINUX
 #include <X11/Xlib.h>
 void GLXProc( CamelotEngine::RenderWindow *win, const XEvent &event );

CamelotRenderer/OgreWindowEventUtilities.h → CamelotRenderer/CmWindowEventUtilities.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __OgreWindowEventUtils_H__
 #define __OgreWindowEventUtils_H__
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 
 #if CM_PLATFORM == CM_PLATFORM_WIN32
 #  define WIN32_LEAN_AND_MEAN

CamelotRenderer/RenderSystemGL/Include/CmGLPixelFormat.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __GLPIXELFORMAT_H__
 
 #include "CmGLPrerequisites.h"
-#include "OgrePixelFormat.h"
+#include "CmPixelFormat.h"
 namespace CamelotEngine {
     
 	/**

CamelotRenderer/RenderSystemGL/Include/CmGLPrerequisites.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __GLPrerequisites_H__
 #define __GLPrerequisites_H__
 
-#include "OgrePrerequisites.h"
+#include "CmPrerequisites.h"
 
 namespace CamelotEngine {
     // Forward declarations

CamelotRenderer/RenderSystemGL/Include/CmGLRenderSystem.h

@@ -33,7 +33,7 @@ THE SOFTWARE.
 #include "CmGLHardwareBufferManager.h"
 #include "CmGLGpuProgramManager.h"
 #include "CmGLSLProgramFactory.h"
-#include "OgreConfigOptionMap.h"
+#include "CmConfigOptionMap.h"
 #include "CmVector4.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Include/CmGLSupport.h

@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include "CmGLRenderSystem.h"
 
 #include "CmRenderWindow.h"
-#include "OgreConfigOptionMap.h"
+#include "CmConfigOptionMap.h"
 #include "CmGLPBuffer.h"
 
 namespace CamelotEngine

CamelotRenderer/RenderSystemGL/Source/CmGLDefaultHardwareBufferManager.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 #include "CmGLDefaultHardwareBufferManager.h"
-#include "OgreException.h"
+#include "CmException.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/RenderSystemGL/Source/CmGLFBOMultiRenderTarget.cpp

@@ -28,7 +28,7 @@ THE SOFTWARE.
 
 #include "CmGLFBOMultiRenderTarget.h"
 #include "CmGLPixelFormat.h"
-#include "OgreStringConverter.h"
+#include "CmStringConverter.h"
 #include "CmGLHardwarePixelBuffer.h"
 
 namespace CamelotEngine {

CamelotRenderer/RenderSystemGL/Source/CmGLFBORenderTexture.cpp

@@ -28,7 +28,7 @@ THE SOFTWARE.
 
 #include "CmGLFBORenderTexture.h"
 #include "CmGLPixelFormat.h"
-#include "OgreStringConverter.h"
+#include "CmStringConverter.h"
 #include "CmGLHardwarePixelBuffer.h"
 #include "CmGLFBOMultiRenderTarget.h"