Menu
▾
▴
[Mogre-svnmail] SF.net SVN: mogre:[312] trunk/Mogre
|
From: <mog...@li...> - 2010-04-13 20:53:40
|
Revision: 312
http://mogre.svn.sourceforge.net/mogre/?rev=312&view=rev
Author: realgantz
Date: 2010-04-13 20:53:34 +0000 (Tue, 13 Apr 2010)
Log Message:
-----------
-> add mzanin change to CLRObjects.patch (based on last 1.7 revision on ogre svn)
-> update Mogre_vc9.vcproj to reflect file change in 1.7
Modified Paths:
--------------
trunk/Mogre/Mogre/Mogre_vc9.vcproj
trunk/Mogre/Ogre Patches/CLRObjects.patch
Modified: trunk/Mogre/Mogre/Mogre_vc9.vcproj
===================================================================
--- trunk/Mogre/Mogre/Mogre_vc9.vcproj 2010-04-13 08:46:32 UTC (rev 311)
+++ trunk/Mogre/Mogre/Mogre_vc9.vcproj 2010-04-13 20:53:34 UTC (rev 312)
@@ -314,10 +314,6 @@
>
</File>
<File
- RelativePath=".\src\auto\MogreCompositorSerializer.cpp"
- >
- </File>
- <File
RelativePath=".\src\auto\MogreConfigFile.cpp"
>
</File>
@@ -338,6 +334,14 @@
>
</File>
<File
+ RelativePath=".\src\auto\MogreDefaultHardwareBufferManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreDistanceLodStrategy.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\auto\MogreEdgeListBuilder.cpp"
>
</File>
@@ -386,6 +390,10 @@
>
</File>
<File
+ RelativePath=".\src\auto\MogreGpuProgramParams.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\auto\MogreHardwareBuffer.cpp"
>
</File>
@@ -438,6 +446,18 @@
>
</File>
<File
+ RelativePath=".\src\auto\MogreLodListener.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreLodStrategy.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreLodStrategyManager.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\auto\MogreLog.cpp"
>
</File>
@@ -574,6 +594,10 @@
>
</File>
<File
+ RelativePath=".\src\auto\MogrePixelCountLodStrategy.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\auto\MogrePixelFormat.cpp"
>
</File>
@@ -622,6 +646,10 @@
>
</File>
<File
+ RelativePath=".\src\auto\MogrePVRTCCodec.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\Custom\MogreQuaternion.cpp"
>
</File>
@@ -634,6 +662,10 @@
>
</File>
<File
+ RelativePath=".\src\auto\MogreRenderObjectListener.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\auto\MogreRenderOperation.cpp"
>
</File>
@@ -838,6 +870,10 @@
>
</File>
<File
+ RelativePath=".\src\auto\MogreUserObjectBindings.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\Custom\MogreVector3.cpp"
>
</File>
@@ -1028,10 +1064,6 @@
>
</File>
<File
- RelativePath=".\include\auto\MogreCompositorSerializer.h"
- >
- </File>
- <File
RelativePath=".\include\auto\MogreConfigFile.h"
>
</File>
@@ -1048,6 +1080,14 @@
>
</File>
<File
+ RelativePath=".\include\auto\MogreDefaultHardwareBufferManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreDistanceLodStrategy.h"
+ >
+ </File>
+ <File
RelativePath=".\include\auto\MogreEdgeListBuilder.h"
>
</File>
@@ -1096,6 +1136,10 @@
>
</File>
<File
+ RelativePath=".\include\auto\MogreGpuProgramParams.h"
+ >
+ </File>
+ <File
RelativePath=".\include\auto\MogreHardwareBuffer.h"
>
</File>
@@ -1152,6 +1196,18 @@
>
</File>
<File
+ RelativePath=".\include\auto\MogreLodListener.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreLodStrategy.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreLodStrategyManager.h"
+ >
+ </File>
+ <File
RelativePath=".\include\auto\MogreLog.h"
>
</File>
@@ -1296,11 +1352,11 @@
>
</File>
<File
- RelativePath=".\include\auto\MogrePixelFormat.h"
+ RelativePath=".\include\auto\MogrePixelCountLodStrategy.h"
>
</File>
<File
- RelativePath=".\include\auto\MogrePlane.h"
+ RelativePath=".\include\auto\MogrePixelFormat.h"
>
</File>
<File
@@ -1308,6 +1364,10 @@
>
</File>
<File
+ RelativePath=".\include\auto\MogrePlane.h"
+ >
+ </File>
+ <File
RelativePath=".\include\auto\MogrePlaneBoundedVolume.h"
>
</File>
@@ -1336,6 +1396,10 @@
>
</File>
<File
+ RelativePath=".\include\auto\MogrePVRTCCodec.h"
+ >
+ </File>
+ <File
RelativePath=".\include\Custom\MogreQuaternion.h"
>
</File>
@@ -1360,6 +1424,10 @@
>
</File>
<File
+ RelativePath=".\include\auto\MogreRenderObjectListener.h"
+ >
+ </File>
+ <File
RelativePath=".\include\auto\MogreRenderOperation.h"
>
</File>
@@ -1576,6 +1644,10 @@
>
</File>
<File
+ RelativePath=".\include\auto\MogreUserObjectBindings.h"
+ >
+ </File>
+ <File
RelativePath=".\include\Custom\MogreVector2.h"
>
</File>
Modified: trunk/Mogre/Ogre Patches/CLRObjects.patch
===================================================================
--- trunk/Mogre/Ogre Patches/CLRObjects.patch 2010-04-13 08:46:32 UTC (rev 311)
+++ trunk/Mogre/Ogre Patches/CLRObjects.patch 2010-04-13 20:53:34 UTC (rev 312)
@@ -1,6 +1,20 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt (revision 9952)
++++ CMakeLists.txt (working copy)
+@@ -103,6 +103,9 @@
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /bigobj")
+ endif ()
++ # Enable multicore builds
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
++ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MP")
+ endif ()
+ if (MINGW)
+ add_definitions(-D_WIN32_WINNT=0x0500)
Index: OgreMain/include/OgreAnimable.h
===================================================================
---- OgreMain/include/OgreAnimable.h (revision 9851)
+--- OgreMain/include/OgreAnimable.h (revision 9952)
+++ OgreMain/include/OgreAnimable.h (working copy)
@@ -68,9 +68,11 @@
are often comprised of multiple properties it helps to be able to deal
@@ -17,7 +31,7 @@
{
Index: OgreMain/include/OgreAnimation.h
===================================================================
---- OgreMain/include/OgreAnimation.h (revision 9851)
+--- OgreMain/include/OgreAnimation.h (revision 9952)
+++ OgreMain/include/OgreAnimation.h (working copy)
@@ -55,10 +55,12 @@
You should not create these animations directly. They will be created via a parent
@@ -35,7 +49,7 @@
{
Index: OgreMain/include/OgreAnimationState.h
===================================================================
---- OgreMain/include/OgreAnimationState.h (revision 9851)
+--- OgreMain/include/OgreAnimationState.h (revision 9952)
+++ OgreMain/include/OgreAnimationState.h (working copy)
@@ -49,13 +49,13 @@
Other classes can hold instances of this class to store the state of any animations
@@ -64,7 +78,7 @@
/// Create a blank animation state set
Index: OgreMain/include/OgreAnimationTrack.h
===================================================================
---- OgreMain/include/OgreAnimationTrack.h (revision 9851)
+--- OgreMain/include/OgreAnimationTrack.h (revision 9952)
+++ OgreMain/include/OgreAnimationTrack.h (working copy)
@@ -48,6 +48,9 @@
*/
@@ -117,7 +131,7 @@
{
Index: OgreMain/include/OgreArchive.h
===================================================================
---- OgreMain/include/OgreArchive.h (revision 9851)
+--- OgreMain/include/OgreArchive.h (revision 9952)
+++ OgreMain/include/OgreArchive.h (working copy)
@@ -84,8 +84,11 @@
to benefit from OGRE's automatic searching of multiple file locations
@@ -143,7 +157,7 @@
Archive( const String& name, const String& archType )
Index: OgreMain/include/OgreBillboard.h
===================================================================
---- OgreMain/include/OgreBillboard.h (revision 9851)
+--- OgreMain/include/OgreBillboard.h (revision 9952)
+++ OgreMain/include/OgreBillboard.h (working copy)
@@ -65,6 +65,9 @@
@@ -157,7 +171,7 @@
protected:
Index: OgreMain/include/OgreBillboardChain.h
===================================================================
---- OgreMain/include/OgreBillboardChain.h (revision 9851)
+--- OgreMain/include/OgreBillboardChain.h (revision 9952)
+++ OgreMain/include/OgreBillboardChain.h (working copy)
@@ -77,7 +77,8 @@
{
@@ -181,7 +195,7 @@
public:
Index: OgreMain/include/OgreBillboardParticleRenderer.h
===================================================================
---- OgreMain/include/OgreBillboardParticleRenderer.h (revision 9851)
+--- OgreMain/include/OgreBillboardParticleRenderer.h (revision 9952)
+++ OgreMain/include/OgreBillboardParticleRenderer.h (working copy)
@@ -50,6 +50,9 @@
*/
@@ -195,7 +209,7 @@
BillboardSet* mBillboardSet;
Index: OgreMain/include/OgreBillboardSet.h
===================================================================
---- OgreMain/include/OgreBillboardSet.h (revision 9851)
+--- OgreMain/include/OgreBillboardSet.h (revision 9952)
+++ OgreMain/include/OgreBillboardSet.h (working copy)
@@ -108,6 +108,9 @@
*/
@@ -219,7 +233,7 @@
public:
Index: OgreMain/include/OgreBone.h
===================================================================
---- OgreMain/include/OgreBone.h (revision 9851)
+--- OgreMain/include/OgreBone.h (revision 9952)
+++ OgreMain/include/OgreBone.h (working copy)
@@ -51,6 +51,8 @@
class _OgreExport Bone : public Node
@@ -232,7 +246,7 @@
/** Constructor, not to be used directly (use Bone::createChild or Skeleton::createBone) */
Index: OgreMain/include/OgreBorderPanelOverlayElement.h
===================================================================
---- OgreMain/include/OgreBorderPanelOverlayElement.h (revision 9851)
+--- OgreMain/include/OgreBorderPanelOverlayElement.h (revision 9952)
+++ OgreMain/include/OgreBorderPanelOverlayElement.h (working copy)
@@ -56,6 +56,9 @@
*/
@@ -258,7 +272,7 @@
public:
Index: OgreMain/include/OgreCamera.h
===================================================================
---- OgreMain/include/OgreCamera.h (revision 9851)
+--- OgreMain/include/OgreCamera.h (revision 9952)
+++ OgreMain/include/OgreCamera.h (working copy)
@@ -85,6 +85,8 @@
class _OgreExport Camera : public Frustum
@@ -271,7 +285,7 @@
class _OgreExport Listener
Index: OgreMain/include/OgreCodec.h
===================================================================
---- OgreMain/include/OgreCodec.h (revision 9851)
+--- OgreMain/include/OgreCodec.h (revision 9952)
+++ OgreMain/include/OgreCodec.h (working copy)
@@ -52,8 +52,10 @@
The codec concept is a pretty generic one - you can easily understand
@@ -298,9 +312,42 @@
virtual ~CodecData() {};
/** Returns the type of the data.
+Index: OgreMain/include/OgreCommon.h
+===================================================================
+--- OgreMain/include/OgreCommon.h (revision 9952)
++++ OgreMain/include/OgreCommon.h (working copy)
+@@ -379,7 +379,7 @@
+ {
+ // we have to assume that hash needs recalculating on non-const
+ dirtyHash();
+- return mList.const_iterator(n);
++ return mList.at(n);
+ }
+ const_reference at(size_type n) const { return mList.at(n); }
+ HashedVector() : mListHash(0), mListHashDirty(false) {}
+@@ -490,7 +490,19 @@
+ if (recalc)
+ dirtyHash();
+ }
++
++ void assign(size_type n, const T& u)
++ {
++ mList.assign(n, u);
++ }
+
++ template <class InputIterator>
++ void assign(InputIterator first, InputIterator last)
++ {
++ mList.assign(first, last);
++ }
++
++
+ bool operator==(const HashedVector<T>& b)
+ { return mListHash == b.mListHash; }
+
Index: OgreMain/include/OgreCompositionPass.h
===================================================================
---- OgreMain/include/OgreCompositionPass.h (revision 9851)
+--- OgreMain/include/OgreCompositionPass.h (revision 9952)
+++ OgreMain/include/OgreCompositionPass.h (working copy)
@@ -46,6 +46,8 @@
class _OgreExport CompositionPass : public CompositorInstAlloc
@@ -322,7 +369,7 @@
/// MRT surface index if applicable
Index: OgreMain/include/OgreCompositionTargetPass.h
===================================================================
---- OgreMain/include/OgreCompositionTargetPass.h (revision 9851)
+--- OgreMain/include/OgreCompositionTargetPass.h (revision 9952)
+++ OgreMain/include/OgreCompositionTargetPass.h (working copy)
@@ -44,6 +44,8 @@
class _OgreExport CompositionTargetPass : public CompositorInstAlloc
@@ -335,7 +382,7 @@
Index: OgreMain/include/OgreCompositionTechnique.h
===================================================================
---- OgreMain/include/OgreCompositionTechnique.h (revision 9851)
+--- OgreMain/include/OgreCompositionTechnique.h (revision 9952)
+++ OgreMain/include/OgreCompositionTechnique.h (working copy)
@@ -41,9 +41,11 @@
*/
@@ -352,7 +399,7 @@
Index: OgreMain/include/OgreCompositor.h
===================================================================
---- OgreMain/include/OgreCompositor.h (revision 9851)
+--- OgreMain/include/OgreCompositor.h (revision 9952)
+++ OgreMain/include/OgreCompositor.h (working copy)
@@ -49,6 +49,8 @@
class _OgreExport Compositor: public Resource
@@ -365,7 +412,7 @@
~Compositor();
Index: OgreMain/include/OgreCompositorChain.h
===================================================================
---- OgreMain/include/OgreCompositorChain.h (revision 9851)
+--- OgreMain/include/OgreCompositorChain.h (revision 9952)
+++ OgreMain/include/OgreCompositorChain.h (working copy)
@@ -43,9 +43,11 @@
*/
@@ -382,7 +429,7 @@
to delete an object.
Index: OgreMain/include/OgreCompositorInstance.h
===================================================================
---- OgreMain/include/OgreCompositorInstance.h (revision 9851)
+--- OgreMain/include/OgreCompositorInstance.h (revision 9952)
+++ OgreMain/include/OgreCompositorInstance.h (working copy)
@@ -46,9 +46,11 @@
/** An instance of a Compositor object for one Viewport. It is part of the CompositorChain
@@ -399,7 +446,7 @@
/** Provides an interface to "listen in" to to render system operations executed by this
Index: OgreMain/include/OgreConfig.h
===================================================================
---- OgreMain/include/OgreConfig.h (revision 9851)
+--- OgreMain/include/OgreConfig.h (revision 9952)
+++ OgreMain/include/OgreConfig.h (working copy)
@@ -92,18 +92,6 @@
# define OGRE_MEMORY_ALLOCATOR OGRE_MEMORY_ALLOCATOR_NEDPOOLING
@@ -420,9 +467,35 @@
// 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
+Index: OgreMain/include/OgreDefaultHardwareBufferManager.h
+===================================================================
+--- OgreMain/include/OgreDefaultHardwareBufferManager.h (revision 9952)
++++ OgreMain/include/OgreDefaultHardwareBufferManager.h (working copy)
+@@ -101,6 +101,8 @@
+ */
+ class _OgreExport DefaultHardwareBufferManagerBase : public HardwareBufferManagerBase
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(DefaultHardwareBufferManagerBase);
+ public:
+ DefaultHardwareBufferManagerBase();
+ ~DefaultHardwareBufferManagerBase();
+Index: OgreMain/include/OgreDistanceLodStrategy.h
+===================================================================
+--- OgreMain/include/OgreDistanceLodStrategy.h (revision 9952)
++++ OgreMain/include/OgreDistanceLodStrategy.h (working copy)
+@@ -45,6 +45,8 @@
+ /** Level of detail strategy based on distance from camera. */
+ class _OgreExport DistanceLodStrategy : public LodStrategy, public Singleton<DistanceLodStrategy>
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(DistanceLodStrategy);
+ protected:
+ /// @copydoc LodStrategy::getValueImpl
+ virtual Real getValueImpl(const MovableObject *movableObject, const Camera *camera) const;
Index: OgreMain/include/OgreEdgeListBuilder.h
===================================================================
---- OgreMain/include/OgreEdgeListBuilder.h (revision 9851)
+--- OgreMain/include/OgreEdgeListBuilder.h (revision 9952)
+++ OgreMain/include/OgreEdgeListBuilder.h (working copy)
@@ -51,6 +51,8 @@
class _OgreExport EdgeData : public EdgeDataAlloc
@@ -435,7 +508,7 @@
/** The set of indexes this triangle came from (NB it is possible that the triangles on
Index: OgreMain/include/OgreEntity.h
===================================================================
---- OgreMain/include/OgreEntity.h (revision 9851)
+--- OgreMain/include/OgreEntity.h (revision 9952)
+++ OgreMain/include/OgreEntity.h (working copy)
@@ -80,6 +80,9 @@
*/
@@ -459,7 +532,7 @@
public:
Index: OgreMain/include/OgreException.h
===================================================================
---- OgreMain/include/OgreException.h (revision 9851)
+--- OgreMain/include/OgreException.h (revision 9952)
+++ OgreMain/include/OgreException.h (working copy)
@@ -151,7 +151,7 @@
@@ -485,7 +558,7 @@
Index: OgreMain/include/OgreExternalTextureSource.h
===================================================================
---- OgreMain/include/OgreExternalTextureSource.h (revision 9851)
+--- OgreMain/include/OgreExternalTextureSource.h (revision 9952)
+++ OgreMain/include/OgreExternalTextureSource.h (working copy)
@@ -70,9 +70,11 @@
before calling create defined texture... or it will fail, though, it
@@ -502,7 +575,7 @@
/** Virtual destructor */
Index: OgreMain/include/OgreFileSystem.h
===================================================================
---- OgreMain/include/OgreFileSystem.h (revision 9851)
+--- OgreMain/include/OgreFileSystem.h (revision 9952)
+++ OgreMain/include/OgreFileSystem.h (working copy)
@@ -46,6 +46,9 @@
*/
@@ -516,7 +589,7 @@
@param pattern File pattern
Index: OgreMain/include/OgreFont.h
===================================================================
---- OgreMain/include/OgreFont.h (revision 9851)
+--- OgreMain/include/OgreFont.h (revision 9952)
+++ OgreMain/include/OgreFont.h (working copy)
@@ -66,6 +66,9 @@
*/
@@ -530,7 +603,7 @@
class _OgreExport CmdType : public ParamCommand
Index: OgreMain/include/OgreFrustum.h
===================================================================
---- OgreMain/include/OgreFrustum.h (revision 9851)
+--- OgreMain/include/OgreFrustum.h (revision 9952)
+++ OgreMain/include/OgreFrustum.h (working copy)
@@ -83,6 +83,9 @@
*/
@@ -544,7 +617,7 @@
ProjectionType mProjType;
Index: OgreMain/include/OgreGpuProgram.h
===================================================================
---- OgreMain/include/OgreGpuProgram.h (revision 9851)
+--- OgreMain/include/OgreGpuProgram.h (revision 9952)
+++ OgreMain/include/OgreGpuProgram.h (working copy)
@@ -68,6 +68,9 @@
*/
@@ -558,7 +631,7 @@
class _OgreExport CmdType : public ParamCommand
Index: OgreMain/include/OgreGpuProgramParams.h
===================================================================
---- OgreMain/include/OgreGpuProgramParams.h (revision 9851)
+--- OgreMain/include/OgreGpuProgramParams.h (revision 9952)
+++ OgreMain/include/OgreGpuProgramParams.h (working copy)
@@ -386,6 +386,9 @@
*/
@@ -591,7 +664,7 @@
*/
Index: OgreMain/include/OgreHardwareBuffer.h
===================================================================
---- OgreMain/include/OgreHardwareBuffer.h (revision 9851)
+--- OgreMain/include/OgreHardwareBuffer.h (revision 9952)
+++ OgreMain/include/OgreHardwareBuffer.h (working copy)
@@ -70,10 +70,12 @@
You should look for the 'useShadowBuffer' parameter on the creation methods used to create
@@ -607,9 +680,36 @@
/// Enums describing buffer usage; not mutually exclusive
enum Usage
{
+Index: OgreMain/include/OgreHardwareBufferManager.h
+===================================================================
+--- OgreMain/include/OgreHardwareBufferManager.h (revision 9952)
++++ OgreMain/include/OgreHardwareBufferManager.h (working copy)
+@@ -106,8 +106,11 @@
+ and passes it to the HardwareBufferManager superclass as a delegate.
+ This subclass must also delete the implementation instance it creates.
+ */
+- class _OgreExport HardwareBufferManagerBase : public BufferAlloc
++ class _OgreExport HardwareBufferManagerBase : public BufferAlloc, public CLRObject
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(HardwareBufferManagerBase);
++ private:
+ friend class HardwareVertexBufferSharedPtr;
+ friend class HardwareIndexBufferSharedPtr;
+ protected:
+@@ -383,6 +386,9 @@
+ /** Singleton wrapper for hardware buffer manager. */
+ class _OgreExport HardwareBufferManager : public HardwareBufferManagerBase, public Singleton<HardwareBufferManager>
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(HardwareBufferManager);
++ private:
+ friend class HardwareVertexBufferSharedPtr;
+ friend class HardwareIndexBufferSharedPtr;
+ protected:
Index: OgreMain/include/OgreHardwareIndexBuffer.h
===================================================================
---- OgreMain/include/OgreHardwareIndexBuffer.h (revision 9851)
+--- OgreMain/include/OgreHardwareIndexBuffer.h (revision 9952)
+++ OgreMain/include/OgreHardwareIndexBuffer.h (working copy)
@@ -46,6 +46,8 @@
class _OgreExport HardwareIndexBuffer : public HardwareBuffer
@@ -622,7 +722,7 @@
IT_32BIT
Index: OgreMain/include/OgreHardwareOcclusionQuery.h
===================================================================
---- OgreMain/include/OgreHardwareOcclusionQuery.h (revision 9851)
+--- OgreMain/include/OgreHardwareOcclusionQuery.h (revision 9952)
+++ OgreMain/include/OgreHardwareOcclusionQuery.h (working copy)
@@ -48,12 +48,13 @@
* @author Lee Sandberg
@@ -641,7 +741,7 @@
*/
Index: OgreMain/include/OgreHardwarePixelBuffer.h
===================================================================
---- OgreMain/include/OgreHardwarePixelBuffer.h (revision 9851)
+--- OgreMain/include/OgreHardwarePixelBuffer.h (revision 9952)
+++ OgreMain/include/OgreHardwarePixelBuffer.h (working copy)
@@ -51,6 +51,9 @@
*/
@@ -655,7 +755,7 @@
size_t mWidth, mHeight, mDepth;
Index: OgreMain/include/OgreHardwareVertexBuffer.h
===================================================================
---- OgreMain/include/OgreHardwareVertexBuffer.h (revision 9851)
+--- OgreMain/include/OgreHardwareVertexBuffer.h (revision 9952)
+++ OgreMain/include/OgreHardwareVertexBuffer.h (working copy)
@@ -46,6 +46,9 @@
/** Specialisation of HardwareBuffer for a vertex buffer. */
@@ -695,7 +795,7 @@
protected:
Index: OgreMain/include/OgreHighLevelGpuProgram.h
===================================================================
---- OgreMain/include/OgreHighLevelGpuProgram.h (revision 9851)
+--- OgreMain/include/OgreHighLevelGpuProgram.h (revision 9952)
+++ OgreMain/include/OgreHighLevelGpuProgram.h (working copy)
@@ -62,6 +62,9 @@
*/
@@ -709,7 +809,7 @@
bool mHighLevelLoaded;
Index: OgreMain/include/OgreImage.h
===================================================================
---- OgreMain/include/OgreImage.h (revision 9851)
+--- OgreMain/include/OgreImage.h (revision 9952)
+++ OgreMain/include/OgreImage.h (working copy)
@@ -61,6 +61,8 @@
class _OgreExport Image : public ImageAlloc
@@ -722,7 +822,7 @@
public:
Index: OgreMain/include/OgreImageCodec.h
===================================================================
---- OgreMain/include/OgreImageCodec.h (revision 9851)
+--- OgreMain/include/OgreImageCodec.h (revision 9952)
+++ OgreMain/include/OgreImageCodec.h (working copy)
@@ -47,12 +47,16 @@
class _OgreExport ImageCodec : public Codec
@@ -743,7 +843,7 @@
num_mipmaps(0), flags(0), format(PF_UNKNOWN)
Index: OgreMain/include/OgreInstancedGeometry.h
===================================================================
---- OgreMain/include/OgreInstancedGeometry.h (revision 9851)
+--- OgreMain/include/OgreInstancedGeometry.h (revision 9952)
+++ OgreMain/include/OgreInstancedGeometry.h (working copy)
@@ -101,9 +101,11 @@
@note
@@ -770,7 +870,7 @@
enum TransformSpace
Index: OgreMain/include/OgreKeyFrame.h
===================================================================
---- OgreMain/include/OgreKeyFrame.h (revision 9851)
+--- OgreMain/include/OgreKeyFrame.h (revision 9952)
+++ OgreMain/include/OgreKeyFrame.h (working copy)
@@ -52,9 +52,10 @@
animation sequence, with the exact state of the animation being an
@@ -822,7 +922,7 @@
~VertexPoseKeyFrame() {}
Index: OgreMain/include/OgreLight.h
===================================================================
---- OgreMain/include/OgreLight.h (revision 9851)
+--- OgreMain/include/OgreLight.h (revision 9952)
+++ OgreMain/include/OgreLight.h (working copy)
@@ -72,6 +72,8 @@
class _OgreExport Light : public MovableObject
@@ -843,9 +943,44 @@
protected:
MovableObject* createInstanceImpl( const String& name, const NameValuePairList* params);
public:
+Index: OgreMain/include/OgreLodListener.h
+===================================================================
+--- OgreMain/include/OgreLodListener.h (revision 9952)
++++ OgreMain/include/OgreLodListener.h (working copy)
+@@ -114,10 +114,12 @@
+ also be called. The postqueue method is invoked at an appropriate
+ time after rendering and scene changes may be safely made there.
+ */
+- class _OgreExport LodListener
++ class _OgreExport LodListener : public CLRObject
+ {
+ public:
+-
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(LodListener);
++
++ public:
+ virtual ~LodListener() {}
+
+ /**
+Index: OgreMain/include/OgreLodStrategy.h
+===================================================================
+--- OgreMain/include/OgreLodStrategy.h (revision 9952)
++++ OgreMain/include/OgreLodStrategy.h (working copy)
+@@ -50,8 +50,10 @@
+ getIndex, sort, and isSorted.
+ In addition, transformUserValue may be overridden.
+ */
+- class _OgreExport LodStrategy : public LodAlloc
++ class _OgreExport LodStrategy : public LodAlloc, public CLRObject
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(LodStrategy);
+ protected:
+ /** Name of this strategy. */
+ String mName;
Index: OgreMain/include/OgreLog.h
===================================================================
---- OgreMain/include/OgreLog.h (revision 9851)
+--- OgreMain/include/OgreLog.h (revision 9952)
+++ OgreMain/include/OgreLog.h (working copy)
@@ -91,6 +91,9 @@
*/
@@ -869,7 +1004,7 @@
LogMessageLevel mLevel;
Index: OgreMain/include/OgreManualObject.h
===================================================================
---- OgreMain/include/OgreManualObject.h (revision 9851)
+--- OgreMain/include/OgreManualObject.h (revision 9952)
+++ OgreMain/include/OgreManualObject.h (working copy)
@@ -106,6 +106,8 @@
class _OgreExport ManualObject : public MovableObject
@@ -915,7 +1050,7 @@
public:
Index: OgreMain/include/OgreMaterial.h
===================================================================
---- OgreMain/include/OgreMaterial.h (revision 9851)
+--- OgreMain/include/OgreMaterial.h (revision 9952)
+++ OgreMain/include/OgreMaterial.h (working copy)
@@ -87,6 +87,9 @@
*/
@@ -929,7 +1064,7 @@
Index: OgreMain/include/OgreMesh.h
===================================================================
---- OgreMain/include/OgreMesh.h (revision 9851)
+--- OgreMain/include/OgreMesh.h (revision 9952)
+++ OgreMain/include/OgreMesh.h (working copy)
@@ -90,6 +90,9 @@
@@ -943,7 +1078,7 @@
friend class MeshSerializerImpl_v1_4;
Index: OgreMain/include/OgreMeshSerializer.h
===================================================================
---- OgreMain/include/OgreMeshSerializer.h (revision 9851)
+--- OgreMain/include/OgreMeshSerializer.h (revision 9952)
+++ OgreMain/include/OgreMeshSerializer.h (working copy)
@@ -69,6 +69,8 @@
class _OgreExport MeshSerializer : public Serializer
@@ -956,7 +1091,7 @@
Index: OgreMain/include/OgreMovableObject.h
===================================================================
---- OgreMain/include/OgreMovableObject.h (revision 9851)
+--- OgreMain/include/OgreMovableObject.h (revision 9952)
+++ OgreMain/include/OgreMovableObject.h (working copy)
@@ -59,6 +59,8 @@
class _OgreExport MovableObject : public ShadowCaster, public AnimableObject, public MovableAlloc
@@ -982,7 +1117,7 @@
unsigned long mTypeFlag;
Index: OgreMain/include/OgreMovablePlane.h
===================================================================
---- OgreMain/include/OgreMovablePlane.h (revision 9851)
+--- OgreMain/include/OgreMovablePlane.h (revision 9952)
+++ OgreMain/include/OgreMovablePlane.h (working copy)
@@ -52,6 +52,9 @@
*/
@@ -996,7 +1131,7 @@
mutable Vector3 mLastTranslate;
Index: OgreMain/include/OgreNode.h
===================================================================
---- OgreMain/include/OgreNode.h (revision 9851)
+--- OgreMain/include/OgreNode.h (revision 9952)
+++ OgreMain/include/OgreNode.h (working copy)
@@ -59,9 +59,11 @@
This is an abstract class - concrete classes are based on this for specific purposes,
@@ -1013,7 +1148,7 @@
enum TransformSpace
Index: OgreMain/include/OgreOverlay.h
===================================================================
---- OgreMain/include/OgreOverlay.h (revision 9851)
+--- OgreMain/include/OgreOverlay.h (revision 9952)
+++ OgreMain/include/OgreOverlay.h (working copy)
@@ -67,10 +67,12 @@
don't want the overlay displayed in the smaller viewports. You turn this off for
@@ -1031,7 +1166,7 @@
String mName;
Index: OgreMain/include/OgreOverlayContainer.h
===================================================================
---- OgreMain/include/OgreOverlayContainer.h (revision 9851)
+--- OgreMain/include/OgreOverlayContainer.h (revision 9952)
+++ OgreMain/include/OgreOverlayContainer.h (working copy)
@@ -56,6 +56,8 @@
class _OgreExport OverlayContainer : public OverlayElement
@@ -1044,7 +1179,7 @@
typedef map<String, OverlayContainer*>::type ChildContainerMap;
Index: OgreMain/include/OgreOverlayElement.h
===================================================================
---- OgreMain/include/OgreOverlayElement.h (revision 9851)
+--- OgreMain/include/OgreOverlayElement.h (revision 9952)
+++ OgreMain/include/OgreOverlayElement.h (working copy)
@@ -106,9 +106,10 @@
Because this class is designed to be extensible, it subclasses from StringInterface
@@ -1060,7 +1195,7 @@
// Command object for setting / getting parameters
Index: OgreMain/include/OgreOverlayElementFactory.h
===================================================================
---- OgreMain/include/OgreOverlayElementFactory.h (revision 9851)
+--- OgreMain/include/OgreOverlayElementFactory.h (revision 9952)
+++ OgreMain/include/OgreOverlayElementFactory.h (working copy)
@@ -54,9 +54,11 @@
Each OverlayElementFactory creates a single type of OverlayElement,
@@ -1104,7 +1239,7 @@
{
Index: OgreMain/include/OgrePanelOverlayElement.h
===================================================================
---- OgreMain/include/OgrePanelOverlayElement.h (revision 9851)
+--- OgreMain/include/OgrePanelOverlayElement.h (revision 9952)
+++ OgreMain/include/OgrePanelOverlayElement.h (working copy)
@@ -58,6 +58,8 @@
class _OgreExport PanelOverlayElement : public OverlayContainer
@@ -1117,7 +1252,7 @@
virtual ~PanelOverlayElement();
Index: OgreMain/include/OgreParticle.h
===================================================================
---- OgreMain/include/OgreParticle.h (revision 9851)
+--- OgreMain/include/OgreParticle.h (revision 9952)
+++ OgreMain/include/OgreParticle.h (working copy)
@@ -59,6 +59,9 @@
/** Class representing a single particle instance. */
@@ -1131,7 +1266,7 @@
ParticleSystem* mParentSystem;
Index: OgreMain/include/OgreParticleAffector.h
===================================================================
---- OgreMain/include/OgreParticleAffector.h (revision 9851)
+--- OgreMain/include/OgreParticleAffector.h (revision 9952)
+++ OgreMain/include/OgreParticleAffector.h (working copy)
@@ -60,8 +60,11 @@
with literally infinite combinations of affector and affector types, and parameters within those
@@ -1148,7 +1283,7 @@
String mType;
Index: OgreMain/include/OgreParticleAffectorFactory.h
===================================================================
---- OgreMain/include/OgreParticleAffectorFactory.h (revision 9851)
+--- OgreMain/include/OgreParticleAffectorFactory.h (revision 9952)
+++ OgreMain/include/OgreParticleAffectorFactory.h (working copy)
@@ -51,8 +51,11 @@
a name which identifies them, examples might be 'force_vector', 'attractor', or 'fader', and these can be
@@ -1165,7 +1300,7 @@
public:
Index: OgreMain/include/OgreParticleEmitter.h
===================================================================
---- OgreMain/include/OgreParticleEmitter.h (revision 9851)
+--- OgreMain/include/OgreParticleEmitter.h (revision 9952)
+++ OgreMain/include/OgreParticleEmitter.h (working copy)
@@ -68,8 +68,11 @@
with literally infinite combinations of emitter and affector types, and paramters within those
@@ -1182,7 +1317,7 @@
// Command object for setting / getting parameters
Index: OgreMain/include/OgreParticleEmitterFactory.h
===================================================================
---- OgreMain/include/OgreParticleEmitterFactory.h (revision 9851)
+--- OgreMain/include/OgreParticleEmitterFactory.h (revision 9952)
+++ OgreMain/include/OgreParticleEmitterFactory.h (working copy)
@@ -52,8 +52,11 @@
a name which identifies them, examples might be 'point', 'cone', or 'box', and these can be
@@ -1199,7 +1334,7 @@
public:
Index: OgreMain/include/OgreParticleSystem.h
===================================================================
---- OgreMain/include/OgreParticleSystem.h (revision 9851)
+--- OgreMain/include/OgreParticleSystem.h (revision 9952)
+++ OgreMain/include/OgreParticleSystem.h (working copy)
@@ -66,7 +66,8 @@
class _OgreExport ParticleSystem : public StringInterface, public MovableObject
@@ -1213,7 +1348,7 @@
{
Index: OgreMain/include/OgreParticleSystemManager.h
===================================================================
---- OgreMain/include/OgreParticleSystemManager.h (revision 9851)
+--- OgreMain/include/OgreParticleSystemManager.h (revision 9952)
+++ OgreMain/include/OgreParticleSystemManager.h (working copy)
@@ -385,6 +385,9 @@
/** Factory object for creating ParticleSystem instances */
@@ -1227,7 +1362,7 @@
public:
Index: OgreMain/include/OgreParticleSystemRenderer.h
===================================================================
---- OgreMain/include/OgreParticleSystemRenderer.h (revision 9851)
+--- OgreMain/include/OgreParticleSystemRenderer.h (revision 9952)
+++ OgreMain/include/OgreParticleSystemRenderer.h (working copy)
@@ -46,9 +46,11 @@
/** Abstract class defining the interface required to be implemented
@@ -1244,7 +1379,7 @@
/// Destructor
Index: OgreMain/include/OgrePass.h
===================================================================
---- OgreMain/include/OgrePass.h (revision 9851)
+--- OgreMain/include/OgrePass.h (revision 9952)
+++ OgreMain/include/OgrePass.h (working copy)
@@ -80,6 +80,8 @@
class _OgreExport Pass : public PassAlloc
@@ -1257,7 +1392,7 @@
The hashcode of a Pass is used to sort Passes for rendering, in order
Index: OgreMain/include/OgrePatchMesh.h
===================================================================
---- OgreMain/include/OgrePatchMesh.h (revision 9851)
+--- OgreMain/include/OgrePatchMesh.h (revision 9952)
+++ OgreMain/include/OgrePatchMesh.h (working copy)
@@ -46,6 +46,9 @@
*/
@@ -1271,7 +1406,7 @@
PatchSurface mSurface;
Index: OgreMain/include/OgrePatchSurface.h
===================================================================
---- OgreMain/include/OgrePatchSurface.h (revision 9851)
+--- OgreMain/include/OgrePatchSurface.h (revision 9952)
+++ OgreMain/include/OgrePatchSurface.h (working copy)
@@ -52,6 +52,8 @@
class _OgreExport PatchSurface : public PatchAlloc
@@ -1282,9 +1417,22 @@
PatchSurface();
~PatchSurface();
+Index: OgreMain/include/OgrePixelCountLodStrategy.h
+===================================================================
+--- OgreMain/include/OgrePixelCountLodStrategy.h (revision 9952)
++++ OgreMain/include/OgrePixelCountLodStrategy.h (working copy)
+@@ -45,6 +45,8 @@
+ /** Level of detail strategy based on pixel count approximation from bounding sphere projection. */
+ class _OgreExport PixelCountLodStrategy : public LodStrategy, public Singleton<PixelCountLodStrategy>
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(PixelCountLodStrategy);
+ protected:
+ /// @copydoc LodStrategy::getValueImpl
+ virtual Real getValueImpl(const MovableObject *movableObject, const Camera *camera) const;
Index: OgreMain/include/OgrePlaneBoundedVolume.h
===================================================================
---- OgreMain/include/OgrePlaneBoundedVolume.h (revision 9851)
+--- OgreMain/include/OgrePlaneBoundedVolume.h (revision 9952)
+++ OgreMain/include/OgrePlaneBoundedVolume.h (working copy)
@@ -48,6 +48,8 @@
class _OgreExport PlaneBoundedVolume
@@ -1297,7 +1445,7 @@
PlaneList planes;
Index: OgreMain/include/OgrePose.h
===================================================================
---- OgreMain/include/OgrePose.h (revision 9851)
+--- OgreMain/include/OgrePose.h (revision 9952)
+++ OgreMain/include/OgrePose.h (working copy)
@@ -51,9 +51,11 @@
Pose instances can be referred to by keyframes in VertexAnimationTrack in
@@ -1314,7 +1462,7 @@
dedicated at the submesh index + 1)
Index: OgreMain/include/OgrePrerequisites.h
===================================================================
---- OgreMain/include/OgrePrerequisites.h (revision 9851)
+--- OgreMain/include/OgrePrerequisites.h (revision 9952)
+++ OgreMain/include/OgrePrerequisites.h (working copy)
@@ -315,7 +315,10 @@
#include "OgreStdHeaders.h"
@@ -1327,9 +1475,21 @@
namespace Ogre
{
#if OGRE_STRING_USE_CUSTOM_MEMORY_ALLOCATOR
+@@ -437,9 +440,9 @@
+ #endif
+
+ #if OGRE_WCHAR_T_STRINGS
+- typedef std::basic_stringstream<wchar_t,std::char_traits<wchar_t>,std::allocator<wchar_t> > _StringStreamBase;
++ typedef std::wstringstream _StringStreamBase;
+ #else
+- typedef std::basic_stringstream<char,std::char_traits<char>,std::allocator<char> > _StringStreamBase;
++ typedef std::stringstream _StringStreamBase;
+ #endif
+
+ #endif
Index: OgreMain/include/OgreProgressiveMesh.h
===================================================================
---- OgreMain/include/OgreProgressiveMesh.h (revision 9851)
+--- OgreMain/include/OgreProgressiveMesh.h (revision 9952)
+++ OgreMain/include/OgreProgressiveMesh.h (working copy)
@@ -61,10 +61,11 @@
NB the interface of this class will certainly change when compiled vertex buffers are
@@ -1347,7 +1507,7 @@
{
Index: OgreMain/include/OgreRectangle2D.h
===================================================================
---- OgreMain/include/OgreRectangle2D.h (revision 9851)
+--- OgreMain/include/OgreRectangle2D.h (revision 9952)
+++ OgreMain/include/OgreRectangle2D.h (working copy)
@@ -48,6 +48,9 @@
*/
@@ -1359,9 +1519,26 @@
protected:
/** Override this method to prevent parent transforms (rotation,translation,scale)
*/
+Index: OgreMain/include/OgreRenderObjectListener.h
+===================================================================
+--- OgreMain/include/OgreRenderObjectListener.h (revision 9952)
++++ OgreMain/include/OgreRenderObjectListener.h (working copy)
+@@ -40,9 +40,11 @@
+ /** Abstract interface which classes must implement if they wish to receive
+ events from the scene manager when single object is about to be rendered.
+ */
+- class _OgreExport RenderObjectListener
++ class _OgreExport RenderObjectListener : public CLRObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(RenderObjectListener);
++ public:
+ virtual ~RenderObjectListener() {}
+ /** Event raised when render single object started.
+ @remarks
Index: OgreMain/include/OgreRenderOperation.h
===================================================================
---- OgreMain/include/OgreRenderOperation.h (revision 9851)
+--- OgreMain/include/OgreRenderOperation.h (revision 9952)
+++ OgreMain/include/OgreRenderOperation.h (working copy)
@@ -43,6 +43,8 @@
/** 'New' rendering operation using vertex buffers. */
@@ -1374,7 +1551,7 @@
/// A list of points, 1 vertex per point
Index: OgreMain/include/OgreRenderQueue.h
===================================================================
---- OgreMain/include/OgreRenderQueue.h (revision 9851)
+--- OgreMain/include/OgreRenderQueue.h (revision 9952)
+++ OgreMain/include/OgreRenderQueue.h (working copy)
@@ -89,9 +89,11 @@
backgrounds and overlays, and also could be used in the future for more
@@ -1391,7 +1568,7 @@
typedef MapIterator<RenderQueueGroupMap> QueueGroupIterator;
Index: OgreMain/include/OgreRenderQueueInvocation.h
===================================================================
---- OgreMain/include/OgreRenderQueueInvocation.h (revision 9851)
+--- OgreMain/include/OgreRenderQueueInvocation.h (revision 9952)
+++ OgreMain/include/OgreRenderQueueInvocation.h (working copy)
@@ -63,8 +63,11 @@
them being rendered - for example special-case render queues and
@@ -1421,7 +1598,7 @@
RenderQueueInvocationList mInvocations;
Index: OgreMain/include/OgreRenderQueueSortingGrouping.h
===================================================================
---- OgreMain/include/OgreRenderQueueSortingGrouping.h (revision 9851)
+--- OgreMain/include/OgreRenderQueueSortingGrouping.h (revision 9952)
+++ OgreMain/include/OgreRenderQueueSortingGrouping.h (working copy)
@@ -322,6 +322,9 @@
*/
@@ -1444,7 +1621,7 @@
typedef ConstMapIterator<PriorityMap> ConstPriorityMapIterator;
Index: OgreMain/include/OgreRenderSystem.h
===================================================================
---- OgreMain/include/OgreRenderSystem.h (revision 9851)
+--- OgreMain/include/OgreRenderSystem.h (revision 9952)
+++ OgreMain/include/OgreRenderSystem.h (working copy)
@@ -118,9 +118,11 @@
@version
@@ -1461,7 +1638,7 @@
RenderSystem();
Index: OgreMain/include/OgreRenderSystemCapabilities.h
===================================================================
---- OgreMain/include/OgreRenderSystemCapabilities.h (revision 9851)
+--- OgreMain/include/OgreRenderSystemCapabilities.h (revision 9952)
+++ OgreMain/include/OgreRenderSystemCapabilities.h (working copy)
@@ -235,7 +235,8 @@
{
@@ -1475,7 +1652,7 @@
/// This is used to build a database of RSC's
Index: OgreMain/include/OgreRenderTarget.h
===================================================================
---- OgreMain/include/OgreRenderTarget.h (revision 9851)
+--- OgreMain/include/OgreRenderTarget.h (revision 9952)
+++ OgreMain/include/OgreRenderTarget.h (working copy)
@@ -61,9 +61,11 @@
@version
@@ -1492,7 +1669,7 @@
SF_NONE = 0,
Index: OgreMain/include/OgreRenderTexture.h
===================================================================
---- OgreMain/include/OgreRenderTexture.h (revision 9851)
+--- OgreMain/include/OgreRenderTexture.h (revision 9952)
+++ OgreMain/include/OgreRenderTexture.h (working copy)
@@ -48,6 +48,8 @@
class _OgreExport RenderTexture: public RenderTarget
@@ -1514,7 +1691,7 @@
/** Bind a surface to a certain attachment point.
Index: OgreMain/include/OgreRenderToVertexBuffer.h
===================================================================
---- OgreMain/include/OgreRenderToVertexBuffer.h (revision 9851)
+--- OgreMain/include/OgreRenderToVertexBuffer.h (revision 9952)
+++ OgreMain/include/OgreRenderToVertexBuffer.h (working copy)
@@ -48,9 +48,11 @@
that run on previous results of those shaders, creating stateful
@@ -1531,7 +1708,7 @@
/** D'tor */
Index: OgreMain/include/OgreRenderWindow.h
===================================================================
---- OgreMain/include/OgreRenderWindow.h (revision 9851)
+--- OgreMain/include/OgreRenderWindow.h (revision 9952)
+++ OgreMain/include/OgreRenderWindow.h (working copy)
@@ -63,6 +63,8 @@
{
@@ -1544,7 +1721,7 @@
RenderWindow();
Index: OgreMain/include/OgreResource.h
===================================================================
---- OgreMain/include/OgreResource.h (revision 9851)
+--- OgreMain/include/OgreResource.h (revision 9952)
+++ OgreMain/include/OgreResource.h (working copy)
@@ -74,9 +74,11 @@
through a generic interface.</li>
@@ -1561,7 +1738,7 @@
{
Index: OgreMain/include/OgreResourceBackgroundQueue.h
===================================================================
---- OgreMain/include/OgreResourceBackgroundQueue.h (revision 9851)
+--- OgreMain/include/OgreResourceBackgroundQueue.h (revision 9952)
+++ OgreMain/include/OgreResourceBackgroundQueue.h (working copy)
@@ -49,6 +49,8 @@
/** Encapsulates the result of a background queue request */
@@ -1574,7 +1751,7 @@
/// Any messages from the process
Index: OgreMain/include/OgreRibbonTrail.h
===================================================================
---- OgreMain/include/OgreRibbonTrail.h (revision 9851)
+--- OgreMain/include/OgreRibbonTrail.h (revision 9952)
+++ OgreMain/include/OgreRibbonTrail.h (working copy)
@@ -70,6 +70,8 @@
class _OgreExport RibbonTrail : public BillboardChain, public Node::Listener
@@ -1597,7 +1774,7 @@
public:
Index: OgreMain/include/OgreRotationalSpline.h
===================================================================
---- OgreMain/include/OgreRotationalSpline.h (revision 9851)
+--- OgreMain/include/OgreRotationalSpline.h (revision 9952)
+++ OgreMain/include/OgreRotationalSpline.h (working copy)
@@ -57,6 +57,8 @@
class _OgreExport RotationalSpline
@@ -1610,7 +1787,7 @@
Index: OgreMain/include/OgreSceneManager.h
===================================================================
---- OgreMain/include/OgreSceneManager.h (revision 9851)
+--- OgreMain/include/OgreSceneManager.h (revision 9952)
+++ OgreMain/include/OgreSceneManager.h (working copy)
@@ -136,9 +136,11 @@
dependent on the Camera, which will always call back the SceneManager
@@ -1640,7 +1817,7 @@
mutable bool mMetaDataInit;
Index: OgreMain/include/OgreSceneManagerEnumerator.h
===================================================================
---- OgreMain/include/OgreSceneManagerEnumerator.h (revision 9851)
+--- OgreMain/include/OgreSceneManagerEnumerator.h (revision 9952)
+++ OgreMain/include/OgreSceneManagerEnumerator.h (working copy)
@@ -45,6 +45,9 @@
/// Factory for default scene manager
@@ -1654,7 +1831,7 @@
public:
Index: OgreMain/include/OgreSceneNode.h
===================================================================
---- OgreMain/include/OgreSceneNode.h (revision 9851)
+--- OgreMain/include/OgreSceneNode.h (revision 9952)
+++ OgreMain/include/OgreSceneNode.h (working copy)
@@ -57,6 +57,8 @@
class _OgreExport SceneNode : public Node
@@ -1667,7 +1844,7 @@
typedef ConstMapIterator<ObjectMap> ConstObjectIterator;
Index: OgreMain/include/OgreSceneQuery.h
===================================================================
---- OgreMain/include/OgreSceneQuery.h (revision 9851)
+--- OgreMain/include/OgreSceneQuery.h (revision 9952)
+++ OgreMain/include/OgreSceneQuery.h (working copy)
@@ -70,9 +70,11 @@
using the SceneManager interfaces for the type of query required, e.g.
@@ -1744,7 +1921,7 @@
public:
Index: OgreMain/include/OgreSerializer.h
===================================================================
---- OgreMain/include/OgreSerializer.h (revision 9851)
+--- OgreMain/include/OgreSerializer.h (revision 9952)
+++ OgreMain/include/OgreSerializer.h (working copy)
@@ -46,9 +46,11 @@
This class provides a number of useful methods for exporting / importing data
@@ -1761,7 +1938,7 @@
Index: OgreMain/include/OgreShadowCameraSetup.h
===================================================================
---- OgreMain/include/OgreShadowCameraSetup.h (revision 9851)
+--- OgreMain/include/OgreShadowCameraSetup.h (revision 9952)
+++ OgreMain/include/OgreShadowCameraSetup.h (working copy)
@@ -65,9 +65,11 @@
degrees of freedom. This class is meant to allow custom methods for
@@ -1787,7 +1964,7 @@
/// Destructor
Index: OgreMain/include/OgreShadowCameraSetupFocused.h
===================================================================
---- OgreMain/include/OgreShadowCameraSetupFocused.h (revision 9851)
+--- OgreMain/include/OgreShadowCameraSetupFocused.h (revision 9952)
+++ OgreMain/include/OgreShadowCameraSetupFocused.h (working copy)
@@ -56,6 +56,9 @@
*/
@@ -1801,7 +1978,7 @@
@remarks
Index: OgreMain/include/OgreShadowCameraSetupLiSPSM.h
===================================================================
---- OgreMain/include/OgreShadowCameraSetupLiSPSM.h (revision 9851)
+--- OgreMain/include/OgreShadowCameraSetupLiSPSM.h (revision 9952)
+++ OgreMain/include/OgreShadowCameraSetupLiSPSM.h (working copy)
@@ -97,6 +97,9 @@
*/
@@ -1815,7 +1992,7 @@
Real mOptAdjustFactor;
Index: OgreMain/include/OgreShadowCameraSetupPlaneOptimal.h
===================================================================
---- OgreMain/include/OgreShadowCameraSetupPlaneOptimal.h (revision 9851)
+--- OgreMain/include/OgreShadowCameraSetupPlaneOptimal.h (revision 9952)
+++ OgreMain/include/OgreShadowCameraSetupPlaneOptimal.h (working copy)
@@ -60,6 +60,9 @@
*/
@@ -1829,7 +2006,7 @@
private:
Index: OgreMain/include/OgreShadowCaster.h
===================================================================
---- OgreMain/include/OgreShadowCaster.h (revision 9851)
+--- OgreMain/include/OgreShadowCaster.h (revision 9952)
+++ OgreMain/include/OgreShadowCaster.h (working copy)
@@ -49,8 +49,11 @@
vertex buffers (not necessarily one buffer, but the positions for the entire geometry
@@ -1859,7 +2036,7 @@
virtual bool getCastShadows(void) const = 0;
Index: OgreMain/include/OgreSimpleRenderable.h
===================================================================
---- OgreMain/include/OgreSimpleRenderable.h (revision 9851)
+--- OgreMain/include/OgreSimpleRenderable.h (revision 9952)
+++ OgreMain/include/OgreSimpleRenderable.h (working copy)
@@ -48,6 +48,9 @@
*/
@@ -1873,7 +2050,7 @@
Index: OgreMain/include/OgreSimpleSpline.h
===================================================================
---- OgreMain/include/OgreSimpleSpline.h (revision 9851)
+--- OgreMain/include/OgreSimpleSpline.h (revision 9952)
+++ OgreMain/include/OgreSimpleSpline.h (working copy)
@@ -56,6 +56,8 @@
class _OgreExport SimpleSpline
@@ -1886,7 +2063,7 @@
Index: OgreMain/include/OgreSkeleton.h
===================================================================
---- OgreMain/include/OgreSkeleton.h (revision 9851)
+--- OgreMain/include/OgreSkeleton.h (revision 9952)
+++ OgreMain/include/OgreSkeleton.h (working copy)
@@ -84,6 +84,9 @@
*/
@@ -1900,7 +2077,7 @@
/// Internal constructor for use by SkeletonInstance only
Index: OgreMain/include/OgreSkeletonInstance.h
===================================================================
---- OgreMain/include/OgreSkeletonInstance.h (revision 9851)
+--- OgreMain/include/OgreSkeletonInstance.h (revision 9952)
+++ OgreMain/include/OgreSkeletonInstance.h (working copy)
@@ -52,6 +52,8 @@
class _OgreExport SkeletonInstance : public Skeleton
@@ -1913,7 +2090,7 @@
*/
Index: OgreMain/include/OgreSkeletonSerializer.h
===================================================================
---- OgreMain/include/OgreSkeletonSerializer.h (revision 9851)
+--- OgreMain/include/OgreSkeletonSerializer.h (revision 9952)
+++ OgreMain/include/OgreSkeletonSerializer.h (working copy)
@@ -56,6 +56,8 @@
class _OgreExport SkeletonSerializer : public Serializer
@@ -1926,7 +2103,7 @@
Index: OgreMain/include/OgreStaticGeometry.h
===================================================================
---- OgreMain/include/OgreStaticGeometry.h (revision 9851)
+--- OgreMain/include/OgreStaticGeometry.h (revision 9952)
+++ OgreMain/include/OgreStaticGeometry.h (working copy)
@@ -117,9 +117,11 @@
Warning: this class only works with indexed triangle lists at the moment,
@@ -1974,7 +2151,7 @@
protected:
Index: OgreMain/include/OgreSubEntity.h
===================================================================
---- OgreMain/include/OgreSubEntity.h (revision 9851)
+--- OgreMain/include/OgreSubEntity.h (revision 9952)
+++ OgreMain/include/OgreSubEntity.h (working copy)
@@ -59,8 +59,11 @@
the same time as their parent Entity by the SceneManager method
@@ -1991,7 +2168,7 @@
friend class SceneManager;
Index: OgreMain/include/OgreSubMesh.h
===================================================================
---- OgreMain/include/OgreSubMesh.h (revision 9851)
+--- OgreMain/include/OgreSubMesh.h (revision 9952)
+++ OgreMain/include/OgreSubMesh.h (working copy)
@@ -61,6 +61,9 @@
*/
@@ -2003,9 +2180,19 @@
friend class Mesh;
friend class MeshSerializerImpl;
friend class MeshSerializerImpl_v1_2;
+@@ -131,7 +134,8 @@
+ If this array is empty, submesh sorting is done like in older versions -
+ by comparing the positions of the owning entity.
+ */
+- vector<Vector3>::type extremityPoints;
++ typedef vector<Vector3>::type PointList;
++ PointList extremityPoints;
+
+ /// Reference to parent Mesh (not a smart pointer so child does not keep parent alive).
+ Mesh* parent;
Index: OgreMain/include/OgreTagPoint.h
===================================================================
---- OgreMain/include/OgreTagPoint.h (revision 9851)
+--- OgreMain/include/OgreTagPoint.h (revision 9952)
+++ OgreMain/include/OgreTagPoint.h (working copy)
@@ -61,6 +61,8 @@
{
@@ -2018,7 +2205,7 @@
Index: OgreMain/include/OgreTechnique.h
===================================================================
---- OgreMain/include/OgreTechnique.h (revision 9851)
+--- OgreMain/include/OgreTechnique.h (revision 9952)
+++ OgreMain/include/OgreTechnique.h (working copy)
@@ -52,6 +52,9 @@
*/
@@ -2050,7 +2237,7 @@
bool caseSensitive;
Index: OgreMain/include/OgreTextAreaOverlayElement.h
===================================================================
---- OgreMain/include/OgreTextAreaOverlayElement.h (revision 9851)
+--- OgreMain/include/OgreTextAreaOverlayElement.h (revision 9952)
+++ OgreMain/include/OgreTextAreaOverlayElement.h (working copy)
@@ -43,6 +43,8 @@
class _OgreExport TextAreaOverlayElement : public OverlayElement
@@ -2063,7 +2250,7 @@
Left,
Index: OgreMain/include/OgreTexture.h
===================================================================
---- OgreMain/include/OgreTexture.h (revision 9851)
+--- OgreMain/include/OgreTexture.h (revision 9952)
+++ OgreMain/include/OgreTexture.h (working copy)
@@ -101,6 +101,8 @@
class _OgreExport Texture : public Resource
@@ -2076,7 +2263,7 @@
Index: OgreMain/include/OgreTextureUnitState.h
===================================================================
---- OgreMain/include/OgreTextureUnitState.h (revision 9851)
+--- OgreMain/include/OgreTextureUnitState.h (revision 9952)
+++ OgreMain/include/OgreTextureUnitState.h (working copy)
@@ -62,6 +62,9 @@
{
@@ -2102,7 +2289,7 @@
//-----------------------------------------------------------------------------
Index: OgreMain/include/OgreUnifiedHighLevelGpuProgram.h
===================================================================
---- OgreMain/include/OgreUnifiedHighLevelGpuProgram.h (revision 9851)
+--- OgreMain/include/OgreUnifiedHighLevelGpuProgram.h (revision 9952)
+++ OgreMain/include/OgreUnifiedHighLevelGpuProgram.h (working copy)
@@ -60,6 +60,8 @@
class _OgreExport UnifiedHighLevelGpuProgram : public HighLevelGpuProgram
@@ -2113,9 +2300,26 @@
/// Command object for setting delegate (can set more than once)
class CmdDelegate : public ParamCommand
{
+Index: OgreMain/include/OgreUserObjectBindings.h
+===================================================================
+--- OgreMain/include/OgreUserObjectBindings.h (revision 9952)
++++ OgreMain/include/OgreUserObjectBindings.h (working copy)
+@@ -45,9 +45,11 @@
+ Any instance of Ogre class that will derive from this class could be associated with custom
+ application object using this class interface.
+ */
+- class _OgreExport UserObjectBindings : public GeneralAllocatedObject
++ class _OgreExport UserObjectBindings : public GeneralAllocatedObject, public CLRObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(UserObjectBindings);
++
+ /** Class constructor. */
+ UserObjectBindings();
+
Index: OgreMain/include/OgreVertexIndexData.h
===================================================================
---- OgreMain/include/OgreVertexIndexData.h (revision 9851)
+--- OgreMain/include/OgreVertexIndexData.h (revision 9952)
+++ OgreMain/include/OgreVertexIndexData.h (working copy)
@@ -47,6 +47,9 @@
/** Summary class collecting together vertex source information. */
@@ -2139,7 +2343,7 @@
IndexData(const IndexData& rhs); /* do nothing, should not use */
Index: OgreMain/include/OgreViewport.h
===================================================================
---- OgreMain/include/OgreViewport.h (revision 9851)
+--- OgreMain/include/OgreViewport.h (revision 9952)
+++ OgreMain/include/OgreViewport.h (working copy)
@@ -53,9 +53,11 @@
viewport on a single render target and they overlap, one must
@@ -2157,7 +2361,7 @@
cam Pointer to a camera to be the source for the image.
Index: OgreMain/include/OgreWireBoundingBox.h
===================================================================
---- OgreMain/include/OgreWireBoundingBox.h (revision 9851)
+--- OgreMain/include/OgreWireBoundingBox.h (revision 9952)
+++ OgreMain/include/OgreWireBoundingBox.h (working copy)
@@ -47,6 +47,9 @@
*/
@@ -2171,7 +2375,7 @@
*/
Index: OgreMain/include/OgreZip.h
===================================================================
---- OgreMain/include/OgreZip.h (revision 9851)
+--- OgreMain/include/OgreZip.h (revision 9952)
+++ OgreMain/include/OgreZip.h (working copy)
@@ -53,6 +53,9 @@
*/
@@ -2183,56 +2387,3 @@
protected:
/// Handle to root zip file
ZZIP_DIR* mZzipDir;
-Index: OgreMain/src/OgreException.cpp
-===================================================================
---- OgreMain/src/OgreException.cpp (revision 9851)
-+++ OgreMain/src/OgreException.cpp (working copy)
-@@ -37,12 +37,28 @@
-
- namespace Ogre {
-
-+ //Additions for Mogre
-+ Exception LastExceptionThrown(-1, "", "");
-+
-+ Exception* Exception::getLastException(void) throw()
-+ {
-+ if (LastExceptionThrown.getNumber() == -1)
-+ return 0;
-+ return &LastExceptionThrown;
-+ }
-+
-+ void Exception::clearLastException() throw()
-+ {
-+ LastExceptionThrown = Exception(-1, "", "");
-+ }
-+
- Exception::Exception(int num, const String& desc, const String& src) :
- line( 0 ),
- number( num ),
- description( desc ),
- source( src )
- {
-+ LastExceptionThrown = *this;
- // Log this error - not any more, allow catchers to do it
- //LogManager::getSingleton()...
[truncated message content] |
