Renamed core renderer files

CamelotRenderer/CamelotRenderer.cpp

@@ -5,27 +5,23 @@
 
 #include <string>
 
-#include "OgreBuildSettings.h"
 #include "OgreColourValue.h"
-#include "OgreConfig.h"
 #include "CmMath.h"
 #include "CmMatrix3.h"
 #include "CmMatrix4.h"
 #include "CmPlane.h"
-#include "OgrePlatform.h"
 #include "OgrePrerequisites.h"
 #include "CmQuaternion.h"
 #include "OgreString.h"
 #include "OgreStringConverter.h"
-#include "OgreThreadDefines.h"
 #include "CmVector2.h"
 #include "CmVector3.h"
 #include "CmVector4.h"
-#include "OgreHardwareBuffer.h"
+#include "CmHardwareBuffer.h"
 
 #include "OgreD3D9Prerequisites.h"
 #include "OgreD3D9VideoMode.h"
-#include "OgreRenderSystem.h"
+#include "CmRenderSystem.h"
 
 #include "CmApplication.h"
 

CamelotRenderer/CamelotRenderer.vcxproj

@@ -95,14 +95,11 @@
     <ClInclude Include="CmD3D9RenderSystemFactory.h" />
     <ClInclude Include="CmRenderSystemFactory.h" />
     <ClInclude Include="CmRenderSystemManager.h" />
-    <ClInclude Include="OgreAlignedAllocator.h" />
     <ClInclude Include="OgreBitwise.h" />
     <ClInclude Include="OgreBlendMode.h" />
-    <ClInclude Include="OgreBuildSettings.h" />
-    <ClInclude Include="OgreCamera.h" />
+    <ClInclude Include="CmCamera.h" />
     <ClInclude Include="OgreColourValue.h" />
     <ClInclude Include="OgreCommon.h" />
-    <ClInclude Include="OgreConfig.h" />
     <ClInclude Include="OgreConfigOptionMap.h" />
     <ClInclude Include="OgreD3D9Device.h" />
     <ClInclude Include="OgreD3D9DeviceManager.h" />
@@ -129,44 +126,39 @@
     <ClInclude Include="OgreD3D9VertexDeclaration.h" />
     <ClInclude Include="OgreD3D9VideoMode.h" />
     <ClInclude Include="OgreD3D9VideoModeList.h" />
-    <ClInclude Include="OgreDefaultHardwareBufferManager.h" />
+    <ClInclude Include="CmDefaultHardwareBufferManager.h" />
     <ClInclude Include="OgreException.h" />
-    <ClInclude Include="OgreFrustum.h" />
-    <ClInclude Include="OgreGpuProgram.h" />
-    <ClInclude Include="OgreGpuProgramManager.h" />
-    <ClInclude Include="OgreGpuProgramParams.h" />
-    <ClInclude Include="OgreHardwareBuffer.h" />
-    <ClInclude Include="OgreHardwareBufferManager.h" />
-    <ClInclude Include="OgreHardwareIndexBuffer.h" />
-    <ClInclude Include="OgreHardwareOcclusionQuery.h" />
-    <ClInclude Include="OgreHardwarePixelBuffer.h" />
-    <ClInclude Include="OgreHardwareVertexBuffer.h" />
+    <ClInclude Include="CmFrustum.h" />
+    <ClInclude Include="CmGpuProgram.h" />
+    <ClInclude Include="CmGpuProgramManager.h" />
+    <ClInclude Include="CmGpuProgramParams.h" />
+    <ClInclude Include="CmHardwareBuffer.h" />
+    <ClInclude Include="CmHardwareBufferManager.h" />
+    <ClInclude Include="CmHardwareIndexBuffer.h" />
+    <ClInclude Include="CmHardwareOcclusionQuery.h" />
+    <ClInclude Include="CmHardwarePixelBuffer.h" />
+    <ClInclude Include="CmHardwareVertexBuffer.h" />
     <ClInclude Include="OgreHeaderPrefix.h" />
     <ClInclude Include="OgreHeaderSuffix.h" />
-    <ClInclude Include="OgreHighLevelGpuProgram.h" />
-    <ClInclude Include="OgreHighLevelGpuProgramManager.h" />
+    <ClInclude Include="CmHighLevelGpuProgram.h" />
+    <ClInclude Include="CmHighLevelGpuProgramManager.h" />
     <ClInclude Include="OgreImageResampler.h" />
     <ClInclude Include="OgrePixelFormat.h" />
-    <ClInclude Include="OgrePlatform.h" />
-    <ClInclude Include="OgrePlatformInformation.h" />
-    <ClInclude Include="OgrePortMemory.h" />
     <ClInclude Include="OgrePrerequisites.h" />
     <ClInclude Include="OgreRenderOperation.h" />
-    <ClInclude Include="OgreRenderSystem.h" />
-    <ClInclude Include="OgreRenderSystemCapabilities.h" />
-    <ClInclude Include="OgreRenderTarget.h" />
-    <ClInclude Include="OgreRenderTexture.h" />
-    <ClInclude Include="OgreRenderWindow.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="OgreStdHeaders.h" />
     <ClInclude Include="OgreString.h" />
     <ClInclude Include="OgreStringConverter.h" />
-    <ClInclude Include="OgreTexture.h" />
-    <ClInclude Include="OgreTextureManager.h" />
-    <ClInclude Include="OgreTextureState.h" />
-    <ClInclude Include="OgreThreadDefines.h" />
-    <ClInclude Include="OgreVertexIndexData.h" />
-    <ClInclude Include="OgreViewport.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="RenderSystemGL\Include\OgreGLATIFSInit.h" />
     <ClInclude Include="RenderSystemGL\Include\OgreGLContext.h" />
@@ -233,8 +225,7 @@
     <ClCompile Include="CmApplication.cpp" />
     <ClCompile Include="CmD3D9RenderSystemFactory.cpp" />
     <ClCompile Include="CmRenderSystemManager.cpp" />
-    <ClCompile Include="OgreAlignedAllocator.cpp" />
-    <ClCompile Include="OgreCamera.cpp" />
+    <ClCompile Include="CmCamera.cpp" />
     <ClCompile Include="OgreColourValue.cpp" />
     <ClCompile Include="OgreD3D9Device.cpp" />
     <ClCompile Include="OgreD3D9DeviceManager.cpp" />
@@ -260,32 +251,32 @@
     <ClCompile Include="OgreD3D9VertexDeclaration.cpp" />
     <ClCompile Include="OgreD3D9VideoMode.cpp" />
     <ClCompile Include="OgreD3D9VideoModeList.cpp" />
-    <ClCompile Include="OgreDefaultHardwareBufferManager.cpp" />
+    <ClCompile Include="CmDefaultHardwareBufferManager.cpp" />
     <ClCompile Include="OgreException.cpp" />
-    <ClCompile Include="OgreFrustum.cpp" />
-    <ClCompile Include="OgreGpuProgram.cpp" />
-    <ClCompile Include="OgreGpuProgramManager.cpp" />
-    <ClCompile Include="OgreGpuProgramParams.cpp" />
-    <ClCompile Include="OgreHardwareBufferManager.cpp" />
-    <ClCompile Include="OgreHardwareIndexBuffer.cpp" />
-    <ClCompile Include="OgreHardwareOcclusionQuery.cpp" />
-    <ClCompile Include="OgreHardwarePixelBuffer.cpp" />
-    <ClCompile Include="OgreHardwareVertexBuffer.cpp" />
-    <ClCompile Include="OgreHighLevelGpuProgram.cpp" />
-    <ClCompile Include="OgreHighLevelGpuProgramManager.cpp" />
+    <ClCompile Include="CmFrustum.cpp" />
+    <ClCompile Include="CmGpuProgram.cpp" />
+    <ClCompile Include="CmGpuProgramManager.cpp" />
+    <ClCompile Include="CmGpuProgramParams.cpp" />
+    <ClCompile Include="CmHardwareBufferManager.cpp" />
+    <ClCompile Include="CmHardwareIndexBuffer.cpp" />
+    <ClCompile Include="CmHardwareOcclusionQuery.cpp" />
+    <ClCompile Include="CmHardwarePixelBuffer.cpp" />
+    <ClCompile Include="CmHardwareVertexBuffer.cpp" />
+    <ClCompile Include="CmHighLevelGpuProgram.cpp" />
+    <ClCompile Include="CmHighLevelGpuProgramManager.cpp" />
     <ClCompile Include="OgrePixelFormat.cpp" />
-    <ClCompile Include="OgreRenderSystem.cpp" />
-    <ClCompile Include="OgreRenderSystemCapabilities.cpp" />
-    <ClCompile Include="OgreRenderTarget.cpp" />
-    <ClCompile Include="OgreRenderTexture.cpp" />
-    <ClCompile Include="OgreRenderWindow.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="OgreTexture.cpp" />
-    <ClCompile Include="OgreTextureManager.cpp" />
-    <ClCompile Include="OgreTextureState.cpp" />
-    <ClCompile Include="OgreVertexIndexData.cpp" />
-    <ClCompile Include="OgreViewport.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="RenderSystemGL\Source\atifs\src\ATI_FS_GLGpuProgram.cpp" />
     <ClCompile Include="RenderSystemGL\Source\atifs\src\Compiler2Pass.cpp" />

CamelotRenderer/CamelotRenderer.vcxproj.filters

@@ -71,42 +71,12 @@
     <ClInclude Include="OgreD3D9VideoMode.h">
       <Filter>Header Files\D3D9RenderSystem</Filter>
     </ClInclude>
-    <ClInclude Include="OgreRenderSystemCapabilities.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="OgreD3D9Resource.h">
       <Filter>Header Files\D3D9RenderSystem</Filter>
     </ClInclude>
-    <ClInclude Include="OgreHardwareBuffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreHardwareVertexBuffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreHardwareIndexBuffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreHardwareBufferManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreVertexIndexData.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreDefaultHardwareBufferManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="OgreBitwise.h">
       <Filter>Header Files\ForRemoval</Filter>
     </ClInclude>
-    <ClInclude Include="OgreAlignedAllocator.h">
-      <Filter>Header Files\ForRemoval</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreBuildSettings.h">
-      <Filter>Header Files\ForRemoval</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreConfig.h">
-      <Filter>Header Files\ForRemoval</Filter>
-    </ClInclude>
     <ClInclude Include="OgreException.h">
       <Filter>Header Files\ForRemoval</Filter>
     </ClInclude>
@@ -116,72 +86,21 @@
     <ClInclude Include="OgreHeaderSuffix.h">
       <Filter>Header Files\ForRemoval</Filter>
     </ClInclude>
-    <ClInclude Include="OgrePlatform.h">
-      <Filter>Header Files\ForRemoval</Filter>
-    </ClInclude>
-    <ClInclude Include="OgrePlatformInformation.h">
-      <Filter>Header Files\ForRemoval</Filter>
-    </ClInclude>
-    <ClInclude Include="OgrePortMemory.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="OgreStdHeaders.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="OgreThreadDefines.h">
-      <Filter>Header Files\ForRemoval</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreFrustum.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreViewport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreRenderTarget.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreGpuProgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="OgreRenderOperation.h">
       <Filter>Header Files\ForRemoval</Filter>
     </ClInclude>
-    <ClInclude Include="OgreGpuProgramParams.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreHighLevelGpuProgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreHardwareOcclusionQuery.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreRenderWindow.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreRenderTexture.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreHardwarePixelBuffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreRenderSystem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreTexture.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="OgreD3D9Mappings.h">
       <Filter>Header Files\D3D9RenderSystem</Filter>
     </ClInclude>
@@ -278,15 +197,6 @@
     <ClInclude Include="CmRenderSystemManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="OgreCamera.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreGpuProgramManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreHighLevelGpuProgramManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="RenderSystemGL\Source\atifs\include\ATI_FS_GLGpuProgram.h">
       <Filter>RenderSystemGL\ATIFS</Filter>
     </ClInclude>
@@ -458,13 +368,79 @@
     <ClInclude Include="RenderSystemGL\Include\CmGLRenderSystemFactory.h">
       <Filter>RenderSystemGL\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="OgreTextureManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="OgreConfigOptionMap.h">
       <Filter>Header Files\ForRemoval</Filter>
     </ClInclude>
-    <ClInclude Include="OgreTextureState.h">
+    <ClInclude Include="CmCamera.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmDefaultHardwareBufferManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmFrustum.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmGpuProgram.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmGpuProgramManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmGpuProgramParams.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmHardwareBuffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmHardwareBufferManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmHardwareIndexBuffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmHardwareOcclusionQuery.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmHardwarePixelBuffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmHardwareVertexBuffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmHighLevelGpuProgram.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmHighLevelGpuProgramManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmRenderSystem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmRenderSystemCapabilities.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmRenderTarget.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmRenderTexture.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmRenderWindow.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmTexture.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmTextureManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmTextureState.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmVertexIndexData.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CmViewport.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -478,30 +454,9 @@
     <ClCompile Include="OgreD3D9VideoMode.cpp">
       <Filter>Source Files\D3D9RenderSystem</Filter>
     </ClCompile>
-    <ClCompile Include="OgreRenderSystemCapabilities.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="OgreD3D9Resource.cpp">
       <Filter>Source Files\D3D9RenderSystem</Filter>
     </ClCompile>
-    <ClCompile Include="OgreHardwareVertexBuffer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreHardwareIndexBuffer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreHardwareBufferManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreVertexIndexData.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreDefaultHardwareBufferManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreAlignedAllocator.cpp">
-      <Filter>Source Files\ForRemoval</Filter>
-    </ClCompile>
     <ClCompile Include="OgreException.cpp">
       <Filter>Source Files\ForRemoval</Filter>
     </ClCompile>
@@ -511,42 +466,6 @@
     <ClCompile Include="OgreStringConverter.cpp">
       <Filter>Source Files\ForRemoval</Filter>
     </ClCompile>
-    <ClCompile Include="OgreFrustum.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreViewport.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreRenderTarget.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreGpuProgram.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreGpuProgramParams.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreHighLevelGpuProgram.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreHardwareOcclusionQuery.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreRenderWindow.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreRenderTexture.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreHardwarePixelBuffer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreRenderSystem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreTexture.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="OgreD3D9Mappings.cpp">
       <Filter>Source Files\D3D9RenderSystem</Filter>
     </ClCompile>
@@ -631,15 +550,6 @@
     <ClCompile Include="CmRenderSystemManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="OgreCamera.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreGpuProgramManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreHighLevelGpuProgramManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="RenderSystemGL\Source\atifs\src\ATI_FS_GLGpuProgram.cpp">
       <Filter>RenderSystemGL\ATIFS</Filter>
     </ClCompile>
@@ -817,10 +727,73 @@
     <ClCompile Include="RenderSystemGL\Source\CmGLRenderSystemFactory.cpp">
       <Filter>RenderSystemGL\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="OgreTextureManager.cpp">
+    <ClCompile Include="CmCamera.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmDefaultHardwareBufferManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmFrustum.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmGpuProgram.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmGpuProgramManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmGpuProgramParams.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmHardwareBufferManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmHardwareIndexBuffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmHardwareOcclusionQuery.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmHardwarePixelBuffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmHardwareVertexBuffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmHighLevelGpuProgram.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmHighLevelGpuProgramManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmRenderSystem.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmRenderSystemCapabilities.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmRenderTarget.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmRenderTexture.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmRenderWindow.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmTexture.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmTextureManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmTextureState.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CmVertexIndexData.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="OgreTextureState.cpp">
+    <ClCompile Include="CmViewport.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>

CamelotRenderer/CmApplication.cpp

@@ -1,15 +1,15 @@
 #include "CmApplication.h"
 
-#include "OgreRenderSystem.h"
+#include "CmRenderSystem.h"
 #include "CmRenderSystemManager.h"
 
 #include "OgreWindowEventUtilities.h"
-#include "OgreHardwareBufferManager.h"
-#include "OgreRenderWindow.h"
-#include "OgreCamera.h"
-#include "OgreViewport.h"
-#include "OgreHighLevelGpuProgram.h"
-#include "OgreHighLevelGpuProgramManager.h"
+#include "CmHardwareBufferManager.h"
+#include "CmRenderWindow.h"
+#include "CmCamera.h"
+#include "CmViewport.h"
+#include "CmHighLevelGpuProgram.h"
+#include "CmHighLevelGpuProgramManager.h"
 
 namespace CamelotEngine
 {

CamelotRenderer/CmApplication.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <memory>
-#include "OgreHighLevelGpuProgram.h"
+#include "CmHighLevelGpuProgram.h"
 
 namespace CamelotEngine
 {

CamelotRenderer/OgreCamera.cpp → CamelotRenderer/CmCamera.cpp

@@ -25,14 +25,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreCamera.h"
+#include "CmCamera.h"
 
 #include "CmMath.h"
 #include "CmMatrix3.h"
 #include "CmAxisAlignedBox.h"
 #include "CmSphere.h"
 #include "OgreException.h"
-#include "OgreRenderSystem.h"
+#include "CmRenderSystem.h"
 
 #if CM_PLATFORM == OGRE_PLATFORM_IPHONE
 #include "macUtils.h"

CamelotRenderer/OgreCamera.h → CamelotRenderer/CmCamera.h

@@ -39,7 +39,7 @@ THE SOFTWARE.
 #include "CmPlane.h"
 #include "CmQuaternion.h"
 #include "OgreCommon.h"
-#include "OgreFrustum.h"
+#include "CmFrustum.h"
 #include "CmRay.h"
 
 

CamelotRenderer/OgreDefaultHardwareBufferManager.cpp → CamelotRenderer/CmDefaultHardwareBufferManager.cpp

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

CamelotRenderer/OgreDefaultHardwareBufferManager.h → CamelotRenderer/CmDefaultHardwareBufferManager.h

@@ -30,9 +30,9 @@ THE SOFTWARE.
 #define __DefaultHardwareBufferManager_H__
 
 #include "OgrePrerequisites.h"
-#include "OgreHardwareBufferManager.h"
-#include "OgreHardwareVertexBuffer.h"
-#include "OgreHardwareIndexBuffer.h"
+#include "CmHardwareBufferManager.h"
+#include "CmHardwareVertexBuffer.h"
+#include "CmHardwareIndexBuffer.h"
 
 namespace CamelotEngine {
 	/** \addtogroup Core

CamelotRenderer/OgreFrustum.cpp → CamelotRenderer/CmFrustum.cpp

@@ -26,16 +26,16 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreFrustum.h"
+#include "CmFrustum.h"
 
 #include "CmMath.h"
 #include "CmMatrix3.h"
 #include "CmSphere.h"
 #include "OgreException.h"
-#include "OgreHardwareBufferManager.h"
-#include "OgreHardwareVertexBuffer.h"
-#include "OgreHardwareIndexBuffer.h"
-#include "OgreRenderSystem.h"
+#include "CmHardwareBufferManager.h"
+#include "CmHardwareVertexBuffer.h"
+#include "CmHardwareIndexBuffer.h"
+#include "CmRenderSystem.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreFrustum.h → CamelotRenderer/CmFrustum.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "OgrePrerequisites.h"
 #include "CmVector2.h"
 #include "CmAxisAlignedBox.h"
-#include "OgreVertexIndexData.h"
+#include "CmVertexIndexData.h"
 #include "OgreString.h"
 
 namespace CamelotEngine

CamelotRenderer/OgreGpuProgram.cpp → CamelotRenderer/CmGpuProgram.cpp

@@ -25,14 +25,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreGpuProgram.h"
-#include "OgreHighLevelGpuProgram.h"
+#include "CmGpuProgram.h"
+#include "CmHighLevelGpuProgram.h"
 #include "CmVector3.h"
 #include "CmVector4.h"
-#include "OgreRenderSystemCapabilities.h"
+#include "CmRenderSystemCapabilities.h"
 #include "OgreStringConverter.h"
 #include "OgreException.h"
-#include "OgreRenderSystem.h"
+#include "CmRenderSystem.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine

CamelotRenderer/OgreGpuProgram.h → CamelotRenderer/CmGpuProgram.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 // Precompiler options
 #include "OgrePrerequisites.h"
 #include "OgreRenderOperation.h"
-#include "OgreGpuProgramParams.h"
+#include "CmGpuProgramParams.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreGpuProgramManager.cpp → CamelotRenderer/CmGpuProgramManager.cpp

@@ -25,9 +25,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreGpuProgramManager.h"
-//#include "OgreHighLevelGpuProgramManager.h"
-#include "OgreRenderSystem.h"
+#include "CmGpuProgramManager.h"
+//#include "CmHighLevelGpuProgramManager.h"
+#include "CmRenderSystem.h"
 #include "CmRenderSystemManager.h"
 
 

CamelotRenderer/OgreGpuProgramManager.h → CamelotRenderer/CmGpuProgramManager.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 // Precompiler options
 #include "OgrePrerequisites.h"
 #include "OgreException.h"
-#include "OgreGpuProgram.h"
+#include "CmGpuProgram.h"
 #include "OgreSingleton.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreGpuProgramParams.cpp → CamelotRenderer/CmGpuProgramParams.cpp

@@ -25,11 +25,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreGpuProgramParams.h"
-//#include "OgreHighLevelGpuProgram.h"
+#include "CmGpuProgramParams.h"
+//#include "CmHighLevelGpuProgram.h"
 #include "CmVector3.h"
 #include "CmVector4.h"
-#include "OgreRenderSystemCapabilities.h"
+#include "CmRenderSystemCapabilities.h"
 #include "OgreStringConverter.h"
 #include "OgreException.h"
 

CamelotRenderer/OgreHardwareBufferManager.cpp → CamelotRenderer/CmHardwareBufferManager.cpp

@@ -26,8 +26,8 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreHardwareBufferManager.h"
-#include "OgreVertexIndexData.h"
+#include "CmHardwareBufferManager.h"
+#include "CmVertexIndexData.h"
 
 
 namespace CamelotEngine {

CamelotRenderer/OgreHardwareBufferManager.h → CamelotRenderer/CmHardwareBufferManager.h

@@ -32,8 +32,8 @@ THE SOFTWARE.
 #include "OgrePrerequisites.h"
 
 #include "OgreSingleton.h"
-#include "OgreHardwareVertexBuffer.h"
-#include "OgreHardwareIndexBuffer.h"
+#include "CmHardwareVertexBuffer.h"
+#include "CmHardwareIndexBuffer.h"
 
 namespace CamelotEngine {
 	/** \addtogroup Core

CamelotRenderer/OgreHardwareIndexBuffer.cpp → CamelotRenderer/CmHardwareIndexBuffer.cpp

@@ -26,9 +26,9 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreHardwareIndexBuffer.h"
-#include "OgreHardwareBufferManager.h"
-#include "OgreDefaultHardwareBufferManager.h"
+#include "CmHardwareIndexBuffer.h"
+#include "CmHardwareBufferManager.h"
+#include "CmDefaultHardwareBufferManager.h"
 
 
 namespace CamelotEngine {

CamelotRenderer/OgreHardwareIndexBuffer.h → CamelotRenderer/CmHardwareIndexBuffer.h

@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 // Precompiler options
 #include "OgrePrerequisites.h"
-#include "OgreHardwareBuffer.h"
+#include "CmHardwareBuffer.h"
 
 namespace CamelotEngine {
 	class HardwareBufferManagerBase;

CamelotRenderer/OgreHardwareOcclusionQuery.cpp → CamelotRenderer/CmHardwareOcclusionQuery.cpp

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

CamelotRenderer/OgreHardwarePixelBuffer.cpp → CamelotRenderer/CmHardwarePixelBuffer.cpp

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

CamelotRenderer/OgreHardwarePixelBuffer.h → CamelotRenderer/CmHardwarePixelBuffer.h

@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 // Precompiler options
 #include "OgrePrerequisites.h"
-#include "OgreHardwareBuffer.h"
+#include "CmHardwareBuffer.h"
 #include "OgrePixelFormat.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreHardwareVertexBuffer.cpp → CamelotRenderer/CmHardwareVertexBuffer.cpp

@@ -26,13 +26,13 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreHardwareVertexBuffer.h"
+#include "CmHardwareVertexBuffer.h"
 #include "OgreColourValue.h"
 #include "OgreException.h"
 #include "OgreStringConverter.h"
-#include "OgreHardwareBufferManager.h"
-#include "OgreDefaultHardwareBufferManager.h"
-#include "OgreRenderSystem.h"
+#include "CmHardwareBufferManager.h"
+#include "CmDefaultHardwareBufferManager.h"
+#include "CmRenderSystem.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreHardwareVertexBuffer.h → CamelotRenderer/CmHardwareVertexBuffer.h

@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 // Precompiler options
 #include "OgrePrerequisites.h"
-#include "OgreHardwareBuffer.h"
+#include "CmHardwareBuffer.h"
 #include "OgreColourValue.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreHighLevelGpuProgram.cpp → CamelotRenderer/CmHighLevelGpuProgram.cpp

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

CamelotRenderer/OgreHighLevelGpuProgram.h → CamelotRenderer/CmHighLevelGpuProgram.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __HighLevelGpuProgram_H__
 
 #include "OgrePrerequisites.h"
-#include "OgreGpuProgram.h"
+#include "CmGpuProgram.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreHighLevelGpuProgramManager.cpp → CamelotRenderer/CmHighLevelGpuProgramManager.cpp

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

CamelotRenderer/OgreHighLevelGpuProgramManager.h → CamelotRenderer/CmHighLevelGpuProgramManager.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "OgrePrerequisites.h"
 #include "OgreSingleton.h"
 #include "OgreException.h"
-#include "OgreHighLevelGpuProgram.h"
+#include "CmHighLevelGpuProgram.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreRenderSystem.cpp → CamelotRenderer/CmRenderSystem.cpp

@@ -31,14 +31,14 @@ THE SOFTWARE.
 //  being aware of the 3D API. However there are a few
 //  simple functions which can have a base implementation
 
-#include "OgreRenderSystem.h"
+#include "CmRenderSystem.h"
 
-#include "OgreViewport.h"
+#include "CmViewport.h"
 #include "OgreException.h"
-#include "OgreRenderTarget.h"
-#include "OgreRenderWindow.h"
-#include "OgreHardwarePixelBuffer.h"
-#include "OgreHardwareOcclusionQuery.h"
+#include "CmRenderTarget.h"
+#include "CmRenderWindow.h"
+#include "CmHardwarePixelBuffer.h"
+#include "CmHardwareOcclusionQuery.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreRenderSystem.h → CamelotRenderer/CmRenderSystem.h

@@ -35,14 +35,14 @@ THE SOFTWARE.
 
 #include "OgreString.h"
 
-#include "OgreTextureState.h"
+#include "CmTextureState.h"
 #include "OgreCommon.h"
 
 #include "OgreRenderOperation.h"
-#include "OgreRenderSystemCapabilities.h"
-#include "OgreRenderTarget.h"
-#include "OgreRenderTexture.h"
-#include "OgreGpuProgram.h"
+#include "CmRenderSystemCapabilities.h"
+#include "CmRenderTarget.h"
+#include "CmRenderTexture.h"
+#include "CmGpuProgram.h"
 #include "CmPlane.h"
 
 namespace CamelotEngine

CamelotRenderer/OgreRenderSystemCapabilities.cpp → CamelotRenderer/CmRenderSystemCapabilities.cpp

@@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreRenderSystemCapabilities.h"
+#include "CmRenderSystemCapabilities.h"
 #include "OgreStringConverter.h"
 #include "OgreException.h"
 #include "OgreString.h"

CamelotRenderer/CmRenderSystemManager.cpp

@@ -1,6 +1,6 @@
 #include "CmRenderSystemManager.h"
 #include "OgreException.h"
-#include "OgreRenderSystem.h"
+#include "CmRenderSystem.h"
 
 namespace CamelotEngine
 {

CamelotRenderer/OgreRenderTarget.cpp → CamelotRenderer/CmRenderTarget.cpp

@@ -25,12 +25,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreRenderTarget.h"
+#include "CmRenderTarget.h"
 #include "OgreStringConverter.h"
 
-#include "OgreViewport.h"
+#include "CmViewport.h"
 #include "OgreException.h"
-#include "OgreRenderSystem.h"
+#include "CmRenderSystem.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreRenderTarget.h → CamelotRenderer/CmRenderTarget.h

@@ -32,7 +32,7 @@ THE SOFTWARE.
 
 #include "OgreString.h"
 #include "OgrePixelFormat.h"
-#include "OgreViewport.h"
+#include "CmViewport.h"
 
 /* Define the number of priority groups for the render system's render targets. */
 #ifndef OGRE_NUM_RENDERTARGET_GROUPS

CamelotRenderer/OgreRenderTexture.cpp → CamelotRenderer/CmRenderTexture.cpp

@@ -26,9 +26,9 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreRenderTexture.h"
+#include "CmRenderTexture.h"
 #include "OgreException.h"
-#include "OgreHardwarePixelBuffer.h"
+#include "CmHardwarePixelBuffer.h"
 
 namespace CamelotEngine
 {

CamelotRenderer/OgreRenderTexture.h → CamelotRenderer/CmRenderTexture.h

@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 #include "OgrePrerequisites.h"
 
-#include "OgreRenderTarget.h"
+#include "CmRenderTarget.h"
 
 namespace CamelotEngine
 {    

CamelotRenderer/OgreRenderWindow.cpp → CamelotRenderer/CmRenderWindow.cpp

@@ -25,9 +25,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreRenderWindow.h"
+#include "CmRenderWindow.h"
 
-#include "OgreViewport.h"
+#include "CmViewport.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreRenderWindow.h → CamelotRenderer/CmRenderWindow.h

@@ -28,7 +28,7 @@ THE SOFTWARE
 
 #include "OgrePrerequisites.h"
 
-#include "OgreRenderTarget.h"
+#include "CmRenderTarget.h"
 
 namespace CamelotEngine
 {

CamelotRenderer/OgreTexture.cpp → CamelotRenderer/CmTexture.cpp

@@ -25,8 +25,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreHardwarePixelBuffer.h"
-#include "OgreTexture.h"
+#include "CmHardwarePixelBuffer.h"
+#include "CmTexture.h"
 #include "OgreException.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreTexture.h → CamelotRenderer/CmTexture.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define _Texture_H__
 
 #include "OgrePrerequisites.h"
-#include "OgreHardwareBuffer.h"
+#include "CmHardwareBuffer.h"
 #include "OgrePixelFormat.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreTextureManager.cpp → CamelotRenderer/CmTextureManager.cpp

@@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreTextureManager.h"
+#include "CmTextureManager.h"
 #include "OgreException.h"
 #include "OgrePixelFormat.h"
 

CamelotRenderer/OgreTextureManager.h → CamelotRenderer/CmTextureManager.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 
 #include "OgrePrerequisites.h"
 
-#include "OgreTexture.h"
+#include "CmTexture.h"
 #include "OgreSingleton.h"
 
 

CamelotRenderer/OgreTextureState.cpp → CamelotRenderer/CmTextureState.cpp

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

CamelotRenderer/OgreTextureState.h → CamelotRenderer/CmTextureState.h

@@ -34,7 +34,7 @@ THE SOFTWARE.
 #include "CmMatrix4.h"
 #include "OgreString.h"
 #include "OgrePixelFormat.h"
-#include "OgreTexture.h"
+#include "CmTexture.h"
 
 namespace CamelotEngine {
 	/** \addtogroup Core

CamelotRenderer/OgreVertexIndexData.cpp → CamelotRenderer/CmVertexIndexData.cpp

@@ -26,14 +26,14 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreVertexIndexData.h"
-#include "OgreHardwareBufferManager.h"
-#include "OgreHardwareVertexBuffer.h"
-#include "OgreHardwareIndexBuffer.h"
+#include "CmVertexIndexData.h"
+#include "CmHardwareBufferManager.h"
+#include "CmHardwareVertexBuffer.h"
+#include "CmHardwareIndexBuffer.h"
 #include "CmVector3.h"
 #include "CmAxisAlignedBox.h"
 #include "OgreException.h"
-#include "OgreRenderSystem.h"
+#include "CmRenderSystem.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreVertexIndexData.h → CamelotRenderer/CmVertexIndexData.h

@@ -29,8 +29,8 @@ THE SOFTWARE.
 #define __VertexIndexData_H__
 
 #include "OgrePrerequisites.h"
-#include "OgreHardwareVertexBuffer.h"
-#include "OgreHardwareIndexBuffer.h"
+#include "CmHardwareVertexBuffer.h"
+#include "CmHardwareIndexBuffer.h"
 
 namespace CamelotEngine {
 	/** \addtogroup Core

CamelotRenderer/OgreViewport.cpp → CamelotRenderer/CmViewport.cpp

@@ -25,12 +25,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreViewport.h"
+#include "CmViewport.h"
 
 #include "OgreException.h"
-#include "OgreRenderTarget.h"
+#include "CmRenderTarget.h"
 #include "CmMath.h"
-#include "OgreRenderSystem.h"
+#include "CmRenderSystem.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreViewport.h → CamelotRenderer/CmViewport.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "OgrePrerequisites.h"
 #include "OgreCommon.h"
 #include "OgreColourValue.h"
-#include "OgreFrustum.h"
+#include "CmFrustum.h"
 
 namespace CamelotEngine {
 	/** \addtogroup Core

CamelotRenderer/OgreAlignedAllocator.cpp

@@ -1,81 +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.
------------------------------------------------------------------------------
-*/
-
-#include "OgrePrerequisites.h"
-#include "OgreAlignedAllocator.h"
-
-#include "OgrePlatformInformation.h"
-#include "OgreBitwise.h"
-
-
-/**
-*
-* |___2___|3|_________5__________|__6__|
-* ^         ^
-* 1         4
-*
-* 1 -> Pointer to start of the block allocated by new.
-* 2 -> Gap used to get 4 aligned on given alignment
-* 3 -> Byte offset between 1 and 4
-* 4 -> Pointer to the start of data block.
-* 5 -> Data block.
-* 6 -> Wasted memory at rear of data block.
-*/
-
-namespace CamelotEngine {
-
-    //---------------------------------------------------------------------
-    void* AlignedMemory::allocate(size_t size, size_t alignment)
-    {
-        assert(0 < alignment && alignment <= 128 && Bitwise::isPO2(alignment));
-
-        unsigned char* p = new unsigned char[size + alignment];
-        size_t offset = alignment - (size_t(p) & (alignment-1));
-
-        unsigned char* result = p + offset;
-        result[-1] = (unsigned char)offset;
-
-        return result;
-    }
-    //---------------------------------------------------------------------
-    void* AlignedMemory::allocate(size_t size)
-    {
-        return allocate(size, CM_SIMD_ALIGNMENT);
-    }
-    //---------------------------------------------------------------------
-    void AlignedMemory::deallocate(void* p)
-    {
-        if (p)
-        {
-            unsigned char* mem = (unsigned char*)p;
-            mem = mem - mem[-1];
-            delete [] mem;
-        }
-    }
-
-}

CamelotRenderer/OgreAlignedAllocator.h

@@ -1,108 +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 __AlignedAllocator_H__
-#define __AlignedAllocator_H__
-
-// Now we're only including this within OgreMemoryAllocatorConfig.h which is already in
-// the prerequisites header (circlar reference)
-//#include "OgrePrerequisites.h"
-
-namespace CamelotEngine {
-
-	/** \addtogroup Core
-	*  @{
-	*/
-
-	/** \addtogroup Memory
-	*  @{
-	*/
-
-	/** Class to provide aligned memory allocate functionality.
-    @remarks
-        All SIMD processing are friendly with aligned memory, and some SIMD routines
-        are designed for working with aligned memory only. If the data are intended to
-        use SIMD processing, it's need to be aligned for better performance boost.
-        In additional, most time cache boundary aligned data also lead to better
-        performance even if didn't used SIMD processing. So this class provides a couple
-        of functions for allocate aligned memory.
-    @par
-        Anyways, in general, you don't need to use this class directly, Ogre internally
-        will take care with most SIMD and cache friendly optimisation if possible.
-    @par
-        This isn't a "one-step" optimisation, there are a lot of underlying work to
-        achieve performance boost. If you didn't know what are you doing or what there
-        are going, just ignore this class.
-    @note
-        This class intended to use by advanced user only.
-    */
-	class CM_EXPORT AlignedMemory
-	{
-	public:
-        /** Allocate memory with given alignment.
-            @param
-                size The size of memory need to allocate.
-            @param
-                alignment The alignment of result pointer, must be power of two
-                and in range [1, 128].
-            @returns
-                The allocated memory pointer.
-            @par
-                On failure, exception will be throw.
-        */
-        static void* allocate(size_t size, size_t alignment);
-
-        /** Allocate memory with default platform dependent alignment.
-            @remarks
-                The default alignment depend on target machine, this function
-                guarantee aligned memory according with SIMD processing and
-                cache boundary friendly.
-            @param
-                size The size of memory need to allocate.
-            @returns
-                The allocated memory pointer.
-            @par
-                On failure, exception will be throw.
-        */
-        static void* allocate(size_t size);
-
-        /** Deallocate memory that allocated by this class.
-            @param
-                p Pointer to the memory allocated by this class or <b>NULL</b> pointer.
-            @par
-                On <b>NULL</b> pointer, nothing happen.
-        */
-        static void deallocate(void* p);
-	};
-
-	/** @} */
-	/** @} */
-
-}
-
-#endif  // __AlignedAllocator_H__

CamelotRenderer/OgreBuildSettings.h

@@ -1,58 +0,0 @@
-#ifndef __Custom_Config_H_
-#define __Custom_Config_H_
-
-// CMake auto-generated configuration options
-
-/* #undef CM_STATIC_LIB */
-
-#define OGRE_BUILD_RENDERSYSTEM_D3D9
-/* #undef OGRE_BUILD_RENDERSYSTEM_D3D10 */
-/* #undef OGRE_BUILD_RENDERSYSTEM_D3D11 */
-#define OGRE_BUILD_RENDERSYSTEM_GL
-/* #undef OGRE_BUILD_RENDERSYSTEM_GLES */
-#define OGRE_BUILD_PLUGIN_BSP
-#define OGRE_BUILD_PLUGIN_OCTREE
-#define OGRE_BUILD_PLUGIN_PCZ
-#define OGRE_BUILD_PLUGIN_PFX
-#define OGRE_BUILD_PLUGIN_CG
-
-#define OGRE_CONFIG_LITTLE_ENDIAN
-/* #undef OGRE_CONFIG_BIG_ENDIAN */
-
-#define OGRE_DOUBLE_PRECISION 0
-
-#define OGRE_MEMORY_ALLOCATOR 4
-
-#define OGRE_CONTAINERS_USE_CUSTOM_MEMORY_ALLOCATOR 1
-
-#define OGRE_STRING_USE_CUSTOM_MEMORY_ALLOCATOR 0
-
-#define OGRE_MEMORY_TRACKER_DEBUG_MODE 0
-
-#define OGRE_MEMORY_TRACKER_RELEASE_MODE 0
-
-#define CM_THREAD_SUPPORT 0
-
-#define OGRE_THREAD_PROVIDER 0
-
-#define OGRE_NO_FREEIMAGE 0
-
-#define OGRE_NO_DDS_CODEC 0
-
-#define OGRE_NO_PVRTC_CODEC 1
-
-#define OGRE_NO_ZIP_ARCHIVE 0
-
-#define OGRE_NO_VIEWPORT_ORIENTATIONMODE 1
-
-#define OGRE_USE_NEW_COMPILERS 1
-
-#define OGRE_USE_BOOST 1
-
-#define OGRE_PROFILING 0
-
-#define RTSHADER_SYSTEM_BUILD_CORE_SHADERS
-
-#define RTSHADER_SYSTEM_BUILD_EXT_SHADERS
-
-#endif

CamelotRenderer/OgreConfig.h

@@ -1,197 +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 __Config_H_
-#define __Config_H_
-
-// Include the CMake-generated build settings.
-// If you get complaints that this file is missing, then you're probably
-// trying to link directly against your source dir. You must then add
-// %BUILD_DIR%/include to your include search path to find OgreBuildSettings.h.
-#include "OgreBuildSettings.h"
-
-/** If set to 1, profiling code will be included in the application. When you
-	are deploying your application you will probably want to set this to 0 */
-#ifndef OGRE_PROFILING
-#define OGRE_PROFILING 0
-#endif
-
-/** There are three modes for handling asserts in OGRE:
-0 - STANDARD - Standard asserts in debug builds, nothing in release builds
-1 - RELEASE_EXCEPTIONS - Standard asserts in debug builds, exceptions in release builds
-2 - EXCEPTIONS - Exceptions in debug builds, exceptions in release builds
-*/
-#define OGRE_ASSERT_MODE 0
-
-/** If set to >0, OGRE will always 'think' that the graphics card only has the
-    number of texture units specified. Very useful for testing multipass fallback.
-*/
-#define OGRE_PRETEND_TEXTURE_UNITS 0
-
-/** If set to 1, float is typedef'ed to double. Otherwise, float is typedef'ed
-    to float. Setting this allows you to perform mathematical operations in the
-	CPU (Quaternion, Vector3 etc) with more precision, but bear in mind that the
-	GPU still operates in single-precision mode.
-*/
-#ifndef OGRE_DOUBLE_PRECISION
-#define OGRE_DOUBLE_PRECISION 0
-#endif
-
-/** Define number of texture coordinate sets allowed per vertex.
-*/
-#define OGRE_MAX_TEXTURE_COORD_SETS 6
-
-/** Define max number of texture layers allowed per pass on any card.
-*/
-#define CM_MAX_TEXTURE_LAYERS 16
-
-/** Define max number of lights allowed per pass.
-*/
-#define OGRE_MAX_SIMULTANEOUS_LIGHTS 8
-
-/** Define max number of blending weights allowed per vertex.
-*/
-#define OGRE_MAX_BLEND_WEIGHTS 4
-
-/** Define this if you want to link OGRE as a static lib (preferably as a project file)
-*/
-//#define CM_STATIC_LIB
-
-
-// define the memory allocator configuration to use
-#define OGRE_MEMORY_ALLOCATOR_STD 1
-#define OGRE_MEMORY_ALLOCATOR_NED 2
-#define OGRE_MEMORY_ALLOCATOR_USER 3
-#define OGRE_MEMORY_ALLOCATOR_NEDPOOLING 4
-
-#ifndef OGRE_MEMORY_ALLOCATOR
-#  define OGRE_MEMORY_ALLOCATOR OGRE_MEMORY_ALLOCATOR_NEDPOOLING
-#endif
-
-// Whether to use the custom memory allocator in STL containers
-#ifndef OGRE_CONTAINERS_USE_CUSTOM_MEMORY_ALLOCATOR
-#  define OGRE_CONTAINERS_USE_CUSTOM_MEMORY_ALLOCATOR 1
-#endif
-
-//if you want to make String use the custom memory allocator then set:
-//#define OGRE_STRING_USE_CUSTOM_MEMORY_ALLOCATOR 1
-// Doing this will mean Ogre's strings will not be compatible with std::string however
-#ifndef OGRE_STRING_USE_CUSTOM_MEMORY_ALLOCATOR
-#	define OGRE_STRING_USE_CUSTOM_MEMORY_ALLOCATOR 0
-#endif
-
-// enable or disable the memory tracker, recording the memory allocations & tracking leaks
-// default is to disable since it's expensive, but you can enable if needed per build target
-
-#ifndef OGRE_MEMORY_TRACKER_DEBUG_MODE
-#  define OGRE_MEMORY_TRACKER_DEBUG_MODE 0
-#endif
-
-#ifndef OGRE_MEMORY_TRACKER_RELEASE_MODE
-#  define OGRE_MEMORY_TRACKER_RELEASE_MODE 0
-#endif
-/** Define max number of multiple render targets (MRTs) to render to at once.
-*/
-#define CM_MAX_MULTIPLE_RENDER_TARGETS 8
-
-/** Support for multithreading, there are 3 options
-
-CM_THREAD_SUPPORT = 0
-	No support for threading.		
-CM_THREAD_SUPPORT = 1
-	Thread support for background loading, by both loading and constructing resources
-	in a background thread. Resource management and SharedPtr handling becomes
-	thread-safe, and resources may be completely loaded in the background. 
-	The places where threading is available are clearly
-	marked, you should assume state is NOT thread safe unless otherwise
-	stated in relation to this flag.
-CM_THREAD_SUPPORT = 2
-	Thread support for background resource preparation. This means that resource
-	data can streamed into memory in the background, but the final resource
-	construction (including RenderSystem dependencies) is still done in the primary
-	thread. Has a lower synchronisation primitive overhead than full threading
-	while still allowing the major blocking aspects of resource management (I/O)
-	to be done in the background.
-*/
-#ifndef CM_THREAD_SUPPORT
-#define CM_THREAD_SUPPORT 0
-#endif
-#if CM_THREAD_SUPPORT != 0 && CM_THREAD_SUPPORT != 1 && CM_THREAD_SUPPORT != 2
-#define CM_THREAD_SUPPORT 0
-#endif
-
-/** Provider for threading functionality, there are 4 options.
-
-OGRE_THREAD_PROVIDER = 0
-	No support for threading.
-OGRE_THREAD_PROVIDER = 1
-	Boost libraries provide threading functionality.
-OGRE_THREAD_PROVIDER = 2
-	Poco libraries provide threading functionality.
-OGRE_THREAD_PROVIDER = 3
-	TBB library provides threading functionality.
-*/
-#ifndef OGRE_THREAD_PROVIDER
-#define OGRE_THREAD_PROVIDER 0
-#endif
-
-/** Disables use of the FreeImage image library for loading images.
-WARNING: Use only when you want to provide your own image loading code via codecs.
-*/
-#ifndef OGRE_NO_FREEIMAGE
-#define OGRE_NO_FREEIMAGE 0
-#endif
-
-/** Disables use of the DevIL image library for loading images.
-By default DevIL is disabled in Eihort in favour of FreeImage, but you may re-enable
-it if you choose
-*/
-#ifndef OGRE_NO_DEVIL
-#define OGRE_NO_DEVIL 1
-#endif
-
-/** Disables use of the internal image codec for loading DDS files.
-WARNING: Use only when you want to provide your own image loading code via codecs.
-*/
-#ifndef OGRE_NO_DDS_CODEC
-#define OGRE_NO_DDS_CODEC 0
-#endif
-
-/** Disables use of the ZIP archive support.
-WARNING: Disabling this will make the samples unusable.
-*/
-#ifndef OGRE_NO_ZIP_ARCHIVE
-#define OGRE_NO_ZIP_ARCHIVE 0
-#endif
-
-/** Enables the use of the new script compilers when Ogre compiles resource scripts.
-*/
-#ifndef OGRE_USE_NEW_COMPILERS
-#define OGRE_USE_NEW_COMPILERS 1
-#endif
-
-#endif

CamelotRenderer/OgreD3D9Device.cpp

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "OgreD3D9RenderSystem.h"
 #include "OgreD3D9ResourceManager.h"
 #include "OgreD3D9RenderWindow.h"
-#include "OgreHardwareBufferManager.h"
+#include "CmHardwareBufferManager.h"
 #include "OgreException.h"
 #include "CmRenderSystemManager.h"
 

CamelotRenderer/OgreD3D9Device.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __D3D9Device_H__
 
 #include "OgreD3D9Prerequisites.h"
-#include "OgreRenderTarget.h"
+#include "CmRenderTarget.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreD3D9GpuProgram.h

@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 // Precompiler options
 #include "OgreD3D9Prerequisites.h"
-#include "OgreGpuProgram.h"
+#include "CmGpuProgram.h"
 #include "OgreD3D9Resource.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreD3D9GpuProgramManager.h

@@ -29,8 +29,8 @@ THE SOFTWARE.
 #define __D3D9GpuProgramManager_H__
 
 #include "OgreD3D9Prerequisites.h"
-#include "OgreGpuProgram.h"
-#include "OgreGpuProgramManager.h"
+#include "CmGpuProgram.h"
+#include "CmGpuProgramManager.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreD3D9HLSLProgram.cpp

@@ -26,11 +26,11 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 #include "OgreD3D9HLSLProgram.h"
-#include "OgreGpuProgramManager.h"
+#include "CmGpuProgramManager.h"
 #include "OgreStringConverter.h"
 #include "OgreD3D9GpuProgram.h"
 #include "OgreException.h"
-#include "OgreRenderSystem.h"
+#include "CmRenderSystem.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreD3D9HLSLProgram.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __D3D9HLSLProgram_H__
 
 #include "OgreD3D9Prerequisites.h"
-#include "OgreHighLevelGpuProgram.h"
+#include "CmHighLevelGpuProgram.h"
 
 namespace CamelotEngine {
     /** Specialisation of HighLevelGpuProgram to provide support for D3D9 

CamelotRenderer/OgreD3D9HLSLProgramFactory.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __D3D9HLSLProgramFactory_H__
 
 #include "OgreD3D9Prerequisites.h"
-#include "OgreHighLevelGpuProgramManager.h"
+#include "CmHighLevelGpuProgramManager.h"
 
 namespace CamelotEngine
 {

CamelotRenderer/OgreD3D9HardwareBufferManager.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __D3D9HARWAREBUFFERMANAGER_H__
 
 #include "OgreD3D9Prerequisites.h"
-#include "OgreHardwareBufferManager.h"
+#include "CmHardwareBufferManager.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreD3D9HardwareIndexBuffer.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __D3D9HARDWAREINDEXBUFFER_H__
 
 #include "OgreD3D9Prerequisites.h"
-#include "OgreHardwareIndexBuffer.h"
+#include "CmHardwareIndexBuffer.h"
 #include "OgreD3D9Resource.h"
 
 namespace CamelotEngine { 

CamelotRenderer/OgreD3D9HardwareOcclusionQuery.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 #include "OgreD3D9HardwareOcclusionQuery.h"
-#include "OgreRenderSystemCapabilities.h"
+#include "CmRenderSystemCapabilities.h"
 #include "OgreException.h"
 #include "OgreD3D9RenderSystem.h"
 

CamelotRenderer/OgreD3D9HardwareOcclusionQuery.h

@@ -30,7 +30,7 @@ THE SOFTWARE.
 #define _D3D9HARWAREOCCLUSIONQUERY_H__
 
 #include "OgreD3D9Prerequisites.h"
-#include "OgreHardwareOcclusionQuery.h"
+#include "CmHardwareOcclusionQuery.h"
 #include "OgreD3D9Resource.h"
 
 

CamelotRenderer/OgreD3D9HardwarePixelBuffer.cpp

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "OgreException.h"
 #include "OgreStringConverter.h"
 #include "OgreBitwise.h"
-#include "OgreRenderSystem.h"
+#include "CmRenderSystem.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreD3D9HardwarePixelBuffer.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __D3D9PIXELBUFFER_H__
 
 #include "OgreD3D9Prerequisites.h"
-#include "OgreHardwarePixelBuffer.h"
+#include "CmHardwarePixelBuffer.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreD3D9HardwareVertexBuffer.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __D3D9HARDWAREVERTEXBUFFER_H__
 
 #include "OgreD3D9Prerequisites.h"
-#include "OgreHardwareVertexBuffer.h"
+#include "CmHardwareVertexBuffer.h"
 #include "OgreD3D9Resource.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreD3D9Mappings.h

@@ -30,9 +30,9 @@ THE SOFTWARE.
 
 #include "OgreD3D9Prerequisites.h"
 #include "OgreCommon.h"
-#include "OgreRenderSystem.h"
-#include "OgreHardwareBuffer.h"
-#include "OgreHardwareIndexBuffer.h"
+#include "CmRenderSystem.h"
+#include "CmHardwareBuffer.h"
+#include "CmHardwareIndexBuffer.h"
 
 namespace CamelotEngine 
 {

CamelotRenderer/OgreD3D9MultiRenderTarget.h

@@ -29,8 +29,8 @@ THE SOFTWARE.
 #define __D3D9MULTIRENDERTARGET_H__
 
 #include "OgreD3D9Prerequisites.h"
-#include "OgreTexture.h"
-#include "OgreRenderTexture.h"
+#include "CmTexture.h"
+#include "CmRenderTexture.h"
 #include "OgreException.h"
 #include "OgreD3D9HardwarePixelBuffer.h"
 

CamelotRenderer/OgreD3D9RenderSystem.cpp

@@ -43,11 +43,11 @@ THE SOFTWARE.
 #include "OgreD3D9GpuProgramManager.h"
 #include "OgreD3D9HLSLProgramFactory.h"
 #include "OgreD3D9HardwareOcclusionQuery.h"
-#include "OgreFrustum.h"
+#include "CmFrustum.h"
 #include "OgreD3D9MultiRenderTarget.h"
 #include "OgreD3D9DeviceManager.h"
 #include "OgreD3D9ResourceManager.h"
-#include "OgreHighLevelGpuProgramManager.h"
+#include "CmHighLevelGpuProgramManager.h"
 
 #define FLOAT2DWORD(f) *((DWORD*)&f)
 

CamelotRenderer/OgreD3D9RenderSystem.h

@@ -32,8 +32,8 @@ THE SOFTWARE.
 #include "OgreString.h"
 #include "OgreStringConverter.h"
 #include "OgreConfigOptionMap.h"
-#include "OgreRenderSystem.h"
-#include "OgreRenderSystemCapabilities.h"
+#include "CmRenderSystem.h"
+#include "CmRenderSystemCapabilities.h"
 #include "OgreD3D9Mappings.h"
 
 namespace CamelotEngine 

CamelotRenderer/OgreD3D9RenderWindow.cpp

@@ -26,10 +26,10 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 #include "OgreD3D9RenderWindow.h"
-#include "OgreViewport.h"
+#include "CmViewport.h"
 #include "OgreException.h"
 #include "OgreD3D9RenderSystem.h"
-#include "OgreRenderSystem.h"
+#include "CmRenderSystem.h"
 #include "OgreBitwise.h"
 #include "OgreStringConverter.h"
 #include "OgreWindowEventUtilities.h"

CamelotRenderer/OgreD3D9RenderWindow.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __D3D9RENDERWINDOW_H__
 
 #include "OgreD3D9Prerequisites.h"
-#include "OgreRenderWindow.h"
+#include "CmRenderWindow.h"
 #include "OgreD3D9Device.h"
 
 namespace CamelotEngine 

CamelotRenderer/OgreD3D9Texture.h

@@ -29,8 +29,8 @@ THE SOFTWARE.
 #define __D3D9TEXTURE_H__
 
 #include "OgreD3D9Prerequisites.h"
-#include "OgreTexture.h"
-#include "OgreRenderTexture.h"
+#include "CmTexture.h"
+#include "CmRenderTexture.h"
 #include "OgreException.h"
 #include "OgreD3D9HardwarePixelBuffer.h"
 #include "OgreD3D9Resource.h"

CamelotRenderer/OgreD3D9TextureManager.h

@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 #include "OgreD3D9Prerequisites.h"
 #include "OgreD3D9Texture.h"
-#include "OgreTextureManager.h"
+#include "CmTextureManager.h"
 
 namespace CamelotEngine 
 {

CamelotRenderer/OgreD3D9VertexDeclaration.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __D3D9VERTEXDECLARATION_H__
 
 #include "OgreD3D9Prerequisites.h"
-#include "OgreHardwareVertexBuffer.h"
+#include "CmHardwareVertexBuffer.h"
 #include "OgreD3D9Resource.h"
 
 namespace CamelotEngine { 

CamelotRenderer/OgrePlatform.h

@@ -1,324 +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 __Platform_H_
-#define __Platform_H_
-
-#include "OgreConfig.h"
-
-namespace CamelotEngine {
-/* Initial platform/compiler-related stuff to set.
-*/
-#define CM_PLATFORM_WIN32 1
-#define CM_PLATFORM_LINUX 2
-#define CM_PLATFORM_APPLE 3
-#define OGRE_PLATFORM_SYMBIAN 4
-#define OGRE_PLATFORM_IPHONE 5
-
-#define CM_COMPILER_MSVC 1
-#define CM_COMPILER_GNUC 2
-#define CM_COMPILER_BORL 3
-#define CM_COMPILER_WINSCW 4
-#define CM_COMPILER_GCCE 5
-
-#define OGRE_ENDIAN_LITTLE 1
-#define OGRE_ENDIAN_BIG 2
-
-#define CM_ARCHITECTURE_32 1
-#define CM_ARCHITECTURE_64 2
-
-/* Finds the compiler type and version.
-*/
-#if defined( __GCCE__ )
-#   define CM_COMPILER CM_COMPILER_GCCE
-#   define CM_COMP_VER _MSC_VER
-//#	include <staticlibinit_gcce.h> // This is a GCCE toolchain workaround needed when compiling with GCCE 
-#elif defined( __WINSCW__ )
-#   define CM_COMPILER CM_COMPILER_WINSCW
-#   define CM_COMP_VER _MSC_VER
-#elif defined( _MSC_VER )
-#   define CM_COMPILER CM_COMPILER_MSVC
-#   define CM_COMP_VER _MSC_VER
-#elif defined( __GNUC__ )
-#   define CM_COMPILER CM_COMPILER_GNUC
-#   define CM_COMP_VER (((__GNUC__)*100) + \
-        (__GNUC_MINOR__*10) + \
-        __GNUC_PATCHLEVEL__)
-
-#elif defined( __BORLANDC__ )
-#   define CM_COMPILER CM_COMPILER_BORL
-#   define CM_COMP_VER __BCPLUSPLUS__
-#   define __FUNCTION__ __FUNC__ 
-#else
-#   pragma error "No known compiler. Abort! Abort!"
-
-#endif
-
-/* See if we can use __forceinline or if we need to use __inline instead */
-#if CM_COMPILER == CM_COMPILER_MSVC
-#   if CM_COMP_VER >= 1200
-#       define FORCEINLINE __forceinline
-#   endif
-#elif defined(__MINGW32__)
-#   if !defined(FORCEINLINE)
-#       define FORCEINLINE __inline
-#   endif
-#else
-#   define FORCEINLINE __inline
-#endif
-
-/* Finds the current platform */
-
-#if defined( __SYMBIAN32__ ) 
-#   define CM_PLATFORM OGRE_PLATFORM_SYMBIAN
-#elif defined( __WIN32__ ) || defined( _WIN32 )
-#   define CM_PLATFORM CM_PLATFORM_WIN32
-#elif defined( __APPLE_CC__)
-    // Device                                                     Simulator
-    // Both requiring OS version 3.0 or greater
-#   if __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 30000 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 30000
-#       define CM_PLATFORM OGRE_PLATFORM_IPHONE
-#   else
-#       define CM_PLATFORM CM_PLATFORM_APPLE
-#   endif
-#else
-#   define CM_PLATFORM CM_PLATFORM_LINUX
-#endif
-
-    /* Find the arch type */
-#if defined(__x86_64__) || defined(_M_X64) || defined(__powerpc64__) || defined(__alpha__) || defined(__ia64__) || defined(__s390__) || defined(__s390x__)
-#   define CM_ARCH_TYPE CM_ARCHITECTURE_64
-#else
-#   define CM_ARCH_TYPE CM_ARCHITECTURE_32
-#endif
-
-// For generating compiler warnings - should work on any compiler
-// As a side note, if you start your message with 'Warning: ', the MSVC
-// IDE actually does catch a warning :)
-#define OGRE_QUOTE_INPLACE(x) # x
-#define OGRE_QUOTE(x) OGRE_QUOTE_INPLACE(x)
-#define OGRE_WARN( x )  message( __FILE__ "(" QUOTE( __LINE__ ) ") : " x "\n" )
-
-//----------------------------------------------------------------------------
-// Windows Settings
-#if CM_PLATFORM == CM_PLATFORM_WIN32
-
-// If we're not including this from a client build, specify that the stuff
-// should get exported. Otherwise, import it.
-#	if defined( CM_STATIC_LIB )
-		// Linux compilers don't have symbol import/export directives.
-#   	define CM_EXPORT
-#   else
-#   	if defined( CM_DLL )
-#       	define CM_EXPORT __declspec( dllexport )
-#   	else
-#           if defined( __MINGW32__ )
-#               define CM_EXPORT
-#           else
-#       	    define CM_EXPORT __declspec( dllimport )
-#           endif
-#   	endif
-#	endif
-// Win32 compilers use _DEBUG for specifying debug builds.
-// for MinGW, we set DEBUG
-#   if defined(_DEBUG) || defined(DEBUG)
-#       define CM_DEBUG_MODE 1
-#   else
-#       define CM_DEBUG_MODE 0
-#   endif
-
-// Disable unicode support on MingW for GCC 3, poorly supported in stdlibc++
-// STLPORT fixes this though so allow if found
-// MinGW C++ Toolkit supports unicode and sets the define __MINGW32_TOOLBOX_UNICODE__ in _mingw.h
-// GCC 4 is also fine
-#if defined(__MINGW32__)
-# if CM_COMP_VER < 400
-#  if !defined(_STLPORT_VERSION)
-#   include<_mingw.h>
-#   if defined(__MINGW32_TOOLBOX_UNICODE__) || CM_COMP_VER > 345
-#    define OGRE_UNICODE_SUPPORT 1
-#   else
-#    define OGRE_UNICODE_SUPPORT 0
-#   endif
-#  else
-#   define OGRE_UNICODE_SUPPORT 1
-#  endif
-# else
-#  define OGRE_UNICODE_SUPPORT 1
-# endif
-#else
-#  define OGRE_UNICODE_SUPPORT 1
-#endif
-
-#endif // OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-
-//----------------------------------------------------------------------------
-// Symbian Settings
-#if CM_PLATFORM == OGRE_PLATFORM_SYMBIAN
-#	define OGRE_UNICODE_SUPPORT 1
-#   define CM_DEBUG_MODE 0
-#   define CM_EXPORT
-#	define CLOCKS_PER_SEC  1000
-// pragma def were found here: http://www.inf.pucrs.br/~eduardob/disciplinas/SistEmbarcados/Mobile/Nokia/Tools/Carbide_vs/WINSCW/Help/PDF/C_Compilers_Reference_3.2.pdf
-#	pragma warn_unusedarg off
-#	pragma warn_emptydecl off
-#	pragma warn_possunwant off
-#endif
-//----------------------------------------------------------------------------
-// Linux/Apple/Symbian Settings
-#if CM_PLATFORM == CM_PLATFORM_LINUX || CM_PLATFORM == CM_PLATFORM_APPLE || CM_PLATFORM == OGRE_PLATFORM_IPHONE || CM_PLATFORM == OGRE_PLATFORM_SYMBIAN
-
-// Enable GCC symbol visibility
-#   if defined( CM_GCC_VISIBILITY )
-#       define CM_EXPORT  __attribute__ ((visibility("default")))
-#   else
-#       define CM_EXPORT
-#   endif
-
-// A quick define to overcome different names for the same function
-#   define stricmp strcasecmp
-
-// Unlike the Win32 compilers, Linux compilers seem to use DEBUG for when
-// specifying a debug build.
-// (??? this is wrong, on Linux debug builds aren't marked in any way unless
-// you mark it yourself any way you like it -- zap ???)
-#   ifdef DEBUG
-#       define CM_DEBUG_MODE 1
-#   else
-#       define CM_DEBUG_MODE 0
-#   endif
-
-#if CM_PLATFORM == CM_PLATFORM_APPLE
-    #define CM_PLATFORM_LIB "OgrePlatform.bundle"
-#elif CM_PLATFORM == OGRE_PLATFORM_IPHONE
-    #define CM_PLATFORM_LIB "OgrePlatform.a"
-#else //OGRE_PLATFORM_LINUX
-    #define CM_PLATFORM_LIB "libOgrePlatform.so"
-#endif
-
-// Always enable unicode support for the moment
-// Perhaps disable in old versions of gcc if necessary
-#define OGRE_UNICODE_SUPPORT 1
-
-#endif
-
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-// Endian Settings
-// check for BIG_ENDIAN config flag, set OGRE_ENDIAN correctly
-#ifdef OGRE_CONFIG_BIG_ENDIAN
-#    define OGRE_ENDIAN OGRE_ENDIAN_BIG
-#else
-#    define OGRE_ENDIAN OGRE_ENDIAN_LITTLE
-#endif
-
-/* Initial CPU stuff to set.
-*/
-#define CM_CPU_UNKNOWN    0
-#define CM_CPU_X86        1
-#define CM_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 CM_CPU CM_CPU_X86
-
-#elif CM_PLATFORM == CM_PLATFORM_APPLE && defined(__BIG_ENDIAN__)
-#   define CM_CPU CM_CPU_PPC
-#elif CM_PLATFORM == CM_PLATFORM_APPLE
-#	define CM_CPU CM_CPU_X86
-#elif CM_PLATFORM == OGRE_PLATFORM_IPHONE && (defined(__i386__) || defined(__x86_64__))
-#	define CM_CPU CM_CPU_X86
-#elif defined(__arm__)
-#	define CM_CPU OGRE_CPU_ARM
-#else
-#   define CM_CPU CM_CPU_UNKNOWN
-#endif
-
-/* Find how to declare aligned variable.
-*/
-#if CM_COMPILER == CM_COMPILER_MSVC
-#   define CM_ALIGNED_DECL(type, var, alignment)  __declspec(align(alignment)) type var
-
-#elif CM_COMPILER == CM_COMPILER_GNUC
-#   define CM_ALIGNED_DECL(type, var, alignment)  type var __attribute__((__aligned__(alignment)))
-
-#else
-#   define CM_ALIGNED_DECL(type, var, alignment)  type var
-#endif
-
-/** Find perfect alignment (should supports SIMD alignment if SIMD available)
-*/
-#if CM_CPU == CM_CPU_X86
-#   define CM_SIMD_ALIGNMENT  16
-
-#else
-#   define CM_SIMD_ALIGNMENT  16
-#endif
-
-/* Declare variable aligned to SIMD alignment.
-*/
-#define CM_SIMD_ALIGNED_DECL(type, var)   CM_ALIGNED_DECL(type, var, CM_SIMD_ALIGNMENT)
-
-/* Define whether or not Ogre compiled with SSE supports.
-*/
-#if OGRE_DOUBLE_PRECISION == 0 && CM_CPU == CM_CPU_X86 && CM_COMPILER == CM_COMPILER_MSVC
-#   define __OGRE_HAVE_SSE  1
-#elif OGRE_DOUBLE_PRECISION == 0 && CM_CPU == CM_CPU_X86 && CM_COMPILER == CM_COMPILER_GNUC && CM_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 && CM_CPU == OGRE_CPU_ARM && CM_COMPILER == CM_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 && CM_CPU == OGRE_CPU_ARM && CM_COMPILER == CM_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

CamelotRenderer/OgrePlatformInformation.h

@@ -1,34 +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 "OgrePrerequisites.h"
-
-
-#endif  // __PlatformInformation_H__

CamelotRenderer/OgrePortMemory.h

@@ -1,6 +0,0 @@
-#pragma once
-
-// TODO PORT - I define the memory allocation here because they're often used but I don't have an implementation for them. I should remove calls to the macros altogether but this will do for now
-
-#include <malloc.h>
-#include "OgreAlignedAllocator.h"

CamelotRenderer/OgrePrerequisites.h

@@ -36,11 +36,8 @@ 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 Camera;
     class ColourValue;
-    class Degree;
     class Frustum;
     class GpuProgram;
     class GpuProgramManager;
@@ -53,14 +50,7 @@ namespace CamelotEngine {
 	class HighLevelGpuProgramManager;
 	class HighLevelGpuProgramFactory;
     class IndexData;
-    class Math;
-    class Matrix3;
-    class Matrix4;
     class Pass;
-    class Plane;
-    class Quaternion;
-	class Radian;
-    class Ray;
     class RenderSystem;
     class RenderSystemCapabilities;
     class RenderTarget;
@@ -68,15 +58,11 @@ namespace CamelotEngine {
 	class MultiRenderTarget;
     class RenderWindow;
     class RenderOperation;
-    class Sphere;
     class StringConverter;
     class StringInterface;
     class TextureState;
     class Texture;
     class TextureManager;
-    class Vector2;
-    class Vector3;
-    class Vector4;
     class Viewport;
     class VertexBufferBinding;
     class VertexData;

CamelotRenderer/OgreRenderOperation.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define _RenderOperation_H__
 
 #include "OgrePrerequisites.h"
-#include "OgreVertexIndexData.h"
+#include "CmVertexIndexData.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreStdHeaders.h

@@ -1,122 +0,0 @@
-#ifndef __StdHeaders_H__
-#define __StdHeaders_H__
-
-#ifdef __BORLANDC__
-    #define __STD_ALGORITHM
-#endif
-
-#if defined ( CM_GCC_VISIBILITY ) && (CM_PLATFORM != CM_PLATFORM_APPLE && CM_PLATFORM != OGRE_PLATFORM_IPHONE)
-/* 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.
- *
- * 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)
- * and Boost when compiled (hidden) results in mysterious link errors such as "Bad codegen, pointer diff".
- */
-#   pragma GCC visibility push(default)
-#endif
-
-#include <cassert>
-#include <cstdio>
-#include <cstdlib>
-#include <ctime>
-#include <cstring>
-#include <cstdarg>
-#include <cmath>
-
-#include <memory>
-
-// STL containers
-#include <vector>
-#include <map>
-#include <string>
-#include <set>
-#include <list>
-#include <deque>
-#include <queue>
-#include <bitset>
-
-// 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 (CM_COMPILER == CM_COMPILER_GNUC) && !defined(STLPORT)
-#   if CM_COMP_VER >= 430
-#       include <tr1/unordered_map>
-#       include <tr1/unordered_set> 
-#   else
-#       include <ext/hash_map>
-#       include <ext/hash_set>
-#   endif
-#else
-#   if (CM_COMPILER == CM_COMPILER_MSVC) && !defined(STLPORT) && CM_COMP_VER >= 1600 // VC++ 10.0
-#    	include <unordered_map>
-#    	include <unordered_set>
-#	else
-#   	include <hash_set>
-#   	include <hash_map>
-#	endif
-#endif 
-
-// STL algorithms & functions
-#include <algorithm>
-#include <functional>
-#include <limits>
-
-// C++ Stream stuff
-#include <fstream>
-#include <iostream>
-#include <iomanip>
-#include <sstream>
-
-#ifdef __BORLANDC__
-namespace CamelotEngine
-{
-    using namespace std;
-}
-#endif
-
-extern "C" {
-
-#   include <sys/types.h>
-#   include <sys/stat.h>
-
-}
-
-#if CM_PLATFORM == CM_PLATFORM_WIN32
-#  undef min
-#  undef max
-#	if !defined(NOMINMAX) && defined(_MSC_VER)
-#		define NOMINMAX // required to stop windows.h messing up std::min
-#	endif
-#  if defined( __MINGW32__ )
-#    include <unistd.h>
-#  endif
-#endif
-
-#if CM_PLATFORM == CM_PLATFORM_LINUX
-extern "C" {
-
-#   include <unistd.h>
-#   include <dlfcn.h>
-
-}
-#endif
-
-#if CM_PLATFORM == CM_PLATFORM_APPLE || CM_PLATFORM == OGRE_PLATFORM_IPHONE
-extern "C" {
-#   include <unistd.h>
-#   include <sys/param.h>
-#   include <CoreFoundation/CoreFoundation.h>
-}
-#endif
-
-#if CM_THREAD_SUPPORT
-#   include "Threading/OgreThreadHeaders.h"
-#endif
-
-#if defined ( CM_GCC_VISIBILITY ) && (CM_PLATFORM != CM_PLATFORM_APPLE && CM_PLATFORM != OGRE_PLATFORM_IPHONE)
-#   pragma GCC visibility pop
-#endif
-#endif

CamelotRenderer/OgreThreadDefines.h

@@ -1,58 +0,0 @@
-/*-------------------------------------------------------------------------
-This source file is a 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
--------------------------------------------------------------------------*/
-#pragma once
-
-#define CM_AUTO_MUTEX_NAME mutex
-#define CM_AUTO_MUTEX
-#define CM_LOCK_AUTO_MUTEX
-#define CM_MUTEX(name)
-#define CM_STATIC_MUTEX(name)
-#define CM_STATIC_MUTEX_INSTANCE(name)
-#define CM_LOCK_MUTEX(name)
-#define CM_LOCK_MUTEX_NAMED(mutexName, lockName)
-#define CM_AUTO_SHARED_MUTEX
-#define CM_LOCK_AUTO_SHARED_MUTEX
-#define CM_NEW_AUTO_SHARED_MUTEX
-#define CM_DELETE_AUTO_SHARED_MUTEX
-#define CM_COPY_AUTO_SHARED_MUTEX(from)
-#define CM_SET_AUTO_SHARED_MUTEX_NULL
-#define CM_MUTEX_CONDITIONAL(name) if(true)
-#define CM_RW_MUTEX(name)
-#define CM_LOCK_RW_MUTEX_READ(name)
-#define CM_LOCK_RW_MUTEX_WRITE(name)
-#define CM_THREAD_SYNCHRONISER(sync) 
-#define CM_THREAD_WAIT(sync, lock) 
-#define CM_THREAD_NOTIFY_ONE(sync) 
-#define CM_THREAD_NOTIFY_ALL(sync) 
-#define CM_THREAD_POINTER(T, var) T* var
-#define CM_THREAD_POINTER_INIT(var) var(0)
-#define CM_THREAD_POINTER_VAR(T, var) T* var = 0
-#define CM_THREAD_POINTER_SET(var, expr) var = expr
-#define CM_THREAD_POINTER_GET(var) var
-#define CM_THREAD_POINTER_DELETE(var) { delete var; var = 0; }
-#define CM_THREAD_SLEEP(ms)
-#define CM_THREAD_WORKER_INHERIT
-

CamelotRenderer/OgreWindowEventUtilities.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 #include "OgreWindowEventUtilities.h"
-#include "OgreRenderWindow.h"
+#include "CmRenderWindow.h"
 #include "OgreException.h"
 #include "OgreStringConverter.h"
 #if CM_PLATFORM == CM_PLATFORM_LINUX

CamelotRenderer/OgreWindowEventUtilities.h

@@ -29,7 +29,6 @@ THE SOFTWARE.
 #define __OgreWindowEventUtils_H__
 
 #include "OgrePrerequisites.h"
-#include "OgrePlatform.h"
 
 #if CM_PLATFORM == CM_PLATFORM_WIN32
 #  define WIN32_LEAN_AND_MEAN

CamelotRenderer/RenderSystemGL/Include/OgreGLDefaultHardwareBufferManager.h

@@ -30,9 +30,9 @@ THE SOFTWARE.
 #define __GLDefaultHardwareBufferManager_H__
 
 #include "OgreGLPrerequisites.h"
-#include "OgreHardwareBufferManager.h"
-#include "OgreHardwareVertexBuffer.h"
-#include "OgreHardwareIndexBuffer.h"
+#include "CmHardwareBufferManager.h"
+#include "CmHardwareVertexBuffer.h"
+#include "CmHardwareIndexBuffer.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/RenderSystemGL/Include/OgreGLGpuProgram.h

@@ -30,8 +30,8 @@ THE SOFTWARE.
 #define __GLGpuProgram_H__
 
 #include "OgreGLPrerequisites.h"
-#include "OgreGpuProgram.h"
-#include "OgreHardwareVertexBuffer.h"
+#include "CmGpuProgram.h"
+#include "CmHardwareVertexBuffer.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/RenderSystemGL/Include/OgreGLGpuProgramManager.h

@@ -30,7 +30,7 @@ THE SOFTWARE.
 #define __GLGpuProgramManager_H__
 
 #include "OgreGLPrerequisites.h"
-#include "OgreGpuProgramManager.h"
+#include "CmGpuProgramManager.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/RenderSystemGL/Include/OgreGLHardwareBufferManager.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __GLHARWAREBUFFERMANAGER_H__
 
 #include "OgreGLPrerequisites.h"
-#include "OgreHardwareBufferManager.h"
+#include "CmHardwareBufferManager.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/RenderSystemGL/Include/OgreGLHardwareIndexBuffer.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __GLHARDWAREINDEXBUFFER_H__
 
 #include "OgreGLPrerequisites.h"
-#include "OgreHardwareIndexBuffer.h"
+#include "CmHardwareIndexBuffer.h"
 
 namespace CamelotEngine { 
 

CamelotRenderer/RenderSystemGL/Include/OgreGLHardwareOcclusionQuery.h

@@ -48,7 +48,7 @@ initialised and used in glRenderSystem and copy what is done there.
 #define __GLHARDWAREOCCLUSIONQUERY_H__
 
 #include "OgreGLPrerequisites.h"
-#include "OgreHardwareOcclusionQuery.h"
+#include "CmHardwareOcclusionQuery.h"
 
 
 namespace CamelotEngine { 

CamelotRenderer/RenderSystemGL/Include/OgreGLHardwarePixelBuffer.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __GLPIXELBUFFER_H__
 
 #include "OgreGLPrerequisites.h"
-#include "OgreHardwarePixelBuffer.h"
+#include "CmHardwarePixelBuffer.h"
 
 namespace CamelotEngine {
 	class _OgreGLExport GLHardwarePixelBuffer: public HardwarePixelBuffer

CamelotRenderer/RenderSystemGL/Include/OgreGLHardwareVertexBuffer.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __GLHARDWAREVERTEXBUFFER_H__
 
 #include "OgreGLPrerequisites.h"
-#include "OgreHardwareVertexBuffer.h"
+#include "CmHardwareVertexBuffer.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/RenderSystemGL/Include/OgreGLRenderSystem.h

@@ -29,8 +29,7 @@ THE SOFTWARE.
 #define __GLRenderSystem_H__
 
 #include "OgreGLPrerequisites.h"
-#include "OgrePlatform.h"
-#include "OgreRenderSystem.h"
+#include "CmRenderSystem.h"
 #include "OgreGLHardwareBufferManager.h"
 #include "OgreGLGpuProgramManager.h"
 #include "OgreGLSLProgramFactory.h"

CamelotRenderer/RenderSystemGL/Include/OgreGLSupport.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "OgreGLPrerequisites.h"
 #include "OgreGLRenderSystem.h"
 
-#include "OgreRenderWindow.h"
+#include "CmRenderWindow.h"
 #include "OgreConfigOptionMap.h"
 #include "OgreGLPBuffer.h"
 

CamelotRenderer/RenderSystemGL/Include/OgreGLTexture.h

@@ -30,11 +30,10 @@ THE SOFTWARE.
 #define __GLTEXTURE_H__
 
 #include "OgreGLPrerequisites.h"
-#include "OgrePlatform.h"
-#include "OgreRenderTexture.h"
-#include "OgreTexture.h"
+#include "CmRenderTexture.h"
+#include "CmTexture.h"
 #include "OgreGLSupport.h"
-#include "OgreHardwarePixelBuffer.h"
+#include "CmHardwarePixelBuffer.h"
 
 namespace CamelotEngine {