Renamed D3D9 files

CamelotRenderer/CamelotRenderer.cpp

@@ -19,8 +19,8 @@
 #include "CmVector4.h"
 #include "CmHardwareBuffer.h"
 
-#include "OgreD3D9Prerequisites.h"
-#include "OgreD3D9VideoMode.h"
+#include "CmD3D9Prerequisites.h"
+#include "CmD3D9VideoMode.h"
 #include "CmRenderSystem.h"
 
 #include "CmApplication.h"

CamelotRenderer/CamelotRenderer.vcxproj

@@ -101,31 +101,31 @@
     <ClInclude Include="OgreColourValue.h" />
     <ClInclude Include="OgreCommon.h" />
     <ClInclude Include="OgreConfigOptionMap.h" />
-    <ClInclude Include="OgreD3D9Device.h" />
-    <ClInclude Include="OgreD3D9DeviceManager.h" />
-    <ClInclude Include="OgreD3D9Driver.h" />
-    <ClInclude Include="OgreD3D9DriverList.h" />
-    <ClInclude Include="OgreD3D9GpuProgram.h" />
-    <ClInclude Include="OgreD3D9GpuProgramManager.h" />
-    <ClInclude Include="OgreD3D9HardwareBufferManager.h" />
-    <ClInclude Include="OgreD3D9HardwareIndexBuffer.h" />
-    <ClInclude Include="OgreD3D9HardwareOcclusionQuery.h" />
-    <ClInclude Include="OgreD3D9HardwarePixelBuffer.h" />
-    <ClInclude Include="OgreD3D9HardwareVertexBuffer.h" />
-    <ClInclude Include="OgreD3D9HLSLProgram.h" />
-    <ClInclude Include="OgreD3D9HLSLProgramFactory.h" />
-    <ClInclude Include="OgreD3D9Mappings.h" />
-    <ClInclude Include="OgreD3D9MultiRenderTarget.h" />
-    <ClInclude Include="OgreD3D9Prerequisites.h" />
-    <ClInclude Include="OgreD3D9RenderSystem.h" />
-    <ClInclude Include="OgreD3D9RenderWindow.h" />
-    <ClInclude Include="OgreD3D9Resource.h" />
-    <ClInclude Include="OgreD3D9ResourceManager.h" />
-    <ClInclude Include="OgreD3D9Texture.h" />
-    <ClInclude Include="OgreD3D9TextureManager.h" />
-    <ClInclude Include="OgreD3D9VertexDeclaration.h" />
-    <ClInclude Include="OgreD3D9VideoMode.h" />
-    <ClInclude Include="OgreD3D9VideoModeList.h" />
+    <ClInclude Include="CmD3D9Device.h" />
+    <ClInclude Include="CmD3D9DeviceManager.h" />
+    <ClInclude Include="CmD3D9Driver.h" />
+    <ClInclude Include="CmD3D9DriverList.h" />
+    <ClInclude Include="CmD3D9GpuProgram.h" />
+    <ClInclude Include="CmD3D9GpuProgramManager.h" />
+    <ClInclude Include="CmD3D9HardwareBufferManager.h" />
+    <ClInclude Include="CmD3D9HardwareIndexBuffer.h" />
+    <ClInclude Include="CmD3D9HardwareOcclusionQuery.h" />
+    <ClInclude Include="CmD3D9HardwarePixelBuffer.h" />
+    <ClInclude Include="CmD3D9HardwareVertexBuffer.h" />
+    <ClInclude Include="CmD3D9HLSLProgram.h" />
+    <ClInclude Include="CmD3D9HLSLProgramFactory.h" />
+    <ClInclude Include="CmD3D9Mappings.h" />
+    <ClInclude Include="CmD3D9MultiRenderTarget.h" />
+    <ClInclude Include="CmD3D9Prerequisites.h" />
+    <ClInclude Include="CmD3D9RenderSystem.h" />
+    <ClInclude Include="CmD3D9RenderWindow.h" />
+    <ClInclude Include="CmD3D9Resource.h" />
+    <ClInclude Include="CmD3D9ResourceManager.h" />
+    <ClInclude Include="CmD3D9Texture.h" />
+    <ClInclude Include="CmD3D9TextureManager.h" />
+    <ClInclude Include="CmD3D9VertexDeclaration.h" />
+    <ClInclude Include="CmD3D9VideoMode.h" />
+    <ClInclude Include="CmD3D9VideoModeList.h" />
     <ClInclude Include="CmDefaultHardwareBufferManager.h" />
     <ClInclude Include="OgreException.h" />
     <ClInclude Include="CmFrustum.h" />
@@ -227,30 +227,30 @@
     <ClCompile Include="CmRenderSystemManager.cpp" />
     <ClCompile Include="CmCamera.cpp" />
     <ClCompile Include="OgreColourValue.cpp" />
-    <ClCompile Include="OgreD3D9Device.cpp" />
-    <ClCompile Include="OgreD3D9DeviceManager.cpp" />
-    <ClCompile Include="OgreD3D9Driver.cpp" />
-    <ClCompile Include="OgreD3D9DriverList.cpp" />
-    <ClCompile Include="OgreD3D9GpuProgram.cpp" />
-    <ClCompile Include="OgreD3D9GpuProgramManager.cpp" />
-    <ClCompile Include="OgreD3D9HardwareBufferManager.cpp" />
-    <ClCompile Include="OgreD3D9HardwareIndexBuffer.cpp" />
-    <ClCompile Include="OgreD3D9HardwareOcclusionQuery.cpp" />
-    <ClCompile Include="OgreD3D9HardwarePixelBuffer.cpp" />
-    <ClCompile Include="OgreD3D9HardwareVertexBuffer.cpp" />
-    <ClCompile Include="OgreD3D9HLSLProgram.cpp" />
-    <ClCompile Include="OgreD3D9HLSLProgramFactory.cpp" />
-    <ClCompile Include="OgreD3D9Mappings.cpp" />
-    <ClCompile Include="OgreD3D9MultiRenderTarget.cpp" />
-    <ClCompile Include="OgreD3D9RenderSystem.cpp" />
-    <ClCompile Include="OgreD3D9RenderWindow.cpp" />
-    <ClCompile Include="OgreD3D9Resource.cpp" />
-    <ClCompile Include="OgreD3D9ResourceManager.cpp" />
-    <ClCompile Include="OgreD3D9Texture.cpp" />
-    <ClCompile Include="OgreD3D9TextureManager.cpp" />
-    <ClCompile Include="OgreD3D9VertexDeclaration.cpp" />
-    <ClCompile Include="OgreD3D9VideoMode.cpp" />
-    <ClCompile Include="OgreD3D9VideoModeList.cpp" />
+    <ClCompile Include="CmD3D9Device.cpp" />
+    <ClCompile Include="CmD3D9DeviceManager.cpp" />
+    <ClCompile Include="CmD3D9Driver.cpp" />
+    <ClCompile Include="CmD3D9DriverList.cpp" />
+    <ClCompile Include="CmD3D9GpuProgram.cpp" />
+    <ClCompile Include="CmD3D9GpuProgramManager.cpp" />
+    <ClCompile Include="CmD3D9HardwareBufferManager.cpp" />
+    <ClCompile Include="CmD3D9HardwareIndexBuffer.cpp" />
+    <ClCompile Include="CmD3D9HardwareOcclusionQuery.cpp" />
+    <ClCompile Include="CmD3D9HardwarePixelBuffer.cpp" />
+    <ClCompile Include="CmD3D9HardwareVertexBuffer.cpp" />
+    <ClCompile Include="CmD3D9HLSLProgram.cpp" />
+    <ClCompile Include="CmD3D9HLSLProgramFactory.cpp" />
+    <ClCompile Include="CmD3D9Mappings.cpp" />
+    <ClCompile Include="CmD3D9MultiRenderTarget.cpp" />
+    <ClCompile Include="CmD3D9RenderSystem.cpp" />
+    <ClCompile Include="CmD3D9RenderWindow.cpp" />
+    <ClCompile Include="CmD3D9Resource.cpp" />
+    <ClCompile Include="CmD3D9ResourceManager.cpp" />
+    <ClCompile Include="CmD3D9Texture.cpp" />
+    <ClCompile Include="CmD3D9TextureManager.cpp" />
+    <ClCompile Include="CmD3D9VertexDeclaration.cpp" />
+    <ClCompile Include="CmD3D9VideoMode.cpp" />
+    <ClCompile Include="CmD3D9VideoModeList.cpp" />
     <ClCompile Include="CmDefaultHardwareBufferManager.cpp" />
     <ClCompile Include="OgreException.cpp" />
     <ClCompile Include="CmFrustum.cpp" />

CamelotRenderer/CamelotRenderer.vcxproj.filters

@@ -65,15 +65,6 @@
     <ClInclude Include="targetver.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="OgreD3D9Prerequisites.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9VideoMode.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9Resource.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
     <ClInclude Include="OgreBitwise.h">
       <Filter>Header Files\ForRemoval</Filter>
     </ClInclude>
@@ -101,72 +92,6 @@
     <ClInclude Include="OgreRenderOperation.h">
       <Filter>Header Files\ForRemoval</Filter>
     </ClInclude>
-    <ClInclude Include="OgreD3D9Mappings.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9Device.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9DeviceManager.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9Driver.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9DriverList.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9GpuProgram.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9GpuProgramManager.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9HardwareBufferManager.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9HardwareIndexBuffer.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9HardwareOcclusionQuery.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9HardwarePixelBuffer.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9HardwareVertexBuffer.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9HLSLProgram.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9HLSLProgramFactory.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9MultiRenderTarget.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9RenderSystem.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9RenderWindow.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9ResourceManager.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9Texture.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9TextureManager.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9VertexDeclaration.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="OgreD3D9VideoModeList.h">
-      <Filter>Header Files\D3D9RenderSystem</Filter>
-    </ClInclude>
     <ClInclude Include="OgreBlendMode.h">
       <Filter>Header Files\Utility</Filter>
     </ClInclude>
@@ -443,6 +368,81 @@
     <ClInclude Include="CmViewport.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="CmD3D9Device.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9DeviceManager.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9Driver.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9DriverList.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9GpuProgram.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9GpuProgramManager.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9HardwareBufferManager.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9HardwareIndexBuffer.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9HardwareOcclusionQuery.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9HardwarePixelBuffer.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9HardwareVertexBuffer.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9HLSLProgram.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9HLSLProgramFactory.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9Mappings.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9MultiRenderTarget.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9Prerequisites.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9RenderSystem.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9RenderWindow.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9Resource.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9ResourceManager.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9Texture.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9TextureManager.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9VertexDeclaration.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9VideoMode.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="CmD3D9VideoModeList.h">
+      <Filter>Header Files\D3D9RenderSystem</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -451,12 +451,6 @@
     <ClCompile Include="CamelotRenderer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="OgreD3D9VideoMode.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9Resource.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
     <ClCompile Include="OgreException.cpp">
       <Filter>Source Files\ForRemoval</Filter>
     </ClCompile>
@@ -466,72 +460,6 @@
     <ClCompile Include="OgreStringConverter.cpp">
       <Filter>Source Files\ForRemoval</Filter>
     </ClCompile>
-    <ClCompile Include="OgreD3D9Mappings.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9Device.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9DeviceManager.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9Driver.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9DriverList.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9GpuProgram.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9GpuProgramManager.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9HardwareBufferManager.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9HardwareIndexBuffer.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9HardwareOcclusionQuery.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9HardwarePixelBuffer.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9HardwareVertexBuffer.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9HLSLProgram.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9HLSLProgramFactory.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9MultiRenderTarget.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9RenderSystem.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9RenderWindow.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9ResourceManager.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9Texture.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9TextureManager.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9VertexDeclaration.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="OgreD3D9VideoModeList.cpp">
-      <Filter>Source Files\D3D9RenderSystem</Filter>
-    </ClCompile>
     <ClCompile Include="OgreColourValue.cpp">
       <Filter>Source Files\Utility</Filter>
     </ClCompile>
@@ -796,5 +724,77 @@
     <ClCompile Include="CmViewport.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="CmD3D9Device.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9DeviceManager.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9Driver.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9DriverList.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9GpuProgram.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9GpuProgramManager.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9HardwareBufferManager.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9HardwareIndexBuffer.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9HardwareOcclusionQuery.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9HardwarePixelBuffer.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9HardwareVertexBuffer.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9HLSLProgram.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9HLSLProgramFactory.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9Mappings.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9MultiRenderTarget.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9RenderSystem.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9RenderWindow.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9Resource.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9ResourceManager.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9Texture.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9TextureManager.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9VertexDeclaration.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9VideoMode.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="CmD3D9VideoModeList.cpp">
+      <Filter>Source Files\D3D9RenderSystem</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

CamelotRenderer/OgreD3D9Device.cpp → CamelotRenderer/CmD3D9Device.cpp

@@ -25,12 +25,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9Device.h"
-#include "OgreD3D9DeviceManager.h"
-#include "OgreD3D9Driver.h"
-#include "OgreD3D9RenderSystem.h"
-#include "OgreD3D9ResourceManager.h"
-#include "OgreD3D9RenderWindow.h"
+#include "CmD3D9Device.h"
+#include "CmD3D9DeviceManager.h"
+#include "CmD3D9Driver.h"
+#include "CmD3D9RenderSystem.h"
+#include "CmD3D9ResourceManager.h"
+#include "CmD3D9RenderWindow.h"
 #include "CmHardwareBufferManager.h"
 #include "OgreException.h"
 #include "CmRenderSystemManager.h"

CamelotRenderer/OgreD3D9Device.h → CamelotRenderer/CmD3D9Device.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __D3D9Device_H__
 #define __D3D9Device_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 #include "CmRenderTarget.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreD3D9DeviceManager.cpp → CamelotRenderer/CmD3D9DeviceManager.cpp

@@ -25,12 +25,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9DeviceManager.h"
-#include "OgreD3D9Device.h"
-#include "OgreD3D9RenderSystem.h"
-#include "OgreD3D9RenderWindow.h"
-#include "OgreD3D9Driver.h"
-#include "OgreD3D9DriverList.h"
+#include "CmD3D9DeviceManager.h"
+#include "CmD3D9Device.h"
+#include "CmD3D9RenderSystem.h"
+#include "CmD3D9RenderWindow.h"
+#include "CmD3D9Driver.h"
+#include "CmD3D9DriverList.h"
 #include "OgreException.h"
 #include "CmRenderSystemManager.h"
 

CamelotRenderer/OgreD3D9DeviceManager.h → CamelotRenderer/CmD3D9DeviceManager.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __D3D9DeviceManager_H__
 #define __D3D9DeviceManager_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreD3D9Driver.cpp → CamelotRenderer/CmD3D9Driver.cpp

@@ -25,9 +25,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9Driver.h"
-#include "OgreD3D9VideoModeList.h"
-#include "OgreD3D9VideoMode.h"
+#include "CmD3D9Driver.h"
+#include "CmD3D9VideoModeList.h"
+#include "CmD3D9VideoMode.h"
 
 namespace CamelotEngine
 {   

CamelotRenderer/OgreD3D9Driver.h → CamelotRenderer/CmD3D9Driver.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __D3D9DRIVER_H__
 #define __D3D9DRIVER_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 #include "OgreString.h"
 
 namespace CamelotEngine

CamelotRenderer/OgreD3D9DriverList.cpp → CamelotRenderer/CmD3D9DriverList.cpp

@@ -25,9 +25,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9DriverList.h"
+#include "CmD3D9DriverList.h"
 #include "OgreException.h"
-#include "OgreD3D9RenderSystem.h"
+#include "CmD3D9RenderSystem.h"
 
 namespace CamelotEngine 
 {

CamelotRenderer/OgreD3D9DriverList.h → CamelotRenderer/CmD3D9DriverList.h

@@ -28,8 +28,8 @@ THE SOFTWARE.
 #ifndef __D3D9DRIVERLIST_H__
 #define __D3D9DRIVERLIST_H__
 
-#include "OgreD3D9Prerequisites.h"
-#include "OgreD3D9Driver.h"
+#include "CmD3D9Prerequisites.h"
+#include "CmD3D9Driver.h"
 
 namespace CamelotEngine 
 {

CamelotRenderer/OgreD3D9GpuProgram.cpp → CamelotRenderer/CmD3D9GpuProgram.cpp

@@ -25,11 +25,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9GpuProgram.h"
+#include "CmD3D9GpuProgram.h"
 #include "CmMatrix4.h"
 #include "OgreException.h"
-#include "OgreD3D9Mappings.h"
-#include "OgreD3D9RenderSystem.h"
+#include "CmD3D9Mappings.h"
+#include "CmD3D9RenderSystem.h"
 
 namespace CamelotEngine {
     //-----------------------------------------------------------------------------

CamelotRenderer/OgreD3D9GpuProgram.h → CamelotRenderer/CmD3D9GpuProgram.h

@@ -29,9 +29,9 @@ THE SOFTWARE.
 #define __D3D9GpuProgram_H_
 
 // Precompiler options
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 #include "CmGpuProgram.h"
-#include "OgreD3D9Resource.h"
+#include "CmD3D9Resource.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreD3D9GpuProgramManager.cpp → CamelotRenderer/CmD3D9GpuProgramManager.cpp

@@ -25,8 +25,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9GpuProgramManager.h"
-#include "OgreD3D9GpuProgram.h"
+#include "CmD3D9GpuProgramManager.h"
+#include "CmD3D9GpuProgram.h"
 #include "OgreException.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreD3D9GpuProgramManager.h → CamelotRenderer/CmD3D9GpuProgramManager.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __D3D9GpuProgramManager_H__
 #define __D3D9GpuProgramManager_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 #include "CmGpuProgram.h"
 #include "CmGpuProgramManager.h"
 

CamelotRenderer/OgreD3D9HLSLProgram.cpp → CamelotRenderer/CmD3D9HLSLProgram.cpp

@@ -25,10 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9HLSLProgram.h"
+#include "CmD3D9HLSLProgram.h"
 #include "CmGpuProgramManager.h"
 #include "OgreStringConverter.h"
-#include "OgreD3D9GpuProgram.h"
+#include "CmD3D9GpuProgram.h"
 #include "OgreException.h"
 #include "CmRenderSystem.h"
 #include "CmRenderSystemManager.h"

CamelotRenderer/OgreD3D9HLSLProgram.h → CamelotRenderer/CmD3D9HLSLProgram.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __D3D9HLSLProgram_H__
 #define __D3D9HLSLProgram_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 #include "CmHighLevelGpuProgram.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreD3D9HLSLProgramFactory.cpp → CamelotRenderer/CmD3D9HLSLProgramFactory.cpp

@@ -26,9 +26,9 @@ THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
 
-#include "OgreD3D9HLSLProgramFactory.h"
+#include "CmD3D9HLSLProgramFactory.h"
 #include "OgreString.h"
-#include "OgreD3D9HLSLProgram.h"
+#include "CmD3D9HLSLProgram.h"
 
 namespace CamelotEngine {
     //-----------------------------------------------------------------------

CamelotRenderer/OgreD3D9HLSLProgramFactory.h → CamelotRenderer/CmD3D9HLSLProgramFactory.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __D3D9HLSLProgramFactory_H__
 #define __D3D9HLSLProgramFactory_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 #include "CmHighLevelGpuProgramManager.h"
 
 namespace CamelotEngine

CamelotRenderer/OgreD3D9HardwareBufferManager.cpp → CamelotRenderer/CmD3D9HardwareBufferManager.cpp

@@ -25,10 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9HardwareBufferManager.h"
-#include "OgreD3D9HardwareVertexBuffer.h"
-#include "OgreD3D9HardwareIndexBuffer.h"
-#include "OgreD3D9VertexDeclaration.h"
+#include "CmD3D9HardwareBufferManager.h"
+#include "CmD3D9HardwareVertexBuffer.h"
+#include "CmD3D9HardwareIndexBuffer.h"
+#include "CmD3D9VertexDeclaration.h"
 #include "OgreStringConverter.h"
 #include "OgreException.h"
 

CamelotRenderer/OgreD3D9HardwareBufferManager.h → CamelotRenderer/CmD3D9HardwareBufferManager.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __D3D9HARWAREBUFFERMANAGER_H__
 #define __D3D9HARWAREBUFFERMANAGER_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 #include "CmHardwareBufferManager.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreD3D9HardwareIndexBuffer.cpp → CamelotRenderer/CmD3D9HardwareIndexBuffer.cpp

@@ -25,13 +25,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ----------------------------------------------------------------------------
 */
-#include "OgreD3D9HardwareIndexBuffer.h"
-#include "OgreD3D9Mappings.h"
+#include "CmD3D9HardwareIndexBuffer.h"
+#include "CmD3D9Mappings.h"
 #include "OgreException.h"
-#include "OgreD3D9HardwareBufferManager.h"
-#include "OgreD3D9RenderSystem.h"
-#include "OgreD3D9Device.h"
-#include "OgreD3D9ResourceManager.h"
+#include "CmD3D9HardwareBufferManager.h"
+#include "CmD3D9RenderSystem.h"
+#include "CmD3D9Device.h"
+#include "CmD3D9ResourceManager.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreD3D9HardwareIndexBuffer.h → CamelotRenderer/CmD3D9HardwareIndexBuffer.h

@@ -28,9 +28,9 @@ THE SOFTWARE.
 #ifndef __D3D9HARDWAREINDEXBUFFER_H__
 #define __D3D9HARDWAREINDEXBUFFER_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 #include "CmHardwareIndexBuffer.h"
-#include "OgreD3D9Resource.h"
+#include "CmD3D9Resource.h"
 
 namespace CamelotEngine { 
 

CamelotRenderer/OgreD3D9HardwareOcclusionQuery.cpp → CamelotRenderer/CmD3D9HardwareOcclusionQuery.cpp

@@ -25,10 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9HardwareOcclusionQuery.h"
+#include "CmD3D9HardwareOcclusionQuery.h"
 #include "CmRenderSystemCapabilities.h"
 #include "OgreException.h"
-#include "OgreD3D9RenderSystem.h"
+#include "CmD3D9RenderSystem.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreD3D9HardwareOcclusionQuery.h → CamelotRenderer/CmD3D9HardwareOcclusionQuery.h

@@ -29,9 +29,9 @@ THE SOFTWARE.
 #ifndef _D3D9HARWAREOCCLUSIONQUERY_H__
 #define _D3D9HARWAREOCCLUSIONQUERY_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 #include "CmHardwareOcclusionQuery.h"
-#include "OgreD3D9Resource.h"
+#include "CmD3D9Resource.h"
 
 
 namespace CamelotEngine {

CamelotRenderer/OgreD3D9HardwarePixelBuffer.cpp → CamelotRenderer/CmD3D9HardwarePixelBuffer.cpp

@@ -25,9 +25,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9HardwarePixelBuffer.h"
-#include "OgreD3D9Texture.h"
-#include "OgreD3D9Mappings.h"
+#include "CmD3D9HardwarePixelBuffer.h"
+#include "CmD3D9Texture.h"
+#include "CmD3D9Mappings.h"
 #include "OgreException.h"
 #include "OgreStringConverter.h"
 #include "OgreBitwise.h"

CamelotRenderer/OgreD3D9HardwarePixelBuffer.h → CamelotRenderer/CmD3D9HardwarePixelBuffer.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __D3D9PIXELBUFFER_H__
 #define __D3D9PIXELBUFFER_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 #include "CmHardwarePixelBuffer.h"
 
 namespace CamelotEngine {

CamelotRenderer/OgreD3D9HardwareVertexBuffer.cpp → CamelotRenderer/CmD3D9HardwareVertexBuffer.cpp

@@ -25,13 +25,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9HardwareVertexBuffer.h"
-#include "OgreD3D9Mappings.h"
+#include "CmD3D9HardwareVertexBuffer.h"
+#include "CmD3D9Mappings.h"
 #include "OgreException.h"
-#include "OgreD3D9HardwareBufferManager.h"
-#include "OgreD3D9RenderSystem.h"
-#include "OgreD3D9Device.h"
-#include "OgreD3D9ResourceManager.h"
+#include "CmD3D9HardwareBufferManager.h"
+#include "CmD3D9RenderSystem.h"
+#include "CmD3D9Device.h"
+#include "CmD3D9ResourceManager.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreD3D9HardwareVertexBuffer.h → CamelotRenderer/CmD3D9HardwareVertexBuffer.h

@@ -28,9 +28,9 @@ THE SOFTWARE.
 #ifndef __D3D9HARDWAREVERTEXBUFFER_H__
 #define __D3D9HARDWAREVERTEXBUFFER_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 #include "CmHardwareVertexBuffer.h"
-#include "OgreD3D9Resource.h"
+#include "CmD3D9Resource.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreD3D9Mappings.cpp → CamelotRenderer/CmD3D9Mappings.cpp

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

CamelotRenderer/OgreD3D9Mappings.h → CamelotRenderer/CmD3D9Mappings.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __D3D9MAPPINGS_H__
 #define __D3D9MAPPINGS_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 #include "OgreCommon.h"
 #include "CmRenderSystem.h"
 #include "CmHardwareBuffer.h"

CamelotRenderer/OgreD3D9MultiRenderTarget.cpp → CamelotRenderer/CmD3D9MultiRenderTarget.cpp

@@ -25,14 +25,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9MultiRenderTarget.h"
-#include "OgreD3D9HardwarePixelBuffer.h"
+#include "CmD3D9MultiRenderTarget.h"
+#include "CmD3D9HardwarePixelBuffer.h"
 #include "OgreException.h"
 #include "OgreStringConverter.h"
 #include "OgreBitwise.h"
-#include "OgreD3D9RenderSystem.h"
-#include "OgreD3D9Device.h"
-#include "OgreD3D9DeviceManager.h"
+#include "CmD3D9RenderSystem.h"
+#include "CmD3D9Device.h"
+#include "CmD3D9DeviceManager.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine 

CamelotRenderer/OgreD3D9MultiRenderTarget.h → CamelotRenderer/CmD3D9MultiRenderTarget.h

@@ -28,11 +28,11 @@ THE SOFTWARE.
 #ifndef __D3D9MULTIRENDERTARGET_H__
 #define __D3D9MULTIRENDERTARGET_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 #include "CmTexture.h"
 #include "CmRenderTexture.h"
 #include "OgreException.h"
-#include "OgreD3D9HardwarePixelBuffer.h"
+#include "CmD3D9HardwarePixelBuffer.h"
 
 namespace CamelotEngine {
 	class _OgreD3D9Export D3D9MultiRenderTarget : public MultiRenderTarget

CamelotRenderer/OgreD3D9RenderSystem.cpp → CamelotRenderer/CmD3D9RenderSystem.cpp

@@ -25,28 +25,28 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9RenderSystem.h"
-#include "OgreD3D9Prerequisites.h"
-#include "OgreD3D9DriverList.h"
-#include "OgreD3D9Driver.h"
-#include "OgreD3D9VideoModeList.h"
-#include "OgreD3D9VideoMode.h"
-#include "OgreD3D9RenderWindow.h"
-#include "OgreD3D9TextureManager.h"
-#include "OgreD3D9Texture.h"
+#include "CmD3D9RenderSystem.h"
+#include "CmD3D9Prerequisites.h"
+#include "CmD3D9DriverList.h"
+#include "CmD3D9Driver.h"
+#include "CmD3D9VideoModeList.h"
+#include "CmD3D9VideoMode.h"
+#include "CmD3D9RenderWindow.h"
+#include "CmD3D9TextureManager.h"
+#include "CmD3D9Texture.h"
 #include "CmMath.h"
-#include "OgreD3D9HardwareBufferManager.h"
-#include "OgreD3D9HardwareIndexBuffer.h"
-#include "OgreD3D9HardwareVertexBuffer.h"
-#include "OgreD3D9VertexDeclaration.h"
-#include "OgreD3D9GpuProgram.h"
-#include "OgreD3D9GpuProgramManager.h"
-#include "OgreD3D9HLSLProgramFactory.h"
-#include "OgreD3D9HardwareOcclusionQuery.h"
+#include "CmD3D9HardwareBufferManager.h"
+#include "CmD3D9HardwareIndexBuffer.h"
+#include "CmD3D9HardwareVertexBuffer.h"
+#include "CmD3D9VertexDeclaration.h"
+#include "CmD3D9GpuProgram.h"
+#include "CmD3D9GpuProgramManager.h"
+#include "CmD3D9HLSLProgramFactory.h"
+#include "CmD3D9HardwareOcclusionQuery.h"
 #include "CmFrustum.h"
-#include "OgreD3D9MultiRenderTarget.h"
-#include "OgreD3D9DeviceManager.h"
-#include "OgreD3D9ResourceManager.h"
+#include "CmD3D9MultiRenderTarget.h"
+#include "CmD3D9DeviceManager.h"
+#include "CmD3D9ResourceManager.h"
 #include "CmHighLevelGpuProgramManager.h"
 
 #define FLOAT2DWORD(f) *((DWORD*)&f)

CamelotRenderer/OgreD3D9RenderSystem.h → CamelotRenderer/CmD3D9RenderSystem.h

@@ -28,13 +28,13 @@ THE SOFTWARE.
 #ifndef __D3D9RENDERSYSTEM_H__
 #define __D3D9RENDERSYSTEM_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 #include "OgreString.h"
 #include "OgreStringConverter.h"
 #include "OgreConfigOptionMap.h"
 #include "CmRenderSystem.h"
 #include "CmRenderSystemCapabilities.h"
-#include "OgreD3D9Mappings.h"
+#include "CmD3D9Mappings.h"
 
 namespace CamelotEngine 
 {

CamelotRenderer/CmD3D9RenderSystemFactory.h

@@ -3,7 +3,7 @@
 #include <string>
 #include "CmRenderSystemFactory.h"
 #include "CmRenderSystemManager.h"
-#include "OgreD3D9RenderSystem.h"
+#include "CmD3D9RenderSystem.h"
 
 namespace CamelotEngine
 {

CamelotRenderer/OgreD3D9RenderWindow.cpp → CamelotRenderer/CmD3D9RenderWindow.cpp

@@ -25,15 +25,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9RenderWindow.h"
+#include "CmD3D9RenderWindow.h"
 #include "CmViewport.h"
 #include "OgreException.h"
-#include "OgreD3D9RenderSystem.h"
+#include "CmD3D9RenderSystem.h"
 #include "CmRenderSystem.h"
 #include "OgreBitwise.h"
 #include "OgreStringConverter.h"
 #include "OgreWindowEventUtilities.h"
-#include "OgreD3D9DeviceManager.h"
+#include "CmD3D9DeviceManager.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine

CamelotRenderer/OgreD3D9RenderWindow.h → CamelotRenderer/CmD3D9RenderWindow.h

@@ -28,9 +28,9 @@ THE SOFTWARE.
 #ifndef __D3D9RENDERWINDOW_H__
 #define __D3D9RENDERWINDOW_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 #include "CmRenderWindow.h"
-#include "OgreD3D9Device.h"
+#include "CmD3D9Device.h"
 
 namespace CamelotEngine 
 {

CamelotRenderer/OgreD3D9Resource.cpp → CamelotRenderer/CmD3D9Resource.cpp

@@ -25,9 +25,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9Resource.h"
-#include "OgreD3D9ResourceManager.h"
-#include "OgreD3D9RenderSystem.h"
+#include "CmD3D9Resource.h"
+#include "CmD3D9ResourceManager.h"
+#include "CmD3D9RenderSystem.h"
 
 namespace CamelotEngine
 {

CamelotRenderer/OgreD3D9Resource.h → CamelotRenderer/CmD3D9Resource.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __D3D9Resource_H__
 #define __D3D9Resource_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreD3D9ResourceManager.cpp → CamelotRenderer/CmD3D9ResourceManager.cpp

@@ -25,9 +25,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9Resource.h"
-#include "OgreD3D9ResourceManager.h"
-#include "OgreD3D9HardwarePixelBuffer.h"
+#include "CmD3D9Resource.h"
+#include "CmD3D9ResourceManager.h"
+#include "CmD3D9HardwarePixelBuffer.h"
 
 namespace CamelotEngine
 {

CamelotRenderer/OgreD3D9ResourceManager.h → CamelotRenderer/CmD3D9ResourceManager.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __D3D9ResourceManager_H__
 #define __D3D9ResourceManager_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreD3D9Texture.cpp → CamelotRenderer/CmD3D9Texture.cpp

@@ -25,17 +25,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9Texture.h"
-#include "OgreD3D9HardwarePixelBuffer.h"
+#include "CmD3D9Texture.h"
+#include "CmD3D9HardwarePixelBuffer.h"
 #include "OgreException.h"
 #include "OgreStringConverter.h"
 #include "OgreBitwise.h"
-#include "OgreD3D9Mappings.h"
-#include "OgreD3D9RenderSystem.h"
-#include "OgreD3D9TextureManager.h"
-#include "OgreD3D9Device.h"
-#include "OgreD3D9DeviceManager.h"
-#include "OgreD3D9ResourceManager.h"
+#include "CmD3D9Mappings.h"
+#include "CmD3D9RenderSystem.h"
+#include "CmD3D9TextureManager.h"
+#include "CmD3D9Device.h"
+#include "CmD3D9DeviceManager.h"
+#include "CmD3D9ResourceManager.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine 

CamelotRenderer/OgreD3D9Texture.h → CamelotRenderer/CmD3D9Texture.h

@@ -28,12 +28,12 @@ THE SOFTWARE.
 #ifndef __D3D9TEXTURE_H__
 #define __D3D9TEXTURE_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 #include "CmTexture.h"
 #include "CmRenderTexture.h"
 #include "OgreException.h"
-#include "OgreD3D9HardwarePixelBuffer.h"
-#include "OgreD3D9Resource.h"
+#include "CmD3D9HardwarePixelBuffer.h"
+#include "CmD3D9Resource.h"
 
 namespace CamelotEngine {
 	class _OgreD3D9Export D3D9Texture : public Texture, public D3D9Resource

CamelotRenderer/OgreD3D9TextureManager.cpp → CamelotRenderer/CmD3D9TextureManager.cpp

@@ -25,12 +25,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9TextureManager.h"
-#include "OgreD3D9Texture.h"
+#include "CmD3D9TextureManager.h"
+#include "CmD3D9Texture.h"
 #include "OgreException.h"
 #include "OgreStringConverter.h"
-#include "OgreD3D9Mappings.h"
-#include "OgreD3D9RenderSystem.h"
+#include "CmD3D9Mappings.h"
+#include "CmD3D9RenderSystem.h"
 #include "CmRenderSystemManager.h"
 
 namespace CamelotEngine 

CamelotRenderer/OgreD3D9TextureManager.h → CamelotRenderer/CmD3D9TextureManager.h

@@ -28,8 +28,8 @@ THE SOFTWARE.
 #ifndef __D3D9TEXTUREMANAGER_H__
 #define __D3D9TEXTUREMANAGER_H__
 
-#include "OgreD3D9Prerequisites.h"
-#include "OgreD3D9Texture.h"
+#include "CmD3D9Prerequisites.h"
+#include "CmD3D9Texture.h"
 #include "CmTextureManager.h"
 
 namespace CamelotEngine 

CamelotRenderer/OgreD3D9VertexDeclaration.cpp → CamelotRenderer/CmD3D9VertexDeclaration.cpp

@@ -25,10 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9VertexDeclaration.h"
-#include "OgreD3D9Mappings.h"
+#include "CmD3D9VertexDeclaration.h"
+#include "CmD3D9Mappings.h"
 #include "OgreException.h"
-#include "OgreD3D9RenderSystem.h"
+#include "CmD3D9RenderSystem.h"
 
 namespace CamelotEngine {
 

CamelotRenderer/OgreD3D9VertexDeclaration.h → CamelotRenderer/CmD3D9VertexDeclaration.h

@@ -28,9 +28,9 @@ THE SOFTWARE.
 #ifndef __D3D9VERTEXDECLARATION_H__
 #define __D3D9VERTEXDECLARATION_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 #include "CmHardwareVertexBuffer.h"
-#include "OgreD3D9Resource.h"
+#include "CmD3D9Resource.h"
 
 namespace CamelotEngine { 
 

CamelotRenderer/OgreD3D9VideoMode.cpp → CamelotRenderer/CmD3D9VideoMode.cpp

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

CamelotRenderer/OgreD3D9VideoMode.h → CamelotRenderer/CmD3D9VideoMode.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #ifndef __D3D9VIDEOMODE_H__
 #define __D3D9VIDEOMODE_H__
 
-#include "OgreD3D9Prerequisites.h"
+#include "CmD3D9Prerequisites.h"
 #include "OgreString.h"
 
 namespace CamelotEngine 

CamelotRenderer/OgreD3D9VideoModeList.cpp → CamelotRenderer/CmD3D9VideoModeList.cpp

@@ -25,9 +25,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "OgreD3D9VideoModeList.h"
+#include "CmD3D9VideoModeList.h"
 #include "OgreException.h"
-#include "OgreD3D9RenderSystem.h"
+#include "CmD3D9RenderSystem.h"
 
 namespace CamelotEngine 
 {

CamelotRenderer/OgreD3D9VideoModeList.h → CamelotRenderer/CmD3D9VideoModeList.h

@@ -28,9 +28,9 @@ THE SOFTWARE.
 #ifndef __D3D9VIDEOMODELIST_H__
 #define __D3D9VIDEOMODELIST_H__
 
-#include "OgreD3D9Prerequisites.h"
-#include "OgreD3D9Driver.h"
-#include "OgreD3D9VideoMode.h"
+#include "CmD3D9Prerequisites.h"
+#include "CmD3D9Driver.h"
+#include "CmD3D9VideoMode.h"
 
 namespace CamelotEngine 
 {