Code: Select all
1>------ Build started: Project: OgreMain, Configuration: Release Win32 ------
1> OgreMain.vcxproj -> C:\Users\OShepherd\Projects\ogre-rs\build\bin\Release\OgreMain.dll
========== Build: 1 succeeded, 0 failed, 0 up-to-date, 0 skipped ==========
C:\Users\OShepherd\Projects\ogre-rs>hg diff -r cde0338 --stat
OgreMain/include/OgreFileSystem.h | 0
OgreMain/include/OgreArchive.h | 0
OgreMain/include/OgreArchiveFactory.h | 0
OgreMain/include/OgreArchiveManager.h | 0
OgreMain/include/OgreResourceBackgroundQueue.h | 0
OgreMain/include/OgreResourceGroupManager.h | 0
OgreMain/src/OgreArchiveManager.cpp | 0
OgreMain/src/OgreFileSystem.cpp | 0
OgreMain/src/OgreResourceBackgroundQueue.cpp | 0
OgreMain/src/OgreResourceGroupManager.cpp | 0
Components/Paging/src/OgreGrid2DPageStrategy.cpp | 2 +-
Components/Paging/src/OgreGrid3DPageStrategy.cpp | 2 +-
Components/Terrain/src/OgreTerrainMaterialGenerator.cpp | 4 +-
Components/Volume/include/OgreVolumeChunk.h | 4 +-
Components/Volume/include/OgreVolumeMeshBuilder.h | 2 +-
Components/Volume/src/OgreVolumeChunk.cpp | 34 +-
Components/Volume/src/OgreVolumeDualGridGenerator.cpp | 2 +-
Components/Volume/src/OgreVolumeMeshBuilder.cpp | 2 +-
Components/Volume/src/OgreVolumeOctreeNode.cpp | 2 +-
OgreMain/CMakeLists.txt | 53 -
OgreMain/include/OgreBillboardChain.h | 6 +-
OgreMain/include/OgreBillboardSet.h | 22 +-
OgreMain/include/OgreCompositionPass.h | 4 -
OgreMain/include/OgreCompositionTechnique.h | 2 +-
OgreMain/include/OgreCompositor.h | 10 +-
OgreMain/include/OgreCompositorChain.h | 5 +-
OgreMain/include/OgreCompositorInstance.h | 17 +-
OgreMain/include/OgreCompositorManager.h | 14 +-
OgreMain/include/OgreConfigFile.h | 8 +-
OgreMain/include/OgreEntity.h | 31 +-
OgreMain/include/OgreExternalTextureSource.h | 5 +-
OgreMain/include/OgreExternalTextureSourceManager.h | 3 +-
OgreMain/include/OgreGpuProgram.h | 129 +-
OgreMain/include/OgreGpuProgramManager.h | 135 +-
OgreMain/include/OgreGpuProgramParams.h | 23 -
OgreMain/include/OgreGpuProgramUsage.h | 21 +-
OgreMain/include/OgreHighLevelGpuProgram.h | 9 +-
OgreMain/include/OgreHighLevelGpuProgramManager.h | 30 +-
OgreMain/include/OgreImage.h | 30 -
OgreMain/include/OgreInstanceManager.h | 30 +-
OgreMain/include/OgreInstancedGeometry.h | 14 +-
OgreMain/include/OgreIntrusivePtr.h | 203 +
OgreMain/include/OgreManualObject.h | 32 +-
OgreMain/include/OgreMaterial.h | 39 +-
OgreMain/include/OgreMaterialManager.h | 50 +-
OgreMain/include/OgreMesh.h | 41 +-
OgreMain/include/OgreMeshManager.h | 139 +-
OgreMain/include/OgreNode.h | 4 +-
OgreMain/include/OgreParticleSystem.h | 28 +-
OgreMain/include/OgreParticleSystemManager.h | 18 +-
OgreMain/include/OgrePass.h | 65 +-
OgreMain/include/OgrePatchMesh.h | 11 +-
OgreMain/include/OgrePrefabFactory.h | 35 +-
OgreMain/include/OgrePrerequisites.h | 32 +-
OgreMain/include/OgreQueuedProgressiveMeshGenerator.h | 2 +-
OgreMain/include/OgreRenderSystem.h | 14 -
OgreMain/include/OgreRenderSystemCapabilitiesManager.h | 5 -
OgreMain/include/OgreRenderToVertexBuffer.h | 2 +-
OgreMain/include/OgreResource.h | 563 +-
OgreMain/include/OgreResourceManager.h | 453 +-
OgreMain/include/OgreRoot.h | 119 +-
OgreMain/include/OgreSceneManager.h | 73 +-
OgreMain/include/OgreShadowVolumeExtrudeProgram.h | 6 +-
OgreMain/include/OgreSimpleRenderable.h | 3 +-
OgreMain/include/OgreSkeleton.h | 24 +-
OgreMain/include/OgreSkeletonInstance.h | 14 +-
OgreMain/include/OgreSkeletonManager.h | 7 +-
OgreMain/include/OgreStableHeaders.h | 7 -
OgreMain/include/OgreStaticGeometry.h | 10 +-
OgreMain/include/OgreSubEntity.h | 13 -
OgreMain/include/OgreSubMesh.h | 20 +-
OgreMain/include/OgreTechnique.h | 22 +-
OgreMain/include/OgreTexture.h | 288 +-
OgreMain/include/OgreTextureManager.h | 326 +-
OgreMain/include/OgreTextureUnitState.h | 194 +-
OgreMain/include/OgreUnifiedHighLevelGpuProgram.h | 59 +-
OgreMain/include/OgreViewport.h | 6 +
OgreMain/src/OgreBillboardChain.cpp | 24 +-
OgreMain/src/OgreBillboardParticleRenderer.cpp | 2 +-
OgreMain/src/OgreBillboardSet.cpp | 50 +-
OgreMain/src/OgreCompositionPass.cpp | 5 -
OgreMain/src/OgreCompositor.cpp | 34 +-
OgreMain/src/OgreCompositorChain.cpp | 60 +-
OgreMain/src/OgreCompositorInstance.cpp | 72 +-
OgreMain/src/OgreCompositorManager.cpp | 100 +-
OgreMain/src/OgreConfigFile.cpp | 16 -
OgreMain/src/OgreEntity.cpp | 80 +-
OgreMain/src/OgreFrustum.cpp | 2 +-
OgreMain/src/OgreGpuProgram.cpp | 96 +-
OgreMain/src/OgreGpuProgramManager.cpp | 233 +-
OgreMain/src/OgreGpuProgramParams.cpp | 129 -
OgreMain/src/OgreGpuProgramUsage.cpp | 80 +-
OgreMain/src/OgreHighLevelGpuProgram.cpp | 38 +-
OgreMain/src/OgreHighLevelGpuProgramManager.cpp | 396 +-
OgreMain/src/OgreImage.cpp | 29 -
OgreMain/src/OgreInstanceBatchShader.cpp | 6 +-
OgreMain/src/OgreInstanceBatchVTF.cpp | 25 +-
OgreMain/src/OgreInstanceManager.cpp | 45 +-
OgreMain/src/OgreInstancedGeometry.cpp | 39 +-
OgreMain/src/OgreManualObject.cpp | 50 +-
OgreMain/src/OgreMaterial.cpp | 153 +-
OgreMain/src/OgreMaterialManager.cpp | 54 +-
OgreMain/src/OgreMesh.cpp | 261 +-
OgreMain/src/OgreMeshManager.cpp | 466 +-
OgreMain/src/OgreMeshSerializerImpl.cpp | 3488 -------
OgreMain/src/OgreNode.cpp | 22 +-
OgreMain/src/OgreParticleSystem.cpp | 38 +-
OgreMain/src/OgreParticleSystemManager.cpp | 34 +-
OgreMain/src/OgrePass.cpp | 257 +-
OgreMain/src/OgrePatchMesh.cpp | 21 +-
OgreMain/src/OgrePrefabFactory.cpp | 76 +-
OgreMain/src/OgreQueuedProgressiveMeshGenerator.cpp | 2 +-
OgreMain/src/OgreRectangle2D.cpp | 2 +-
OgreMain/src/OgreRenderQueue.cpp | 2 +-
OgreMain/src/OgreRenderSystem.cpp | 7 -
OgreMain/src/OgreRenderSystemCapabilitiesManager.cpp | 19 -
OgreMain/src/OgreRenderToVertexBuffer.cpp | 8 +-
OgreMain/src/OgreResource.cpp | 500 +-
OgreMain/src/OgreResourceManager.cpp | 552 +-
OgreMain/src/OgreRoot.cpp | 198 +-
OgreMain/src/OgreSceneManager.cpp | 764 +-
OgreMain/src/OgreScriptTranslator.cpp | 6494 --------------
OgreMain/src/OgreShadowTextureManager.cpp | 26 +-
OgreMain/src/OgreShadowVolumeExtrudeProgram.cpp | 225 +-
OgreMain/src/OgreSimpleRenderable.cpp | 15 +-
OgreMain/src/OgreSkeleton.cpp | 74 +-
OgreMain/src/OgreSkeletonInstance.cpp | 25 +-
OgreMain/src/OgreSkeletonManager.cpp | 12 +-
OgreMain/src/OgreStaticGeometry.cpp | 19 +-
OgreMain/src/OgreSubEntity.cpp | 44 +-
OgreMain/src/OgreSubMesh.cpp | 43 +-
OgreMain/src/OgreTechnique.cpp | 102 +-
OgreMain/src/OgreTexture.cpp | 377 +-
OgreMain/src/OgreTextureManager.cpp | 225 +-
OgreMain/src/OgreTextureUnitState.cpp | 353 +-
OgreMain/src/OgreUnifiedHighLevelGpuProgram.cpp | 221 +-
OgreMain/src/OgreViewport.cpp | 29 +
OgreMain/src/OgreWireBoundingBox.cpp | 2 +-
PlugIns/BSPSceneManager/src/OgreBspSceneManager.cpp | 8 +-
OgreMain/include/OgreDDSCodec.h | 0
OgreMain/src/OgreDDSCodec.cpp | 0
OgreMain/include/OgreETCCodec.h | 0
OgreMain/src/OgreETCCodec.cpp | 0
OgreMain/include/OgreFreeImageCodec.h | 0
OgreMain/src/OgreFreeImageCodec.cpp | 0
OgreMain/include/OgrePVRTCCodec.h | 0
OgreMain/src/OgrePVRTCCodec.cpp | 0
PlugIns/ParticleFX/src/OgreColourImageAffector.cpp | 2 +-
OgreMain/include/OgreMaterialSerializer.h | 0
OgreMain/include/OgreScriptCompiler.h | 0
OgreMain/include/OgreScriptLexer.h | 0
OgreMain/include/OgreScriptLoader.h | 0
OgreMain/include/OgreScriptParser.h | 0
OgreMain/include/OgreScriptTranslator.h | 0
OgreMain/src/OgreMaterialSerializer.cpp | 0
OgreMain/src/OgreScriptCompiler.cpp | 0
OgreMain/src/OgreScriptLexer.cpp | 0
OgreMain/src/OgreScriptParser.cpp | 0
PlugIns/ScriptLoaders/src/OgreScriptTranslator.cpp | 6494 ++++++++++++++
OgreMain/include/OgreMeshFileFormat.h | 0
OgreMain/include/OgreMeshSerializer.h | 0
OgreMain/include/OgreMeshSerializerImpl.h | 0
OgreMain/include/OgreSerializer.h | 0
OgreMain/include/OgreSkeletonFileFormat.h | 0
OgreMain/include/OgreSkeletonSerializer.h | 0
OgreMain/include/OgreStreamSerialiser.h | 0
OgreMain/src/OgreMeshSerializer.cpp | 0
PlugIns/Serializers/src/OgreMeshSerializerImpl.cpp | 3489 +++++++
OgreMain/src/OgreSerializer.cpp | 0
OgreMain/src/OgreSkeletonSerializer.cpp | 0
OgreMain/src/OgreStreamSerialiser.cpp | 0
OgreMain/src/OgreDeflate.cpp | 0
OgreMain/include/OgreDeflate.h | 0
OgreMain/include/OgreZip.h | 0
OgreMain/src/OgreZip.cpp | 0
RenderSystems/Direct3D9/include/OgreD3D9Mappings.h | 3 +
RenderSystems/Direct3D9/include/OgreD3D9Texture.h | 72 +-
RenderSystems/Direct3D9/src/OgreD3D9Mappings.cpp | 19 +
RenderSystems/Direct3D9/src/OgreD3D9Texture.cpp | 1358 +--
RenderSystems/GL/include/OgreGLTexture.h | 30 +-
RenderSystems/GL/src/GLSL/include/OgreGLSLProgram.h | 4 +-
RenderSystems/GL/src/OgreGLTexture.cpp | 293 +-
Tools/XMLConverter/src/OgreXMLMeshSerializer.cpp | 10 +-
183 files changed, 12919 insertions(+), 19266 deletions(-)
I pushed the first few changes; the rest to follow tomorrow. I still need to go back over the Textures, and touch the GL end of the shader system, but that shouldn't be too bad (well, besides the multitude of languages GL supports)