Upgrade Ogre3D sample for Ogre 1.7

Samples/basic/ogre3d/Ogre3D.vcproj

@@ -39,7 +39,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\include;&quot;$(OGRE_HOME)\include&quot;;&quot;$(OGRE_HOME)\samples\include&quot;"
+				AdditionalIncludeDirectories="..\..\..\include;&quot;$(OGRE_HOME)\include&quot;;&quot;$(OGRE_HOME)\boost_1_44&quot;;&quot;$(OGRE_HOME)\samples\include&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS"
 				RuntimeLibrary="3"
 				WarningLevel="3"
@@ -58,7 +58,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="RocketCore_d.lib RocketControls_d.lib RocketDebugger_d.lib OgreMain_d.lib OIS_d.lib"
 				OutputFile="..\..\..\bin\$(ProjectName)_d.exe"
-				AdditionalLibraryDirectories="..\..\..\bin;&quot;$(OGRE_HOME)\lib&quot;"
+				AdditionalLibraryDirectories="..\..\..\bin;&quot;$(OGRE_HOME)\lib\debug&quot;;&quot;$(OGRE_HOME)\boost_1_44\lib&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -109,7 +109,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\include;&quot;$(OGRE_HOME)\include&quot;;&quot;$(OGRE_HOME)\samples\include&quot;"
+				AdditionalIncludeDirectories="..\..\..\include;&quot;$(OGRE_HOME)\include&quot;;&quot;$(OGRE_HOME)\boost_1_44&quot;;&quot;$(OGRE_HOME)\samples\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -127,7 +127,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="RocketCore.lib RocketControls.lib RocketDebugger.lib OgreMain.lib OIS.lib"
 				OutputFile="..\..\..\bin\$(ProjectName).exe"
-				AdditionalLibraryDirectories="..\..\..\bin;&quot;$(OGRE_HOME)\lib&quot;"
+				AdditionalLibraryDirectories="..\..\..\bin;&quot;$(OGRE_HOME)\lib\release&quot;;&quot;$(OGRE_HOME)\boost_1_44\lib&quot;"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"

Samples/basic/ogre3d/src/RenderInterfaceOgre3D.cpp

@@ -26,7 +26,7 @@
  */
 
 #include "RenderInterfaceOgre3D.h"
-#include <Ogre.h>
+#include <Ogre/Ogre.h>
 
 struct RocketOgre3DVertex
 {
@@ -146,7 +146,7 @@ Rocket::Core::CompiledGeometryHandle RenderInterfaceOgre3D::CompileGeometry(Rock
 	index_buffer->unlock();
 
 
-	return geometry;
+	return reinterpret_cast<Rocket::Core::CompiledGeometryHandle>(geometry);
 }
 
 // Called by Rocket when it wants to render application-compiled geometry.
@@ -177,7 +177,7 @@ void RenderInterfaceOgre3D::RenderCompiledGeometry(Rocket::Core::CompiledGeometr
 // Called by Rocket when it wants to release application-compiled geometry.
 void RenderInterfaceOgre3D::ReleaseCompiledGeometry(Rocket::Core::CompiledGeometryHandle geometry)
 {
-	RocketOgre3DCompiledGeometry* ogre3d_geometry = (RocketOgre3DCompiledGeometry*) geometry;
+	RocketOgre3DCompiledGeometry* ogre3d_geometry = reinterpret_cast<RocketOgre3DCompiledGeometry*>(geometry);
 	delete ogre3d_geometry->render_operation.vertexData;
 	delete ogre3d_geometry->render_operation.indexData;
 	delete ogre3d_geometry;
@@ -225,7 +225,7 @@ bool RenderInterfaceOgre3D::LoadTexture(Rocket::Core::TextureHandle& texture_han
 	texture_dimensions.x = ogre_texture->getWidth();
 	texture_dimensions.y = ogre_texture->getHeight();
 
-	texture_handle = new RocketOgre3DTexture(ogre_texture);
+	texture_handle = reinterpret_cast<Rocket::Core::TextureHandle>(new RocketOgre3DTexture(ogre_texture));
 	return true;
 }
 
@@ -246,7 +246,7 @@ bool RenderInterfaceOgre3D::GenerateTexture(Rocket::Core::TextureHandle& texture
 	if (ogre_texture.isNull())
 		return false;
 
-	texture_handle = new RocketOgre3DTexture(ogre_texture);
+	texture_handle = reinterpret_cast<Rocket::Core::TextureHandle>(new RocketOgre3DTexture(ogre_texture));
 	return true;
 }
 

Samples/basic/ogre3d/src/RenderInterfaceOgre3D.h

@@ -29,7 +29,7 @@
 #define RENDERINTERFACEOGRE3D_H
 
 #include <Rocket/Core/RenderInterface.h>
-#include <Ogre.h>
+#include <Ogre/Ogre.h>
 
 /**
 	A sample render interface for Rocket into Ogre3D.

Samples/basic/ogre3d/src/RocketApplication.h

@@ -29,8 +29,8 @@
 #define ROCKETAPPLICATION_H
 
 #include <Rocket/Core/String.h>
-#include <ExampleApplication.h>
-#include <Ogre.h>
+#include <Ogre/ExampleApplication.h>
+#include <Ogre/Ogre.h>
 
 namespace Rocket {
 namespace Core {

Samples/basic/ogre3d/src/RocketFrameListener.h

@@ -29,7 +29,7 @@
 #define ROCKETFRAMELISTENER_H
 
 #include <Rocket/Core/Context.h>
-#include <ExampleFrameListener.h>
+#include <Ogre/ExampleFrameListener.h>
 
 class RocketApplication;
 

Samples/basic/ogre3d/src/SystemInterfaceOgre3D.h

@@ -29,7 +29,7 @@
 #define SYSTEMINTERFACE3D_H
 
 #include <Rocket/Core/SystemInterface.h>
-#include <Ogre.h>
+#include <Ogre/Ogre.h>
 
 /**
 	A sample system interface for Rocket into Ogre3D.