mogre-svnmail — Receives SVN commit notifications

[Mogre-svnmail] SF.net SVN: mogre: [69] trunk/MogreNewt/Samples

[<mog...@li...>]

Revision: 69
          http://svn.sourceforge.net/mogre/?rev=69&view=rev
Author:   bekas
Date:     2006-11-12 16:58:15 -0800 (Sun, 12 Nov 2006)

Log Message:
-----------


Modified Paths:
--------------
    trunk/MogreNewt/Samples/Basics/Basics.cs
    trunk/MogreNewt/Samples/Basics/Program.cs
    trunk/MogreNewt/Samples/SimpleVehicle/Program.cs
    trunk/MogreNewt/Samples/SimpleVehicle/SimpleVehicle.cs
    trunk/MogreNewt/Samples/SimpleVehicle/SimpleVehicleApp.cs

Modified: trunk/MogreNewt/Samples/Basics/Basics.cs
===================================================================
--- trunk/MogreNewt/Samples/Basics/Basics.cs	2006-11-13 00:19:35 UTC (rev 68)
+++ trunk/MogreNewt/Samples/Basics/Basics.cs	2006-11-13 00:58:15 UTC (rev 69)
@@ -4,12 +4,12 @@
 using Mogre;
 using MogreNewt;
 
-namespace Demo.Basics
+namespace MogreNewt.Demo.Basics
 {
     // Pressing 'SPACE' shoots a box
     // 'F3' Newton debug lines
 
-    class Basics : Demo.ExampleApplication.Example
+    class Basics : Mogre.Demo.ExampleApplication.Example
     {
         const int NEWTON_FRAMERATE = 60;
 

Modified: trunk/MogreNewt/Samples/Basics/Program.cs
===================================================================
--- trunk/MogreNewt/Samples/Basics/Program.cs	2006-11-13 00:19:35 UTC (rev 68)
+++ trunk/MogreNewt/Samples/Basics/Program.cs	2006-11-13 00:58:15 UTC (rev 69)
@@ -3,7 +3,7 @@
 using System.Text;
 using Mogre;
 
-namespace Demo.Basics
+namespace MogreNewt.Demo.Basics
 {
     class Program
     {
@@ -18,7 +18,7 @@
             {
                 // Check if it's an Ogre Exception
                 if (OgreException.IsThrown)
-                    ExampleApplication.Example.ShowOgreException();
+                    Mogre.Demo.ExampleApplication.Example.ShowOgreException();
                 else
                     throw;
             }

Modified: trunk/MogreNewt/Samples/SimpleVehicle/Program.cs
===================================================================
--- trunk/MogreNewt/Samples/SimpleVehicle/Program.cs	2006-11-13 00:19:35 UTC (rev 68)
+++ trunk/MogreNewt/Samples/SimpleVehicle/Program.cs	2006-11-13 00:58:15 UTC (rev 69)
@@ -3,7 +3,7 @@
 using System.Text;
 using Mogre;
 
-namespace Demo.SimpleVehicle
+namespace MogreNewt.Demo.SimpleVehicle
 {
     class Program
     {
@@ -18,7 +18,7 @@
             {
                 // Check if it's an Ogre Exception
                 if (OgreException.IsThrown)
-                    ExampleApplication.Example.ShowOgreException();
+                    Mogre.Demo.ExampleApplication.Example.ShowOgreException();
                 else
                     throw;
             }

Modified: trunk/MogreNewt/Samples/SimpleVehicle/SimpleVehicle.cs
===================================================================
--- trunk/MogreNewt/Samples/SimpleVehicle/SimpleVehicle.cs	2006-11-13 00:19:35 UTC (rev 68)
+++ trunk/MogreNewt/Samples/SimpleVehicle/SimpleVehicle.cs	2006-11-13 00:58:15 UTC (rev 69)
@@ -4,7 +4,7 @@
 using Mogre;
 using MogreNewt;
 
-namespace Demo.SimpleVehicle
+namespace MogreNewt.Demo.SimpleVehicle
 {
     class SimpleVehicle : Vehicle
     {

Modified: trunk/MogreNewt/Samples/SimpleVehicle/SimpleVehicleApp.cs
===================================================================
--- trunk/MogreNewt/Samples/SimpleVehicle/SimpleVehicleApp.cs	2006-11-13 00:19:35 UTC (rev 68)
+++ trunk/MogreNewt/Samples/SimpleVehicle/SimpleVehicleApp.cs	2006-11-13 00:58:15 UTC (rev 69)
@@ -4,14 +4,14 @@
 using Mogre;
 using MogreNewt;
 
-namespace Demo.SimpleVehicle
+namespace MogreNewt.Demo.SimpleVehicle
 {
     // 'SPACE' throws a 'ball'
     // 'Q' Resets the vehicle
     // 'I','K','J','L' control the vehicle
     // 'F3' Newton debug lines
 
-    class SimpleVehicleApp : Demo.ExampleApplication.Example
+    class SimpleVehicleApp : Mogre.Demo.ExampleApplication.Example
     {
         const int NEWTON_FRAMERATE = 60;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mogre-svnmail] SF.net SVN: mogre: [65] trunk/Mogre

[<mog...@li...>]

Revision: 65
          http://svn.sourceforge.net/mogre/?rev=65&view=rev
Author:   bekas
Date:     2006-11-09 07:12:40 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
FIX] When a null string was passed to an Ogre method, an access violation crash was caused; now a NullReferenceException is thrown instead.

[FIX] PlaneBoundedVolume was sometimes causing a EntryPointNotFoundException, fixed it.

[Modified] Added a check to the implicit conversion of ResourcePtr -> SubClassPtr that checks if the Resource of ResourcePtr is actually of SubClass type, for early catching of programming errors.

Modified Paths:
--------------
    trunk/Mogre/ChangeLog.txt
    trunk/Mogre/Mogre/include/Custom/MogreAxisAlignedBox.h
    trunk/Mogre/Mogre/include/Marshalling.h
    trunk/Mogre/Mogre/include/auto/MogreCompositor.h
    trunk/Mogre/Mogre/include/auto/MogreFont.h
    trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h
    trunk/Mogre/Mogre/include/auto/MogreMaterial.h
    trunk/Mogre/Mogre/include/auto/MogreMesh.h
    trunk/Mogre/Mogre/include/auto/MogreSkeleton.h
    trunk/Mogre/Mogre/include/auto/MogreTexture.h
    trunk/Mogre/Mogre/src/Marshalling.cpp
    trunk/Mogre/ogrenew/OgreMain/include/clrhandle.h
    trunk/Mogre/ogrenew/OgreMain/include/clrobject.h

Modified: trunk/Mogre/ChangeLog.txt
===================================================================
--- trunk/Mogre/ChangeLog.txt	2006-10-30 09:36:22 UTC (rev 64)
+++ trunk/Mogre/ChangeLog.txt	2006-11-09 15:12:40 UTC (rev 65)
@@ -3,8 +3,13 @@
 ------------------------------------------------------------------------
 --[FIX] VertexElement's and Matrix3/4's overrided operator == didn't check for null parameters, fixed it.
 --[FIX] When a method returned a null Ogre::VertexElement*, a null reference exception was thrown; fixed it.
+--[FIX] When a null string was passed to an Ogre method, an access violation crash was caused; now a NullReferenceException
+	is thrown instead.
+--[FIX] PlaneBoundedVolume was sometimes causing a EntryPointNotFoundException, fixed it.
 --[Modified] Removed overrided operator == from all *_NativePtr classes. You must use the 'NativePtr' property directly
 	in order to compare pointers.
+--[Modified] Added a check to the implicit conversion of ResourcePtr -> SubClassPtr that checks if the Resource of ResourcePtr
+	is actually of SubClass type, for early catching of programming errors.
 --[Added] OgreDotNet's CeguiNet bindings, a CeguiNet renderer for Mogre and ported Ogre's Gui sample
 --[Added] MaterialSerializer and CompositorSerializer classes
 --[Added] Overrided operator == (in addition to the Equals method) for wrappers of Ogre classes that override '=='

Modified: trunk/Mogre/Mogre/include/Custom/MogreAxisAlignedBox.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreAxisAlignedBox.h	2006-10-30 09:36:22 UTC (rev 64)
+++ trunk/Mogre/Mogre/include/Custom/MogreAxisAlignedBox.h	2006-11-09 15:12:40 UTC (rev 65)
@@ -462,7 +462,7 @@
 			return Math::Intersects(s, this); 
 		}
 		/** Tests whether this box intersects a plane. */
-		bool intersects(Plane p)
+		bool Intersects(Plane p)
 		{
 			return Math::Intersects(p, this);
 		}

Modified: trunk/Mogre/Mogre/include/Marshalling.h
===================================================================
--- trunk/Mogre/Mogre/include/Marshalling.h	2006-10-30 09:36:22 UTC (rev 64)
+++ trunk/Mogre/Mogre/include/Marshalling.h	2006-11-09 15:12:40 UTC (rev 65)
@@ -11,30 +11,16 @@
 
 	#define CLR_NULL ((Object^)nullptr)
 
-	//If Ogre is compiled with Unicode strings (OGRE_WCHAR_T_STRINGS=1) it will speed up string conversions
-	#if OGRE_WCHAR_T_STRINGS
-		#define DECLARE_OGRE_STRING(nvar,mstr)									\
-			pin_ptr<const wchar_t> p_##nvar = PtrToStringChars(mstr);			\
-			Ogre::String nvar( p_##nvar );
 
-		#define SET_OGRE_STRING(nvar,mstr)										\
-			pin_ptr<const wchar_t> __p_ostr##__COUNTER__ = PtrToStringChars(mstr);	\
-			nvar = __p_ostr##__COUNTER__;
+	#define DECLARE_OGRE_STRING(nvar,mstr)									\
+		Ogre::String nvar;													\
+		InitOgreStringWithCLRString(nvar,mstr);
 
-		#define TO_CLR_STRING(ogrestr) gcnew System::String((ogrestr).c_str())
-	#else
-		#define DECLARE_OGRE_STRING(nvar,mstr)									\
-			IntPtr p_##nvar = Marshal::StringToHGlobalAnsi(mstr);				\
-			Ogre::String nvar( static_cast<char*>(p_##nvar.ToPointer()) );		\
-			Marshal::FreeHGlobal( p_##nvar );
+	#define SET_OGRE_STRING(nvar,mstr)		InitOgreStringWithCLRString(nvar,mstr);
+	#define TO_CLR_STRING(ogrestr)			gcnew System::String((ogrestr).c_str())
 
-		#define SET_OGRE_STRING(nvar,mstr)										\
-			IntPtr __p_ostr##__COUNTER__ = Marshal::StringToHGlobalAnsi(mstr);	\
-			nvar = static_cast<char*>(__p_ostr##__COUNTER__.ToPointer());		\
-			Marshal::FreeHGlobal( __p_ostr##__COUNTER__ );
+	void InitOgreStringWithCLRString(Ogre::String& ostr, System::String^ mstr);
 
-		#define TO_CLR_STRING(ogrestr) gcnew System::String((ogrestr).c_str())
-	#endif
 
 	// Most of Ogre classes that are wrapped by Mogre derive from CLRObject.
 	// It acts as the connection between the .NET objects and the Ogre objects that they wrap.

Modified: trunk/Mogre/Mogre/include/auto/MogreCompositor.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreCompositor.h	2006-10-30 09:36:22 UTC (rev 64)
+++ trunk/Mogre/Mogre/include/auto/MogreCompositor.h	2006-11-09 15:12:40 UTC (rev 65)
@@ -110,6 +110,8 @@
 	
 		static operator CompositorPtr^ ( ResourcePtr^ ptr )
 		{
+			void* castptr = dynamic_cast<Ogre::Compositor*>(ptr->_native);
+			if (castptr == 0) throw gcnew InvalidCastException("The underlying type of the ResourcePtr object is not of type Compositor.");
 			return gcnew CompositorPtr( (Ogre::CompositorPtr) *(ptr->_sharedPtr) );
 		}
 	

Modified: trunk/Mogre/Mogre/include/auto/MogreFont.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreFont.h	2006-10-30 09:36:22 UTC (rev 64)
+++ trunk/Mogre/Mogre/include/auto/MogreFont.h	2006-11-09 15:12:40 UTC (rev 65)
@@ -141,6 +141,8 @@
 	
 		static operator FontPtr^ ( ResourcePtr^ ptr )
 		{
+			void* castptr = dynamic_cast<Ogre::Font*>(ptr->_native);
+			if (castptr == 0) throw gcnew InvalidCastException("The underlying type of the ResourcePtr object is not of type Font.");
 			return gcnew FontPtr( (Ogre::FontPtr) *(ptr->_sharedPtr) );
 		}
 	

Modified: trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h	2006-10-30 09:36:22 UTC (rev 64)
+++ trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h	2006-11-09 15:12:40 UTC (rev 65)
@@ -886,6 +886,8 @@
 	
 		static operator GpuProgramPtr^ ( ResourcePtr^ ptr )
 		{
+			void* castptr = dynamic_cast<Ogre::GpuProgram*>(ptr->_native);
+			if (castptr == 0) throw gcnew InvalidCastException("The underlying type of the ResourcePtr object is not of type GpuProgram.");
 			return gcnew GpuProgramPtr( (Ogre::GpuProgramPtr) *(ptr->_sharedPtr) );
 		}
 	

Modified: trunk/Mogre/Mogre/include/auto/MogreMaterial.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreMaterial.h	2006-10-30 09:36:22 UTC (rev 64)
+++ trunk/Mogre/Mogre/include/auto/MogreMaterial.h	2006-11-09 15:12:40 UTC (rev 65)
@@ -236,6 +236,8 @@
 	
 		static operator MaterialPtr^ ( ResourcePtr^ ptr )
 		{
+			void* castptr = dynamic_cast<Ogre::Material*>(ptr->_native);
+			if (castptr == 0) throw gcnew InvalidCastException("The underlying type of the ResourcePtr object is not of type Material.");
 			return gcnew MaterialPtr( (Ogre::MaterialPtr) *(ptr->_sharedPtr) );
 		}
 	

Modified: trunk/Mogre/Mogre/include/auto/MogreMesh.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreMesh.h	2006-10-30 09:36:22 UTC (rev 64)
+++ trunk/Mogre/Mogre/include/auto/MogreMesh.h	2006-11-09 15:12:40 UTC (rev 65)
@@ -389,6 +389,8 @@
 	
 		static operator MeshPtr^ ( ResourcePtr^ ptr )
 		{
+			void* castptr = dynamic_cast<Ogre::Mesh*>(ptr->_native);
+			if (castptr == 0) throw gcnew InvalidCastException("The underlying type of the ResourcePtr object is not of type Mesh.");
 			return gcnew MeshPtr( (Ogre::MeshPtr) *(ptr->_sharedPtr) );
 		}
 	

Modified: trunk/Mogre/Mogre/include/auto/MogreSkeleton.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreSkeleton.h	2006-10-30 09:36:22 UTC (rev 64)
+++ trunk/Mogre/Mogre/include/auto/MogreSkeleton.h	2006-11-09 15:12:40 UTC (rev 65)
@@ -250,6 +250,8 @@
 	
 		static operator SkeletonPtr^ ( ResourcePtr^ ptr )
 		{
+			void* castptr = dynamic_cast<Ogre::Skeleton*>(ptr->_native);
+			if (castptr == 0) throw gcnew InvalidCastException("The underlying type of the ResourcePtr object is not of type Skeleton.");
 			return gcnew SkeletonPtr( (Ogre::SkeletonPtr) *(ptr->_sharedPtr) );
 		}
 	

Modified: trunk/Mogre/Mogre/include/auto/MogreTexture.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreTexture.h	2006-10-30 09:36:22 UTC (rev 64)
+++ trunk/Mogre/Mogre/include/auto/MogreTexture.h	2006-11-09 15:12:40 UTC (rev 65)
@@ -216,6 +216,8 @@
 	
 		static operator TexturePtr^ ( ResourcePtr^ ptr )
 		{
+			void* castptr = dynamic_cast<Ogre::Texture*>(ptr->_native);
+			if (castptr == 0) throw gcnew InvalidCastException("The underlying type of the ResourcePtr object is not of type Texture.");
 			return gcnew TexturePtr( (Ogre::TexturePtr) *(ptr->_sharedPtr) );
 		}
 	

Modified: trunk/Mogre/Mogre/src/Marshalling.cpp
===================================================================
--- trunk/Mogre/Mogre/src/Marshalling.cpp	2006-10-30 09:36:22 UTC (rev 64)
+++ trunk/Mogre/Mogre/src/Marshalling.cpp	2006-11-09 15:12:40 UTC (rev 65)
@@ -2,6 +2,22 @@
 
 namespace Mogre
 {
+	void InitOgreStringWithCLRString(Ogre::String& ostr, System::String^ mstr)
+	{
+		if (mstr == nullptr)
+			throw gcnew System::NullReferenceException("A null string cannot be converted to an Ogre string.");
+
+		//If Ogre is compiled with Unicode strings (OGRE_WCHAR_T_STRINGS=1) it will speed up string conversions
+		#if OGRE_WCHAR_T_STRINGS
+			pin_ptr<const wchar_t> p_mstr = PtrToStringChars(mstr);
+			ostr = p_mstr;
+		#else
+			IntPtr p_mstr = Marshal::StringToHGlobalAnsi(mstr);
+			ostr = static_cast<char*>(p_mstr.ToPointer());
+			Marshal::FreeHGlobal( p_mstr );
+		#endif
+	}
+
 	void FillMapFromNameValueCollection( std::map<Ogre::String,Ogre::String>& map, Collections::Specialized::NameValueCollection^ col )
 	{
 		int count = col->Count;

Modified: trunk/Mogre/ogrenew/OgreMain/include/clrhandle.h
===================================================================
--- trunk/Mogre/ogrenew/OgreMain/include/clrhandle.h	2006-10-30 09:36:22 UTC (rev 64)
+++ trunk/Mogre/ogrenew/OgreMain/include/clrhandle.h	2006-11-09 15:12:40 UTC (rev 65)
@@ -27,6 +27,11 @@
 	CLRHandle() : _handle(0)
 	{
 	}
+	CLRHandle(const CLRHandle& clrHandle)
+	{
+		// Don't let the GC handle get copied by value, otherwise it may get freed multiple times, leading to crashes.
+		_handle = 0;
+	}
 	~CLRHandle()
 	{
 		if (_handle != 0)

Modified: trunk/Mogre/ogrenew/OgreMain/include/clrobject.h
===================================================================
--- trunk/Mogre/ogrenew/OgreMain/include/clrobject.h	2006-10-30 09:36:22 UTC (rev 64)
+++ trunk/Mogre/ogrenew/OgreMain/include/clrobject.h	2006-11-09 15:12:40 UTC (rev 65)
@@ -48,6 +48,11 @@
 	CLRObject() : _handle(0)
 	{
 	}
+	CLRObject(const CLRObject& clrObject)
+	{
+		// Don't let the GC handle get copied by value, otherwise it may get freed multiple times, leading to crashes.
+		_handle = 0;
+	}
 	virtual ~CLRObject()
 	{
 		if (_handle != 0)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mogre-svnmail] SF.net SVN: mogre: [66] trunk/Mogre/ogrenew/OgreMain/include

[<mog...@li...>]

Revision: 66
          http://svn.sourceforge.net/mogre/?rev=66&view=rev
Author:   bekas
Date:     2006-11-09 07:23:55 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------


Removed Paths:
-------------
    trunk/Mogre/ogrenew/OgreMain/include/.#OgreAnimation.h.1.25
    trunk/Mogre/ogrenew/OgreMain/include/.#OgreAnimationTrack.h.1.23.2.1
    trunk/Mogre/ogrenew/OgreMain/include/.#OgreCompositorChain.h.1.10.2.1
    trunk/Mogre/ogrenew/OgreMain/include/.#OgreCompositorInstance.h.1.6.2.1
    trunk/Mogre/ogrenew/OgreMain/include/.#OgreGpuProgram.h.1.60.2.2
    trunk/Mogre/ogrenew/OgreMain/include/.#OgreKeyFrame.h.1.16.2.1
    trunk/Mogre/ogrenew/OgreMain/include/.#OgreMesh.h.1.62
    trunk/Mogre/ogrenew/OgreMain/include/.#OgreOverlayElement.h.1.8
    trunk/Mogre/ogrenew/OgreMain/include/.#OgrePose.h.1.2
    trunk/Mogre/ogrenew/OgreMain/include/.#OgrePrerequisites.h.1.107.2.4
    trunk/Mogre/ogrenew/OgreMain/include/.#OgreSceneManager.h.1.124.2.5
    trunk/Mogre/ogrenew/OgreMain/include/.#OgreSceneNode.h.1.36.2.1

Deleted: trunk/Mogre/ogrenew/OgreMain/include/.#OgreAnimation.h.1.25
===================================================================
--- trunk/Mogre/ogrenew/OgreMain/include/.#OgreAnimation.h.1.25	2006-11-09 15:12:40 UTC (rev 65)
+++ trunk/Mogre/ogrenew/OgreMain/include/.#OgreAnimation.h.1.25	2006-11-09 15:23:55 UTC (rev 66)
@@ -1,350 +0,0 @@
-/*
------------------------------------------------------------------------------
-This source file is part of OGRE
-    (Object-oriented Graphics Rendering Engine)
-For the latest info, see http://www.ogre3d.org/
-
-Copyright (c) 2000-2005 The OGRE Team
-Also see acknowledgements in Readme.html
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/copyleft/lesser.txt.
------------------------------------------------------------------------------
-*/
-
-#ifndef __Animation_H__
-#define __Animation_H__
-
-#include "OgrePrerequisites.h"
-#include "OgreString.h"
-#include "OgreIteratorWrappers.h"
-#include "OgreAnimable.h"
-#include "OgreAnimationTrack.h"
-
-
-namespace Ogre {
-
-    /** An animation sequence. 
-    @remarks
-        This class defines the interface for a sequence of animation, whether that
-        be animation of a mesh, a path along a spline, or possibly more than one
-        type of animation in one. An animation is made up of many 'tracks', which are
-        the more specific types of animation.
-    @par
-        You should not create these animations directly. They will be created via a parent
-        object which owns the animation, e.g. Skeleton.
-    */
-	class _OgreExport Animation : public CLRObject
-    {
-    public:
-		DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(Animation);
-
-        /** The types of animation interpolation available. */
-        enum InterpolationMode
-        {
-            /** Values are interpolated along straight lines. */
-            IM_LINEAR,
-            /** Values are interpolated along a spline, resulting in smoother changes in direction. */
-            IM_SPLINE
-        };
-
-        /** The types of rotational interpolation available. */
-        enum RotationInterpolationMode
-        {
-            /** Values are interpolated linearly. This is faster but does not 
-                necessarily give a completely accurate result.
-            */
-            RIM_LINEAR,
-            /** Values are interpolated spherically. This is more accurate but
-                has a higher cost.
-            */
-            RIM_SPHERICAL
-        };
-        /** You should not use this constructor directly, use the parent object such as Skeleton instead.
-        @param name The name of the animation, should be unique within it's parent (e.g. Skeleton)
-        @param length The length of the animation in seconds.
-        */
-        Animation(const String& name, Real length);
-        virtual ~Animation();
-
-        /** Gets the name of this animation. */
-        const String& getName(void) const;
-
-        /** Gets the total length of the animation. */
-        Real getLength(void) const;
-
-        /** Creates a NodeAnimationTrack for animating a Node.
-        @param handle Handle to give the track, used for accessing the track later. 
-            Must be unique within this Animation.
-        */
-        NodeAnimationTrack* createNodeTrack(unsigned short handle);
-
-		/** Creates a NumericAnimationTrack for animating any numeric value.
-		@param handle Handle to give the track, used for accessing the track later. 
-		Must be unique within this Animation.
-		*/
-		NumericAnimationTrack* createNumericTrack(unsigned short handle);
-
-		/** Creates a VertexAnimationTrack for animating vertex position data.
-		@param handle Handle to give the track, used for accessing the track later. 
-		Must be unique within this Animation, and is used to identify the target. For example
-		when applied to a Mesh, the handle must reference the index of the geometry being 
-		modified; 0 for the shared geometry, and 1+ for SubMesh geometry with the same index-1.
-		@param animType Either morph or pose animation, 
-		*/
-		VertexAnimationTrack* createVertexTrack(unsigned short handle, VertexAnimationType animType);
-
-		/** Creates a new AnimationTrack automatically associated with a Node. 
-        @remarks
-            This method creates a standard AnimationTrack, but also associates it with a
-            target Node which will receive all keyframe effects.
-        @param handle Numeric handle to give the track, used for accessing the track later. 
-            Must be unique within this Animation.
-        @param node A pointer to the Node object which will be affected by this track
-        */
-        NodeAnimationTrack* createNodeTrack(unsigned short handle, Node* node);
-
-		/** Creates a NumericAnimationTrack and associates it with an animable. 
-		@param handle Handle to give the track, used for accessing the track later. 
-		@param anim Animable object link
-		Must be unique within this Animation.
-		*/
-		NumericAnimationTrack* createNumericTrack(unsigned short handle, 
-			const AnimableValuePtr& anim);
-
-		/** Creates a VertexAnimationTrack and associates it with VertexData. 
-		@param handle Handle to give the track, used for accessing the track later. 
-		@param data VertexData object link
-		@param animType The animation type 
-		Must be unique within this Animation.
-		*/
-		VertexAnimationTrack* createVertexTrack(unsigned short handle, 
-			VertexData* data, VertexAnimationType animType);
-
-		/** Gets the number of NodeAnimationTrack objects contained in this animation. */
-        unsigned short getNumNodeTracks(void) const;
-
-        /** Gets a node track by it's handle. */
-        NodeAnimationTrack* getNodeTrack(unsigned short handle) const;
-
-		/** Does a track exist with the given handle? */
-		bool hasNodeTrack(unsigned short handle) const;
-
-		/** Gets the number of NumericAnimationTrack objects contained in this animation. */
-		unsigned short getNumNumericTracks(void) const;
-
-		/** Gets a numeric track by it's handle. */
-		NumericAnimationTrack* getNumericTrack(unsigned short handle) const;
-
-		/** Does a track exist with the given handle? */
-		bool hasNumericTrack(unsigned short handle) const;
-
-		/** Gets the number of VertexAnimationTrack objects contained in this animation. */
-		unsigned short getNumVertexTracks(void) const;
-
-		/** Gets a Vertex track by it's handle. */
-		VertexAnimationTrack* getVertexTrack(unsigned short handle) const;
-
-		/** Does a track exist with the given handle? */
-		bool hasVertexTrack(unsigned short handle) const;
-		
-		/** Destroys the node track with the given handle. */
-        void destroyNodeTrack(unsigned short handle);
-
-		/** Destroys the numeric track with the given handle. */
-		void destroyNumericTrack(unsigned short handle);
-
-		/** Destroys the Vertex track with the given handle. */
-		void destroyVertexTrack(unsigned short handle);
-
-		/** Removes and destroys all tracks making up this animation. */
-        void destroyAllTracks(void);
-
-		/** Removes and destroys all tracks making up this animation. */
-		void destroyAllNodeTracks(void);
-		/** Removes and destroys all tracks making up this animation. */
-		void destroyAllNumericTracks(void);
-		/** Removes and destroys all tracks making up this animation. */
-		void destroyAllVertexTracks(void);
-
-        /** Applies an animation given a specific time point and weight.
-        @remarks
-            Where you have associated animation tracks with objects, you can eaily apply
-            an animation to those objects by calling this method.
-        @param timePos The time position in the animation to apply.
-        @param weight The influence to give to this track, 1.0 for full influence, less to blend with
-          other animations.
-	    @param scale The scale to apply to translations and scalings, useful for 
-			adapting an animation to a different size target.
-        */
-        void apply(Real timePos, Real weight = 1.0, bool accumulate = false, 
-			Real scale = 1.0f);
-
-        /** Applies all node tracks given a specific time point and weight to a given skeleton.
-        @remarks
-        Where you have associated animation tracks with Node objects, you can eaily apply
-        an animation to those nodes by calling this method.
-        @param timePos The time position in the animation to apply.
-        @param weight The influence to give to this track, 1.0 for full influence, less to blend with
-        other animations.
-	    @param scale The scale to apply to translations and scalings, useful for 
-			adapting an animation to a different size target.
-        */
-        void apply(Skeleton* skeleton, Real timePos, Real weight = 1.0, 
-			bool accumulate = false, Real scale = 1.0f);
-
-		/** Applies all vertex tracks given a specific time point and weight to a given entity.
-		@remarks
-		@param entity The Entity to which this animation should be applied
-		@param timePos The time position in the animation to apply.
-		@param weight The weight at which the animation should be applied 
-			(only affects pose animation)
-		@param software Whether to populate the software morph vertex data
-		@param hardware Whether to populate the hardware morph vertex data
-		*/
-		void apply(Entity* entity, Real timePos, Real weight, bool software, 
-			bool hardware);
-
-        /** Tells the animation how to interpolate between keyframes.
-        @remarks
-            By default, animations normally interpolate linearly between keyframes. This is
-            fast, but when animations include quick changes in direction it can look a little
-            unnatural because directions change instantly at keyframes. An alternative is to
-            tell the animation to interpolate along a spline, which is more expensive in terms
-            of calculation time, but looks smoother because major changes in direction are 
-            distributed around the keyframes rather than just at the keyframe.
-        @par
-            You can also change the default animation behaviour by calling 
-            Animation::setDefaultInterpolationMode.
-        */
-        void setInterpolationMode(InterpolationMode im);
-
-        /** Gets the current interpolation mode of this animation. 
-        @remarks
-            See setInterpolationMode for more info.
-        */
-        InterpolationMode getInterpolationMode(void) const;
-        /** Tells the animation how to interpolate rotations.
-        @remarks
-            By default, animations interpolate lieanrly between rotations. This
-            is fast but not necessarily completely accurate. If you want more 
-            accurate interpolation, use spherical interpolation, but be aware 
-            that it will incur a higher cost.
-        @par
-            You can also change the default rotation behaviour by calling 
-            Animation::setDefaultRotationInterpolationMode.
-        */
-        void setRotationInterpolationMode(RotationInterpolationMode im);
-
-        /** Gets the current rotation interpolation mode of this animation. 
-        @remarks
-            See setRotationInterpolationMode for more info.
-        */
-        RotationInterpolationMode getRotationInterpolationMode(void) const;
-
-        // Methods for setting the defaults
-        /** Sets the default animation interpolation mode. 
-        @remarks
-            Every animation created after this option is set will have the new interpolation
-            mode specified. You can also change the mode per animation by calling the 
-            setInterpolationMode method on the instance in question.
-        */
-        static void setDefaultInterpolationMode(InterpolationMode im);
-
-        /** Gets the default interpolation mode for all animations. */
-        static InterpolationMode getDefaultInterpolationMode(void);
-
-        /** Sets the default rotation interpolation mode. 
-        @remarks
-            Every animation created after this option is set will have the new interpolation
-            mode specified. You can also change the mode per animation by calling the 
-            setInterpolationMode method on the instance in question.
-        */
-        static void setDefaultRotationInterpolationMode(RotationInterpolationMode im);
-
-        /** Gets the default rotation interpolation mode for all animations. */
-        static RotationInterpolationMode getDefaultRotationInterpolationMode(void);
-
-        typedef std::map<unsigned short, NodeAnimationTrack*> NodeTrackList;
-        typedef ConstMapIterator<NodeTrackList> NodeTrackIterator;
-
-		typedef std::map<unsigned short, NumericAnimationTrack*> NumericTrackList;
-		typedef ConstMapIterator<NumericTrackList> NumericTrackIterator;
-
-		typedef std::map<unsigned short, VertexAnimationTrack*> VertexTrackList;
-		typedef ConstMapIterator<VertexTrackList> VertexTrackIterator;
-
-		/// Fast access to NON-UPDATEABLE node track list
-        const NodeTrackList& _getNodeTrackList(void) const;
-
-        /// Get non-updateable iterator over node tracks
-        NodeTrackIterator getNodeTrackIterator(void) const
-        { return NodeTrackIterator(mNodeTrackList.begin(), mNodeTrackList.end()); }
-        
-		/// Fast access to NON-UPDATEABLE numeric track list
-		const NumericTrackList& _getNumericTrackList(void) const;
-
-		/// Get non-updateable iterator over node tracks
-		NumericTrackIterator getNumericTrackIterator(void) const
-		{ return NumericTrackIterator(mNumericTrackList.begin(), mNumericTrackList.end()); }
-
-		/// Fast access to NON-UPDATEABLE Vertex track list
-		const VertexTrackList& _getVertexTrackList(void) const;
-
-		/// Get non-updateable iterator over node tracks
-		VertexTrackIterator getVertexTrackIterator(void) const
-		{ return VertexTrackIterator(mVertexTrackList.begin(), mVertexTrackList.end()); }
-
-		/** Optimise an animation by removing unnecessary tracks and keyframes.
-		@remarks
-			When you export an animation, it is possible that certain tracks
-			have been keyfamed but actually don't include anything useful - the
-			keyframes include no transformation. These tracks can be completely
-			eliminated from the animation and thus speed up the animation. 
-			In addition, if several keyframes in a row have the same value, 
-			then they are just adding overhead and can be removed.
-		*/
-		void optimise(void);
-		
-
-
-    protected:
-        /// Node tracks, indexed by handle
-        NodeTrackList mNodeTrackList;
-		/// Numeric tracks, indexed by handle
-		NumericTrackList mNumericTrackList;
-		/// Vertex tracks, indexed by handle
-		VertexTrackList mVertexTrackList;
-        String mName;
-
-        Real mLength;
-
-        InterpolationMode mInterpolationMode;
-        RotationInterpolationMode mRotationInterpolationMode;
-
-        static InterpolationMode msDefaultInterpolationMode;
-        static RotationInterpolationMode msDefaultRotationInterpolationMode;
-
-		void optimiseNodeTracks(void);
-		void optimiseVertexTracks(void);
-
-        
-    };
-
-
-}
-
-
-#endif
-

Deleted: trunk/Mogre/ogrenew/OgreMain/include/.#OgreAnimationTrack.h.1.23.2.1
===================================================================
--- trunk/Mogre/ogrenew/OgreMain/include/.#OgreAnimationTrack.h.1.23.2.1	2006-11-09 15:12:40 UTC (rev 65)
+++ trunk/Mogre/ogrenew/OgreMain/include/.#OgreAnimationTrack.h.1.23.2.1	2006-11-09 15:23:55 UTC (rev 66)
@@ -1,471 +0,0 @@
-/*
------------------------------------------------------------------------------
-This source file is part of OGRE
-    (Object-oriented Graphics Rendering Engine)
-For the latest info, see http://www.ogre3d.org/
-
-Copyright (c) 2000-2005 The OGRE Team
-Also see acknowledgements in Readme.html
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/copyleft/lesser.txt.
------------------------------------------------------------------------------
-*/
-
-#ifndef __AnimationTrack_H__
-#define __AnimationTrack_H__
-
-#include "OgrePrerequisites.h"
-#include "OgreSimpleSpline.h"
-#include "OgreRotationalSpline.h"
-#include "OgreKeyFrame.h"
-#include "OgreAnimable.h"
-#include "OgrePose.h"
-
-namespace Ogre 
-{
-    /** A 'track' in an animation sequence, ie a sequence of keyframes which affect a
-        certain type of animable object.
-    @remarks
-        This class is intended as a base for more complete classes which will actually
-        animate specific types of object, e.g. a bone in a skeleton to affect
-        skeletal animation. An animation will likely include multiple tracks each of which
-        can be made up of many KeyFrame instances. Note that the use of tracks allows each animable
-        object to have it's own number of keyframes, i.e. you do not have to have the
-        maximum number of keyframes for all animable objects just to cope with the most
-        animated one.
-    @remarks
-        Since the most common animable object is a Node, there are options in this class for associating
-        the track with a Node which will receive keyframe updates automatically when the 'apply' method
-        is called.
-	@remarks
-		By default rotation is done using shortest-path algorithm.
-		It is possible to change this behaviour using
-		setUseShortestRotationPath() method.
-    */
-	class _OgreExport AnimationTrack : public CLRObject
-    {
-    public:
-		DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(AnimationTrack);
-
-        /// Constructor
-        AnimationTrack(Animation* parent, unsigned short handle);
-
-        virtual ~AnimationTrack();
-
-		/** Get the handle associated with this track. */
-		unsigned short getHandle(void) const { return mHandle; }
-
-        /** Returns the number of keyframes in this animation. */
-        virtual unsigned short getNumKeyFrames(void) const;
-
-        /** Returns the KeyFrame at the specified index. */
-        virtual KeyFrame* getKeyFrame(unsigned short index) const;
-
-        /** Gets the 2 KeyFrame objects which are active at the time given, and the blend value between them.
-        @remarks
-            At any point in time  in an animation, there are either 1 or 2 keyframes which are 'active',
-            1 if the time index is exactly on a keyframe, 2 at all other times i.e. the keyframe before
-            and the keyframe after.
-        @par
-            This method returns those keyframes given a time index, and also returns a parametric
-            value indicating the value of 't' representing where the time index falls between them.
-            E.g. if it returns 0, the time index is exactly on keyFrame1, if it returns 0.5 it is
-            half way between keyFrame1 and keyFrame2 etc.
-        @param timePos The time index in seconds.
-        @param keyFrame1 Pointer to a KeyFrame pointer which will receive the pointer to the 
-            keyframe just before or at this time index.
-        @param keyFrame2 Pointer to a KeyFrame pointer which will receive the pointer to the 
-            keyframe just after this time index. 
-        @param firstKeyIndex Pointer to an unsigned short which, if supplied, will receive the 
-            index of the 'from' keyframe incase the caller needs it.
-        @returns Parametric value indicating how far along the gap between the 2 keyframes the timePos
-            value is, e.g. 0.0 for exactly at 1, 0.25 for a quarter etc. By definition the range of this 
-            value is:  0.0 <= returnValue < 1.0 .
-        */
-        virtual Real getKeyFramesAtTime(Real timePos, KeyFrame** keyFrame1, KeyFrame** keyFrame2,
-            unsigned short* firstKeyIndex = 0) const;
-
-        /** Creates a new KeyFrame and adds it to this animation at the given time index.
-        @remarks
-            It is better to create KeyFrames in time order. Creating them out of order can result 
-            in expensive reordering processing. Note that a KeyFrame at time index 0.0 is always created
-            for you, so you don't need to create this one, just access it using getKeyFrame(0);
-        @param timePos The time from which this KeyFrame will apply.
-        */
-        virtual KeyFrame* createKeyFrame(Real timePos);
-
-        /** Removes a KeyFrame by it's index. */
-        virtual void removeKeyFrame(unsigned short index);
-
-        /** Removes all the KeyFrames from this track. */
-        virtual void removeAllKeyFrames(void);
-
-
-        /** Gets a KeyFrame object which contains the interpolated transforms at the time index specified.
-        @remarks
-            The KeyFrame objects held by this class are transformation snapshots at 
-            discrete points in time. Normally however, you want to interpolate between these
-            keyframes to produce smooth movement, and this method allows you to do this easily.
-            In animation terminology this is called 'tweening'. 
-        @param timeIndex The time (in relation to the whole animation sequence)
-        @param kf Keyframe object to store results
-        */
-        virtual void getInterpolatedKeyFrame(Real timeIndex, KeyFrame* kf) const = 0;
-
-        /** Applies an animation track to the designated target.
-        @param timePos The time position in the animation to apply.
-        @param weight The influence to give to this track, 1.0 for full influence, less to blend with
-          other animations.
-		@param acculumate Don't make weights relative to overall weights applied, 
-			make them absolute and just add.
-	    @param scale The scale to apply to translations and scalings, useful for 
-			adapting an animation to a different size target.
-        */
-        virtual void apply(Real timePos, Real weight = 1.0, bool accumulate = false, 
-			Real scale = 1.0f) = 0;
-
-        /** Internal method used to tell the track that keyframe data has been 
-            changed, which may cause it to rebuild some internal data. */
-		virtual void _keyFrameDataChanged(void) const {}
-
-		/** Method to determine if this track has any KeyFrames which are
-		doing anything useful - can be used to determine if this track
-		can be optimised out.
-		*/
-		virtual bool hasNonZeroKeyFrames(void) const { return true; }
-
-		/** Optimise the current track by removing any duplicate keyframes. */
-		virtual void optimise(void) {}
-
-    protected:
-        typedef std::vector<KeyFrame*> KeyFrameList;
-        KeyFrameList mKeyFrames;
-        Animation* mParent;
-		unsigned short mHandle;
-
-		/// Create a keyframe implementation - must be overridden
-		virtual KeyFrame* createKeyFrameImpl(Real time) = 0;
-
-
-    };
-
-	/** Specialised AnimationTrack for dealing with generic animable values.
-	*/
-	class _OgreExport NumericAnimationTrack : public AnimationTrack
-	{
-	public:
-		DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(NumericAnimationTrack);
-
-		/// Constructor
-		NumericAnimationTrack(Animation* parent, unsigned short handle);
-		/// Constructor, associates with an AnimableValue
-		NumericAnimationTrack(Animation* parent, unsigned short handle, 
-			AnimableValuePtr& target);
-
-        /** Creates a new KeyFrame and adds it to this animation at the given time index.
-        @remarks
-            It is better to create KeyFrames in time order. Creating them out of order can result 
-            in expensive reordering processing. Note that a KeyFrame at time index 0.0 is always created
-            for you, so you don't need to create this one, just access it using getKeyFrame(0);
-        @param timePos The time from which this KeyFrame will apply.
-        */
-        virtual NumericKeyFrame* createNumericKeyFrame(Real timePos);
-
-		/// @copydoc AnimationTrack::getInterpolatedKeyFrame
-		void getInterpolatedKeyFrame(Real timeIndex, KeyFrame* kf) const;
-
-		/// @copydoc AnimationTrack::apply
-		void apply(Real timePos, Real weight = 1.0, bool accumulate = false, 
-			Real scale = 1.0f);
-
-        /** Applies an animation track to a given animable value.
-		@param anim The AnimableValue to which to apply the animation
-        @param timePos The time position in the animation to apply.
-        @param weight The influence to give to this track, 1.0 for full influence, less to blend with
-          other animations.
-	    @param scale The scale to apply to translations and scalings, useful for 
-			adapting an animation to a different size target.
-        */
-		void applyToAnimable(const AnimableValuePtr& anim, Real timePos, 
-			Real weight = 1.0, Real scale = 1.0f);
-
-		/** Returns a pointer to the associated animable object (if any). */
-		virtual const AnimableValuePtr& getAssociatedAnimable(void) const;
-
-		/** Sets the associated animable object which will be automatically 
-			affected by calls to 'apply'. */
-		virtual void setAssociatedAnimable(const AnimableValuePtr& val);
-
-		/** Returns the KeyFrame at the specified index. */
-		NumericKeyFrame* getNumericKeyFrame(unsigned short index) const;
-
-
-	protected:
-		/// Target to animate
-		AnimableValuePtr mTargetAnim;
-
-		/// @copydoc AnimationTrack::createKeyFrameImpl
-		KeyFrame* createKeyFrameImpl(Real time);
-
-
-	};
-
-	/** Specialised AnimationTrack for dealing with node transforms.
-	*/
-	class _OgreExport NodeAnimationTrack : public AnimationTrack
-	{
-	public:
-		DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(NodeAnimationTrack);
-
-		/// Constructor
-		NodeAnimationTrack(Animation* parent, unsigned short handle);
-		/// Constructor, associates with a Node
-		NodeAnimationTrack(Animation* parent, unsigned short handle, 
-			Node* targetNode);
-        /** Creates a new KeyFrame and adds it to this animation at the given time index.
-        @remarks
-            It is better to create KeyFrames in time order. Creating them out of order can result 
-            in expensive reordering processing. Note that a KeyFrame at time index 0.0 is always created
-            for you, so you don't need to create this one, just access it using getKeyFrame(0);
-        @param timePos The time from which this KeyFrame will apply.
-        */
-        virtual TransformKeyFrame* createNodeKeyFrame(Real timePos);
-		/** Returns a pointer to the associated Node object (if any). */
-		virtual Node* getAssociatedNode(void) const;
-
-		/** Sets the associated Node object which will be automatically affected by calls to 'apply'. */
-		virtual void setAssociatedNode(Node* node);
-
-		/** As the 'apply' method but applies to a specified Node instead of associated node. */
-		virtual void applyToNode(Node* node, Real timePos, Real weight = 1.0, 
-			bool accumulate = false, Real scale = 1.0f);
-
-		/** Sets the method of rotation calculation */
-		virtual void setUseShortestRotationPath(bool useShortestPath);
-
-		/** Gets the method of rotation calculation */
-		virtual bool getUseShortestRotationPath() const;
-
-		/// @copydoc AnimationTrack::getInterpolatedKeyFrame
-		void getInterpolatedKeyFrame(Real timeIndex, KeyFrame* kf) const;
-
-		/// @copydoc AnimationTrack::apply
-		void apply(Real timePos, Real weight = 1.0, bool accumulate = false, 
-			Real scale = 1.0f);
-
-		/// @copydoc AnimationTrack::_keyFrameDataChanged
-		void _keyFrameDataChanged(void) const;
-
-		/** Returns the KeyFrame at the specified index. */
-		virtual TransformKeyFrame* getNodeKeyFrame(unsigned short index) const;
-
-
-		/** Method to determine if this track has any KeyFrames which are
-			doing anything useful - can be used to determine if this track
-			can be optimised out.
-		*/
-		virtual bool hasNonZeroKeyFrames(void) const;
-
-		/** Optimise the current track by removing any duplicate keyframes. */
-		virtual void optimise(void);
-
-	protected:
-		/// Specialised keyframe creation
-		KeyFrame* createKeyFrameImpl(Real time);
-		// Flag indicating we need to rebuild the splines next time
-		virtual void buildInterpolationSplines(void) const;
-
-		Node* mTargetNode;
-		// Prebuilt splines, must be mutable since lazy-update in const method
-		mutable bool mSplineBuildNeeded;
-		mutable SimpleSpline mPositionSpline;
-		mutable SimpleSpline mScaleSpline;
-		mutable RotationalSpline mRotationSpline;
-		/// Defines if rotation is done using shortest path
-		mutable bool mUseShortestRotationPath ;
-
-
-	};
-
-	/** Type of vertex animation.
-		Vertex animation comes in 2 types, morph and pose. The reason
-		for the 2 types is that we have 2 different potential goals - to encapsulate
-		a complete, flowing morph animation with multiple keyframes (a typical animation,
-		but implemented by having snapshots of the vertex data at each keyframe), 
-		or to represent a single pose change, for example a facial expression. 
-		Whilst both could in fact be implemented using the same system, we choose
-		to separate them since the requirements and limitations of each are quite
-		different.
-	@par
-		Morph animation is a simple approach where we have a whole series of 
-		snapshots of vertex data which must be interpolated, e.g. a running 
-		animation implemented as morph targets. Because this is based on simple
-		snapshots, it's quite fast to use when animating an entire mesh because 
-		it's a simple linear change between keyframes. However, this simplistic 
-		approach does not support blending between multiple morph animations. 
-		If you need animation blending, you are advised to use skeletal animation
-		for full-mesh animation, and pose animation for animation of subsets of 
-		meshes or where skeletal animation doesn't fit - for example facial animation.
-		For animating in a vertex shader, morph animation is quite simple and 
-		just requires the 2 vertex buffers (one the original position buffer) 
-		of absolute position data, and an interpolation factor. Each track in 
-		a morph animation refrences a unique set of vertex data.
-	@par
-		Pose animation is more complex. Like morph animation each track references
-		a single unique set of vertex data, but unlike morph animation, each 
-		keyframe references 1 or more 'poses', each with an influence level. 
-		A pose is a series of offsets to the base vertex data, and may be sparse - ie it
-		may not reference every vertex. Because they're offsets, they can be 
-		blended - both within a track and between animations. This set of features
-		is very well suited to facial animation.
-	@par
-		For example, let's say you modelled a face (one set of vertex data), and 
-		defined a set of poses which represented the various phonetic positions 
-		of the face. You could then define an animation called 'SayHello', containing
-		a single track which referenced the face vertex data, and which included 
-		a series of keyframes, each of which referenced one or more of the facial 
-		positions at different influence levels - the combination of which over
-		time made the face form the shapes required to say the word 'hello'. Since
-		the poses are only stored once, but can be referenced may times in 
-		many animations, this is a very powerful way to build up a speech system.
-	@par
-		The downside of pose animation is that it can be more difficult to set up.
-		Also, since it uses more buffers (one for the base data, and one for each
-		active pose), if you're animating in hardware using vertex shaders you need
-		to keep an eye on how many poses you're blending at once. You define a
-		maximum supported number in your vertex program definition, see the 
-		includes_pose_animation material script entry. 
-	@par
-		So, by partitioning the vertex animation approaches into 2, we keep the
-		simple morph technique easy to use, whilst still allowing all 
-		the powerful techniques to be used. Note that morph animation cannot
-		be blended with other types of vertex animation (pose animation or other
-		morph animation); pose animation can be blended with other pose animation
-		though, and both types can be combined with skeletal animation. Also note
-		that all morph animation can be expressed as pose animation, but not vice
-		versa.
-	*/
-	enum VertexAnimationType
-	{
-		/// No animation
-		VAT_NONE = 0,
-		/// Morph animation is made up of many interpolated snapshot keyframes
-		VAT_MORPH = 1,
-		/// Pose animation is made up of a single delta pose keyframe
-		VAT_POSE = 2
-	};
-
-	/** Specialised AnimationTrack for dealing with changing vertex position information.
-	@see VertexAnimationType
-	*/
-	class _OgreExport VertexAnimationTrack : public AnimationTrack
-	{
-	public:
-		DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(VertexAnimationTrack);
-
-		/** The target animation mode */
-		enum TargetMode
-		{
-			/// Interpolate vertex positions in software
-			TM_SOFTWARE, 
-			/** Bind keyframe 1 to position, and keyframe 2 to a texture coordinate
-				for interpolation in hardware */
-			TM_HARDWARE
-		};
-		/// Constructor
-		VertexAnimationTrack(Animation* parent, unsigned short handle, VertexAnimationType animType);
-		/// Constructor, associates with target VertexData and temp buffer (for software)
-		VertexAnimationTrack(Animation* parent, unsigned short handle, VertexAnimationType animType, 
-			VertexData* targetData, TargetMode target = TM_SOFTWARE);
-
-		/** Get the type of vertex animation we're performing. */
-		VertexAnimationType getAnimationType(void) const { return mAnimationType; }
-
-		/** Creates a new morph KeyFrame and adds it to this animation at the given time index.
-		@remarks
-		It is better to create KeyFrames in time order. Creating them out of order can result 
-		in expensive reordering processing. Note that a KeyFrame at time index 0.0 is always created
-		for you, so you don't need to create this one, just access it using getKeyFrame(0);
-		@param timePos The time from which this KeyFrame will apply.
-		*/
-		virtual VertexMorphKeyFrame* createVertexMorphKeyFrame(Real timePos);
-
-		/** Creates the single pose KeyFrame and adds it to this animation.
-		*/
-		virtual VertexPoseKeyFrame* createVertexPoseKeyFrame(Real timePos);
-
-		/** This method in fact does nothing, since interpolation is not performed
-			inside the keyframes for this type of track. 
-		*/
-		void getInterpolatedKeyFrame(Real timeIndex, KeyFrame* kf) const {}
-
-		/// @copydoc AnimationTrack::apply
-		void apply(Real timePos, Real weight = 1.0, bool accumulate = false, 
-			Real scale = 1.0f);
-
-		/** As the 'apply' method but applies to specified VertexData instead of 
-			associated data. */
-		virtual void applyToVertexData(VertexData* data, 
-			Real timePos, Real weight = 1.0, 
-			const PoseList* poseList = 0);
-
-
-		/** Returns the morph KeyFrame at the specified index. */
-		VertexMorphKeyFrame* getVertexMorphKeyFrame(unsigned short index) const;
-
-		/** Returns the pose KeyFrame at the specified index. */
-		VertexPoseKeyFrame* getVertexPoseKeyFrame(unsigned short index) const;
-
-		/** Sets the associated VertexData which this track will update. */
-		void setAssociatedVertexData(VertexData* data) { mTargetVertexData = data; }
-		/** Gets the associated VertexData which this track will update. */
-		VertexData* getAssociatedVertexData(void) const { return mTargetVertexData; }
-
-		/// Set the target mode
-		void setTargetMode(TargetMode m) { mTargetMode = m; }
-		/// Get the target mode
-		TargetMode getTargetMode(void) const { return mTargetMode; }
-
-		/** Method to determine if this track has any KeyFrames which are
-		doing anything useful - can be used to determine if this track
-		can be optimised out.
-		*/
-		virtual bool hasNonZeroKeyFrames(void) const;
-
-		/** Optimise the current track by removing any duplicate keyframes. */
-		virtual void optimise(void);
-
-
-	protected:
-		/// Animation type
-		VertexAnimationType mAnimationType;
-		/// Target to animate
-		VertexData* mTargetVertexData;
-		/// Mode to apply
-		TargetMode mTargetMode;
-
-		/// @copydoc AnimationTrack::createKeyFrameImpl
-		KeyFrame* createKeyFrameImpl(Real time);
-
-		/// Utility method for applying pose animation
-		void applyPoseToVertexData(const Pose* pose, VertexData* data, Real influence);
-
-
-	};
-
-
-}
-
-#endif

Deleted: trunk/Mogre/ogrenew/OgreMain/include/.#OgreCompositorChain.h.1.10.2.1
===================================================================
--- trunk/Mogre/ogrenew/OgreMain/include/.#OgreCompositorChain.h.1.10.2.1	2006-11-09 15:12:40 UTC (rev 65)
+++ trunk/Mogre/ogrenew/OgreMain/include/.#OgreCompositorChain.h.1.10.2.1	2006-11-09 15:23:55 UTC (rev 66)
@@ -1,194 +0,0 @@
-/*
------------------------------------------------------------------------------
-This source file is part of OGRE
-    (Object-oriented Graphics Rendering Engine)
-For the latest info, see http://www.ogre3d.org/
-
-Copyright (c) 2000-2005 The OGRE Team
-Also see acknowledgements in Readme.html
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/copyleft/lesser.txt.
------------------------------------------------------------------------------
-*/
-#ifndef __CompositorChain_H__
-#define __CompositorChain_H__
-
-#include "OgrePrerequisites.h"
-#include "OgreRenderTargetListener.h"
-#include "OgreRenderQueueListener.h"
-#include "OgreCompositorInstance.h"
-#include "OgreCompositor.h"
-namespace Ogre {
-    
-    /** Chain of compositor effects applying to one viewport.
-     */
-    class _OgreExport CompositorChain: public RenderTargetListener, public CLRObject
-    {
-    public:
-		DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(CompositorChain);
-
-        CompositorChain(Viewport *vp);
-        /** Another gcc warning here, which is no problem because RenderTargetListener is never used
-            to delete an object.
-            warning: `class Ogre::CompositorChain' has virtual functions but non-virtual destructor
-        */
-        virtual ~CompositorChain();
-        
-        /// Data types
-        typedef std::vector<CompositorInstance*> Instances;
-        typedef VectorIterator<Instances> InstanceIterator;
-        
-        /// Identifier for "last" compositor in chain
-        static const size_t LAST = (size_t)-1;
-        /// Identifier for best technique
-        static const size_t BEST = 0;
-        
-        /** Apply a compositor. Initially, the filter is enabled.
-        @param filter     Filter to apply
-        @param addPosition    Position in filter chain to insert this filter at; defaults to the end (last applied filter)
-        @param technique      Technique to use; CompositorChain::BEST (default) chooses to the best one 
-                            available (first technique supported)
-        */
-        CompositorInstance* addCompositor(CompositorPtr filter, size_t addPosition=LAST, size_t technique=BEST);
-    
-        /** Remove a compositor.
-        @param position    Position in filter chain of filter to remove; defaults to the end (last applied filter)
-        */
-        void removeCompositor(size_t position=LAST);
-        
-        /** Get the number of compositors.
-        */
-        size_t getNumCompositors();
-        
-        /** Remove all compositors.
-        */
-        void removeAllCompositors();
-        
-        /** Get compositor instance by position.
-         */
-        CompositorInstance *getCompositor(size_t index);
-
-		/** Get the original scene compositor instance for this chain (internal use). 
-		*/
-		CompositorInstance* _getOriginalSceneCompositor(void) { return mOriginalScene; }
-    
-        /** Get an iterator over the compositor instances. The first compositor in this list is applied first, the last one is applied last.
-        */
-        InstanceIterator getCompositors();
-    
-        /** Enable or disable a compositor, by position. Disabling a compositor stops it from rendering
-            but does not free any resources. This can be more efficient than using removeCompositor and 
-			addCompositor in cases the filter is switched on and off a lot.
-        @param position    Position in filter chain of filter
-        */
-        void setCompositorEnabled(size_t position, bool state);
-    
-        /** @see RenderTargetListener::preRenderTargetUpdate */
-		virtual void preRenderTargetUpdate(const RenderTargetEvent& evt);
-		/** @see RenderTargetListener::preViewportUpdate */
-        virtual void preViewportUpdate(const RenderTargetViewportEvent& evt);
-        /** @see RenderTargetListener::postViewportUpdate */
-        virtual void postViewportUpdate(const RenderTargetViewportEvent& evt);
-		/** @see RenderTargetListener::viewportRemoved */
-		virtual void viewportRemoved(const RenderTargetViewportEvent& evt);
-        
-        /** Mark state as dirty, and to be recompiled next frame.
-         */
-        void _markDirty();
-        
-        /** Get viewport that is the target of this chain
-         */
-        Viewport *getViewport();
-
-		/** Remove a compositor by pointer. This is internally used by CompositionTechnique to
-			"weak" remove any instanced of a deleted technique.
-        */
-        void _removeInstance(CompositorInstance *i);
-    protected:    
-        /// Viewport affected by this CompositorChain
-        Viewport *mViewport;
-        
-        /** Plainly renders the scene; implicit first compositor in the chain.
-        */
-        CompositorInstance *mOriginalScene;
-        
-        /// Postfilter instances in this chain
-        Instances mInstances;
-        
-        /// State needs recompile
-        bool mDirty;
-		/// Any compositors enabled?
-		bool mAnyCompositorsEnabled;
-
-        /// Compiled state (updated with _compile)
-        CompositorInstance::CompiledState mCompiledState;
-        CompositorInstance::TargetOperation mOutputOperation;
-        
-        /** Compile this Composition chain into a series of RenderTarget operations.
-        */
-        void _compile();
-        
-        /** Prepare a viewport, the camera and the scene for a rendering operation
-         */
-        void preTargetOperation(CompositorInstance::TargetOperation &op, Viewport *vp, Camera *cam);
-        
-        /** Restore a viewport, the camera and the scene after a rendering operation
-         */
-        void postTargetOperation(CompositorInstance::TargetOperation &op, Viewport *vp, Camera *cam);
-
-		/// destroy internal resources
-		void destroyResources(void);
-
-		/** Render queue listener used to set up rendering events. */
-		class RQListener: public RenderQueueListener
-		{
-		public:
-			/** @copydoc RenderQueueListener::renderQueueStarted
-			*/
-			virtual void renderQueueStarted(uint8 id, const String& invocation, bool& skipThisQueue);
-			/** @copydoc RenderQueueListener::renderQueueEnded
-			*/
-			virtual void renderQueueEnded(uint8 id, const String& invocation, bool& repeatThisQueue);
-
-			/** Set current operation and target */
-			void setOperation(CompositorInstance::TargetOperation *op,SceneManager *sm,RenderSystem *rs);
-
-			/** Notify current destination viewport  */
-			void notifyViewport(Viewport* vp) { mViewport = vp; }
-
-			/** Flush remaining render system operations */
-			void flushUpTo(uint8 id);
-		private:
-			CompositorInstance::TargetOperation *mOperation;
-			SceneManager *mSceneManager;
-			RenderSystem *mRenderSystem;
-			Viewport* mViewport;
-			CompositorInstance::RenderSystemOpPairs::iterator currentOp, lastOp;
-		};
-		RQListener mOurListener;
-		/// Old viewport settings
-		unsigned int mOldClearEveryFrameBuffers;
-		/// Store old scene visibility mask
-		uint32 mOldVisibilityMask;
-		/// Store old find visible objects
-		bool mOldFindVisibleObjects;
-        /// Store old camera LOD bias      
-        float mOldLodBias;     
-		///	Store old viewport material scheme
-		String mOldMaterialScheme;
-    };
-}
-
-#endif

Deleted: trunk/Mogre/ogrenew/OgreMain/include/.#OgreCompositorInstance.h.1.6.2.1
===================================================================
--- trunk/Mogre/ogrenew/OgreMain/include/.#OgreCompositorInstance.h.1.6.2.1	2006-11-09 15:12:40 UTC (rev 65)
+++ trunk/Mogre/ogrenew/OgreMain/include/.#OgreCompositorInstance.h.1.6.2.1	2006-11-09 15:23:55 UTC (rev 66)
@@ -1,274 +0,0 @@
-/*
------------------------------------------------------------------------------
-This source file is part of OGRE
-    (Object-oriented Graphics Rendering Engine)
-For the latest info, see http://www.ogre3d.org/
-
-Copyright (c) 2000-2005 The OGRE Team
-Also see acknowledgements in Readme.html
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/copyleft/lesser.txt.
------------------------------------------------------------------------------
-*/
-#ifndef __CompositorInstance_H__
-#define __CompositorInstance_H__
-
-#include "OgrePrerequisites.h"
-#include "OgreMaterial.h"
-#include "OgreTexture.h"
-#include "OgreRenderQueue.h"
-namespace Ogre {
-    const size_t RENDER_QUEUE_COUNT = RENDER_QUEUE_OVERLAY+1;       
-            
-    /** An instance of a Compositor object for one Viewport. It is part of the CompositorChain
-		for a Viewport.
-     */
-    class _OgreExport CompositorInstance : public CLRObject
-    {
-    public:
-		DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(CompositorInstance);
-
-        CompositorInstance(Compositor *filter, CompositionTechnique *technique, CompositorChain *chain);
-        virtual ~CompositorInstance();
-		/** Provides an interface to "listen in" to to render system operations executed by this 
-			CompositorInstance.
-		*/
-		class _OgreExport Listener
-		{
-		public:
-			virtual ~Listener();
-
-			/** Notification of when a render target operation involving a material (like
-				rendering a quad) is compiled, so that miscelleneous parameters that are different
-				per Compositor instance can be set up.
-				@param pass_id	Pass identifier within Compositor instance, this is speficied 
-								by the user by CompositionPass::setIdentifier().
-				@param mat		Material, this may be changed at will and will only affect
-								the current instance of the Compositor, not the global material
-								it was cloned from.
-			 */
-			virtual void notifyMaterialSetup(uint32 pass_id, MaterialPtr &mat);
-
-			/** Notification before a render target operation involving a material (like
-				rendering a quad), so that material parameters can be varied.
-				@param pass_id	Pass identifier within Compositor instance, this is speficied 
-								by the user by CompositionPass::setIdentifier().
-				@param mat		Material, this may be changed at will and will only affect
-								the current instance of the Compositor, not the global material
-								it was cloned from.
-			 */
-			virtual void notifyMaterialRender(uint32 pass_id, MaterialPtr &mat);
-		};
-        /** Specific render system operation. A render target operation does special operations
-		    between render queues like rendering a quad, clearing the frame buffer or 
-			setting stencil state.
-		*/
-		class RenderSystemOperation
-		{
-		public:
-			virtual ~RenderSystemOperation();
-			/// Set state to SceneManager and RenderSystem
-			virtual void execute(SceneManager *sm, RenderSystem *rs) = 0;
-		};
-		typedef std::map<int, MaterialPtr> QuadMaterialMap;
-		typedef std::pair<int, RenderSystemOperation*> RenderSystemOpPair;
-		typedef std::vector<RenderSystemOpPair> RenderSystemOpPairs;
-        /** Operation setup for a RenderTarget (collected).
-        */
-        class TargetOperation
-        {
-        public:
-            TargetOperation()
-            { 
-            }
-            TargetOperation(RenderTarget *target):
-                target(target), currentQueueGroupID(0), visibilityMask(0xFFFFFFFF),
-                lodBias(1.0f),
-                onlyInitial(false), hasBeenRendered(false), findVisibleObjects(false)
-            { 
-            }
-            /// Target
-            RenderTarget *target;
-
-			/// Current group ID
-			int currentQueueGroupID;
-
-			/// RenderSystem operations to queue into the scene manager, by
-			/// uint8
-			RenderSystemOpPairs renderSystemOperations;
-
-			/// Scene visibility mask
-            /// If this is 0, the scene is not rendered at all
-            uint32 visibilityMask;
-            
-            /// LOD offset. This is multiplied with the camera LOD offset
-            /// 1.0 is default, lower means lower detail, higher means higher detail
-            float lodBias;
-            
-            /** A set of render queues to either include or exclude certain render queues.
-	 		*/
-            typedef std::bitset<RENDER_QUEUE_COUNT> RenderQueueBitSet;
-
-			/// Which renderqueues to render from scene
-			RenderQueueBitSet renderQueues;
-            
-            /** @see CompositionTargetPass::mOnlyInitial
-            */
-            bool onlyInitial;
-            /** "Has been rendered" flag; used in combination with
-                onlyInitial to determine whether to skip this target operation.
-            */
-            bool hasBeenRendered;
-            /** Whether this op needs to find visible scene objects or not 
-            */
-            bool findVisibleObjects;
-			/** Which material scheme this op will use */
-			String materialScheme;
-        };
-        typedef std::vector<TargetOperation> CompiledState;
-        
-        /** Set enabled flag. The compositor instance will only render if it is
-            enabled, otherwise it is pass-through.
-        */
-        void setEnabled(bool value);
-        
-        /** Get enabled flag.
-        */
-        bool getEnabled();
-
-		/** Get the instance name for a local texture.
-		@note It is only valid to call this when local textures have been loaded, 
-			which in practice means that the compositor instance is active. Calling
-			it at other times will cause an exception. Note that since textures
-			are cleaned up aggressively, this name is not guaranteed to stay the
-			same if you disable and renable the compositor instance.
-		@param name The name of the texture in the original compositor definition
-		@returns The instance name for the texture, corresponds to a real texture
-		*/
-		const String& getTextureInstanceName(const String& name);
-
-		/** Prepare this instance for re-compilation. Clear all state that has been 
-			set by the last compile.
-        */
-        virtual void _prepareForCompilation();
-        
-        /** Recursively collect target states (except for final Pass).
-            @param compiledState    This vector will contain a list of TargetOperation objects
-        */
-        virtual void _compileTargetOperations(CompiledState &compiledState);
-        
-        /** Compile the final (output) operation. This is done seperately because this
-            is combined with the input in chained filters.
-        */
-        virtual void _compileOutputOperation(TargetOperation &finalState);
-        
-        /** Get Compositor of which this is an instance
-        */
-        Compositor *getCompositor();
-        
-        /** Get CompositionTechnique used by this instance
-        */
-        CompositionTechnique *getTechnique();
-
-		/** Get Chain that this instance is part of
-        */
-        CompositorChain *getChain();
-
-		/** Add a listener. Listeners provide an interface to "listen in" to to render system 
-			operations executed by this CompositorInstance so that materials can be 
-			programmatically set up.
-			@see CompositorInstance::Listener
-		*/
-		void addListener(Listener *l);
-
-		/** Remove a listener.
-			@see CompositorInstance::Listener
-		*/
-		void removeListener(Listener *l);
-
-		/** Notify listeners of a material compilation.
-		*/
-		void _fireNotifyMaterialSetup(uint32 pass_id, MaterialPtr &mat);
-
-		/** Notify listeners of a material render.
-		*/
-		void _fireNotifyMaterialRender(uint32 pass_id, MaterialPtr &mat);
-	private:
-        /// Compositor of which this is an instance
-        Compositor *mCompositor;
-        /// Composition technique used by this instance
-        CompositionTechnique *mTechnique;
-        /// Composition chain of which this instance is part
-        CompositorChain *mChain;
-        /// Is this instance enabled?
-        bool mEnabled;
-        /// Map from name->local texture
-        typedef std::map<String,TexturePtr> LocalTextureMap;
-        LocalTextureMap mLocalTextures;
-
-		/// Render System operations queued by last compile, these are created by this
-		/// instance thus managed and deleted by it. The list is cleared with 
-		/// clearCompilationState()
-		typedef std::vector<RenderSystemOperation*> RenderSystemOperations;
-		RenderSystemOperations mRenderSystemOperations;
-
-		/// Vector of listeners
-		typedef std::vector<Listener*> Listeners;
-		Listeners mListeners;
-        
-        /// Previous instance (set by chain)
-        CompositorInstance *mPreviousInstance;
-		
-		/** Collect rendering passes. Here, passes are converted into render target operations
-			and queued with queueRenderSystemOp.
-        */
-        virtual void collectPasses(TargetOperation &finalState, CompositionTargetPass *target);
-        
-        /** Create a local dummy material with one technique but no passes.
-            The material is detached from the Material Manager to make sure it is destroyed
-			when going out of scope.
-        */
-        MaterialPtr createLocalMaterial();
-        
-        /** Create local rendertextures and other resources. Builds mLocalTextures.
-        */
-        void createResources();
-        
-        /** Destroy local rendertextures and other resources.
-        */
-        void freeResources();
-
-		/** Destroy locally queued RenderTarget operations
-		*/
-		void clearCompilationState();
-        
-        /** Get RenderTarget for a named local texture.
-        */
-        RenderTarget *getTargetForTex(const String &name);
-        
-        /** Get source texture name for a named local texture.
-        */
-        const String &getSourceForTex(const String &name);
-
-		/** Queue a render system operation.
-			@returns destination pass
-		 */
-		void queueRenderSystemOp(TargetOperation &finalState, RenderSystemOperation *op);
-        
-        friend class CompositorChain;
-    };
-}
-
-#endif

Deleted: trunk/Mogre/ogrenew/OgreMain/include/.#OgreGpuProgram.h.1.60.2.2
===================================================================
--- trunk/Mogre/ogrenew/OgreMain/include/.#OgreGpuProgram.h.1.60.2.2	2006-11-09 15:12:40 UTC (rev 65)
+++ trunk/Mogre/ogrenew/OgreMain/include/.#OgreGpuProgram.h.1.60.2.2	2006-11-09 15:23:55 UTC (rev 66)
@@ -1,1183 +0,0 @@
-/*
------------------------------------------------------------------------------
-This source file is part of OGRE
-    (Object-oriented Graphics Rendering Engine)
-For the latest info, see http://ogre.sourceforge.net/
-
-Copyright (c) 2000-2005 The OGRE Team
-Also see acknowledgements in Readme.html
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/copyleft/lesser.txt.
------------------------------------------------------------------------------
-*/
-#ifndef __GpuProgram_H_
-#define __GpuProgram_H_
-
-// Precompiler options
-#include "OgrePrerequisites.h"
-#include "OgreResource.h"
-#include "OgreSharedPtr.h"
-#include "OgreIteratorWrappers.h"
-
-namespace Ogre {
-
-	/** Enumerates the types of programs which can run on the GPU. */
-	enum GpuProgramType
-	{
-		GPT_VERTEX_PROGRAM,
-		GPT_FRAGMENT_PROGRAM
-	};
-
-    
-    /** Collects together the program parameters used for a GpuProgram.
-    @remarks
-        Gpu program state includes constant parameters used by the program, and
-        bindings to render system state which is propagated into the constants 
-        by the engine automatically if requested.
-    @par
-        GpuProgramParameters objects should be created through the GpuProgramManager and
-        may be shared between multiple GpuProgram instances. For this reason they
-        are managed using a shared pointer, which will ensure they are automatically
-        deleted when no program is using them anymore.
-    */
-	class _OgreExport GpuProgramParameters
-    {
-    public:
-		DECLARE_CLRHANDLE;
-
-		/** Defines the types of automatically updated values that may be bound to GpuProgram
-        parameters, or used to modify parameters on a per-object basis.
-        */
-        enum AutoConstantType
-        {
-            /// The current world matrix
-           ...
 
[truncated message content]

[Mogre-svnmail] SF.net SVN: mogre: [67] trunk/Mogre

[<mog...@li...>]

Revision: 67
          http://svn.sourceforge.net/mogre/?rev=67&view=rev
Author:   bekas
Date:     2006-11-12 14:41:38 -0800 (Sun, 12 Nov 2006)

Log Message:
-----------


Modified Paths:
--------------
    trunk/Mogre/ChangeLog.txt
    trunk/Mogre/Mogre/AssemblyInfo.cpp
    trunk/Mogre/Mogre/include/auto/MogreManualObject.h
    trunk/Mogre/Mogre/include/auto/MogreMesh.h
    trunk/Mogre/Mogre/include/auto/MogreMeshManager.h
    trunk/Mogre/Mogre/include/auto/MogrePixelFormat.h
    trunk/Mogre/Mogre/include/auto/MogreRenderOperation.h
    trunk/Mogre/Mogre/include/auto/MogreRenderSystemCapabilities.h
    trunk/Mogre/Mogre/include/auto/MogreRenderTarget.h
    trunk/Mogre/Mogre/include/auto/MogreRibbonTrail.h
    trunk/Mogre/Mogre/include/auto/MogreSceneManager.h
    trunk/Mogre/Mogre/include/auto/MogreSubMesh.h
    trunk/Mogre/Mogre/include/auto/MogreTextureUnitState.h
    trunk/Mogre/Mogre/include/auto/MogreVertexIndexData.h
    trunk/Mogre/Mogre/src/Custom/MogreQuaternion.cpp
    trunk/Mogre/Mogre/src/Custom/MogreVector3.cpp
    trunk/Mogre/Mogre/src/auto/MogreManualObject.cpp
    trunk/Mogre/Mogre/src/auto/MogreMesh.cpp
    trunk/Mogre/Mogre/src/auto/MogreMeshManager.cpp
    trunk/Mogre/Mogre/src/auto/MogrePixelFormat.cpp
    trunk/Mogre/Mogre/src/auto/MogreRenderOperation.cpp
    trunk/Mogre/Mogre/src/auto/MogreRenderSystemCapabilities.cpp
    trunk/Mogre/Mogre/src/auto/MogreRibbonTrail.cpp
    trunk/Mogre/Mogre/src/auto/MogreSubMesh.cpp
    trunk/Mogre/Mogre/src/auto/MogreTextureUnitState.cpp
    trunk/Mogre/Mogre/src/auto/MogreVertexIndexData.cpp
    trunk/Mogre/Mogre.sln
    trunk/Mogre/ReadMe.txt
    trunk/Mogre/Samples/ExampleApplication/Demo.ExampleApplication.csproj
    trunk/Mogre/Samples/ExampleApplication/Example.cs
    trunk/Mogre/Samples/Fresnel/Demo.Fresnel.csproj
    trunk/Mogre/Samples/Fresnel/Fresnel.cs
    trunk/Mogre/Samples/Fresnel/Program.cs
    trunk/Mogre/Samples/Gui/Demo.Gui.csproj
    trunk/Mogre/Samples/Gui/Gui.cs
    trunk/Mogre/Samples/Gui/Program.cs
    trunk/Mogre/Samples/MogreForm/Demo.MogreForm.csproj
    trunk/Mogre/Samples/MogreForm/MogreForm.Designer.cs
    trunk/Mogre/Samples/MogreForm/MogreForm.cs
    trunk/Mogre/Samples/MogreForm/Program.cs
    trunk/Mogre/Samples/MogreForm/Properties/Resources.Designer.cs
    trunk/Mogre/Samples/MogreForm/Properties/Settings.Designer.cs
    trunk/Mogre/Samples/SkeletalAnimation/Demo.SkeletaAnimation.csproj
    trunk/Mogre/Samples/SkeletalAnimation/Program.cs
    trunk/Mogre/Samples/SkeletalAnimation/Skeletal.cs
    trunk/Mogre/ogrenew/CVS/Entries
    trunk/Mogre/ogrenew/CVS/Entries.Extra
    trunk/Mogre/ogrenew/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/CVS/Entries.Old
    trunk/Mogre/ogrenew/Docs/CVS/Entries
    trunk/Mogre/ogrenew/Docs/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Docs/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Docs/CVS/Entries.Old
    trunk/Mogre/ogrenew/Docs/ChangeLog.html
    trunk/Mogre/ogrenew/Docs/Readme/CVS/Entries
    trunk/Mogre/ogrenew/Docs/manual/CVS/Entries
    trunk/Mogre/ogrenew/Docs/manual/CVS/Entries.Old
    trunk/Mogre/ogrenew/Docs/manual/images/CVS/Entries
    trunk/Mogre/ogrenew/Docs/manual/index.html
    trunk/Mogre/ogrenew/Docs/manual/manual_1.html
    trunk/Mogre/ogrenew/Docs/manual/manual_10.html
    trunk/Mogre/ogrenew/Docs/manual/manual_11.html
    trunk/Mogre/ogrenew/Docs/manual/manual_12.html
    trunk/Mogre/ogrenew/Docs/manual/manual_13.html
    trunk/Mogre/ogrenew/Docs/manual/manual_14.html
    trunk/Mogre/ogrenew/Docs/manual/manual_15.html
    trunk/Mogre/ogrenew/Docs/manual/manual_16.html
    trunk/Mogre/ogrenew/Docs/manual/manual_17.html
    trunk/Mogre/ogrenew/Docs/manual/manual_18.html
    trunk/Mogre/ogrenew/Docs/manual/manual_19.html
    trunk/Mogre/ogrenew/Docs/manual/manual_2.html
    trunk/Mogre/ogrenew/Docs/manual/manual_20.html
    trunk/Mogre/ogrenew/Docs/manual/manual_21.html
    trunk/Mogre/ogrenew/Docs/manual/manual_22.html
    trunk/Mogre/ogrenew/Docs/manual/manual_23.html
    trunk/Mogre/ogrenew/Docs/manual/manual_24.html
    trunk/Mogre/ogrenew/Docs/manual/manual_25.html
    trunk/Mogre/ogrenew/Docs/manual/manual_26.html
    trunk/Mogre/ogrenew/Docs/manual/manual_27.html
    trunk/Mogre/ogrenew/Docs/manual/manual_28.html
    trunk/Mogre/ogrenew/Docs/manual/manual_29.html
    trunk/Mogre/ogrenew/Docs/manual/manual_3.html
    trunk/Mogre/ogrenew/Docs/manual/manual_30.html
    trunk/Mogre/ogrenew/Docs/manual/manual_31.html
    trunk/Mogre/ogrenew/Docs/manual/manual_32.html
    trunk/Mogre/ogrenew/Docs/manual/manual_33.html
    trunk/Mogre/ogrenew/Docs/manual/manual_34.html
    trunk/Mogre/ogrenew/Docs/manual/manual_35.html
    trunk/Mogre/ogrenew/Docs/manual/manual_36.html
    trunk/Mogre/ogrenew/Docs/manual/manual_37.html
    trunk/Mogre/ogrenew/Docs/manual/manual_38.html
    trunk/Mogre/ogrenew/Docs/manual/manual_39.html
    trunk/Mogre/ogrenew/Docs/manual/manual_4.html
    trunk/Mogre/ogrenew/Docs/manual/manual_40.html
    trunk/Mogre/ogrenew/Docs/manual/manual_41.html
    trunk/Mogre/ogrenew/Docs/manual/manual_42.html
    trunk/Mogre/ogrenew/Docs/manual/manual_43.html
    trunk/Mogre/ogrenew/Docs/manual/manual_44.html
    trunk/Mogre/ogrenew/Docs/manual/manual_45.html
    trunk/Mogre/ogrenew/Docs/manual/manual_46.html
    trunk/Mogre/ogrenew/Docs/manual/manual_47.html
    trunk/Mogre/ogrenew/Docs/manual/manual_48.html
    trunk/Mogre/ogrenew/Docs/manual/manual_49.html
    trunk/Mogre/ogrenew/Docs/manual/manual_5.html
    trunk/Mogre/ogrenew/Docs/manual/manual_50.html
    trunk/Mogre/ogrenew/Docs/manual/manual_51.html
    trunk/Mogre/ogrenew/Docs/manual/manual_52.html
    trunk/Mogre/ogrenew/Docs/manual/manual_53.html
    trunk/Mogre/ogrenew/Docs/manual/manual_54.html
    trunk/Mogre/ogrenew/Docs/manual/manual_55.html
    trunk/Mogre/ogrenew/Docs/manual/manual_56.html
    trunk/Mogre/ogrenew/Docs/manual/manual_57.html
    trunk/Mogre/ogrenew/Docs/manual/manual_58.html
    trunk/Mogre/ogrenew/Docs/manual/manual_59.html
    trunk/Mogre/ogrenew/Docs/manual/manual_6.html
    trunk/Mogre/ogrenew/Docs/manual/manual_60.html
    trunk/Mogre/ogrenew/Docs/manual/manual_61.html
    trunk/Mogre/ogrenew/Docs/manual/manual_62.html
    trunk/Mogre/ogrenew/Docs/manual/manual_63.html
    trunk/Mogre/ogrenew/Docs/manual/manual_64.html
    trunk/Mogre/ogrenew/Docs/manual/manual_65.html
    trunk/Mogre/ogrenew/Docs/manual/manual_66.html
    trunk/Mogre/ogrenew/Docs/manual/manual_67.html
    trunk/Mogre/ogrenew/Docs/manual/manual_68.html
    trunk/Mogre/ogrenew/Docs/manual/manual_69.html
    trunk/Mogre/ogrenew/Docs/manual/manual_7.html
    trunk/Mogre/ogrenew/Docs/manual/manual_70.html
    trunk/Mogre/ogrenew/Docs/manual/manual_71.html
    trunk/Mogre/ogrenew/Docs/manual/manual_72.html
    trunk/Mogre/ogrenew/Docs/manual/manual_73.html
    trunk/Mogre/ogrenew/Docs/manual/manual_74.html
    trunk/Mogre/ogrenew/Docs/manual/manual_75.html
    trunk/Mogre/ogrenew/Docs/manual/manual_8.html
    trunk/Mogre/ogrenew/Docs/manual/manual_9.html
    trunk/Mogre/ogrenew/Docs/manual/manual_abt.html
    trunk/Mogre/ogrenew/Docs/manual/manual_ovr.html
    trunk/Mogre/ogrenew/Docs/manual/manual_toc.html
    trunk/Mogre/ogrenew/Docs/src/CVS/Entries
    trunk/Mogre/ogrenew/Docs/src/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Docs/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Docs/src/html.cfg
    trunk/Mogre/ogrenew/Docs/src/images/CVS/Entries
    trunk/Mogre/ogrenew/Docs/src/manual.texi
    trunk/Mogre/ogrenew/Docs/vbo-update/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Classes/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Classes/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Ogre/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Ogre/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Mac/XCode/Ogre/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Ogre/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Ogre/Ogre.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Ogre/Ogre.xcodeproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Ogre/config.h
    trunk/Mogre/ogrenew/Mac/XCode/Ogre/config.nib/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Ogre/config.nib/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Mac/XCode/Ogre/config.nib/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Ogre/config~.nib/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/BSP/BSP.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/BSP/BSP.xcode/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/BSP/BSP.xcode/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/BSP/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Bezier/Bezier.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Bezier/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Mac/XCode/Samples/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/CameraTrack/CameraTrack.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/CameraTrack/CameraTrack.xcode/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/CameraTrack/CameraTrack.xcode/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/CameraTrack/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/CelShading/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/CelShading/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Mac/XCode/Samples/CelShading/CelShading.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/CelShading/CelShading.xcode/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/CelShading/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Compositor/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/CubeMapping/CubeMapping.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/CubeMapping/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Dot3Bump/Dot3Bump.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Dot3Bump/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Dot3Bump/English.lproj/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/EnvMapping/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/EnvMapping/EnvMapping.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Facial Animation/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Fresnel/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Fresnel/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Fresnel/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Fresnel/Fresnel.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Fresnel/Fresnel.xcode/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Fresnel/Fresnel.xcode/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Gui/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Gui/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Gui/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Gui/English.lproj/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Gui/Gui.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Gui/Gui.xcode/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Lighting/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Lighting/Lighting.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Lighting/Lighting.xcode/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Nature/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Nature/English.lproj/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Nature/English.lproj/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Nature/Nature.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Nature/Nature.xcode/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/OceanDemo/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/OceanDemo/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/ParticleFX/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/ParticleFX/English.lproj/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/ParticleFX/ParticleFX.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/ParticleFX/ParticleFX.xcode/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/RenderToTexture/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/RenderToTexture/RenderToTexture.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/RenderToTexture/RenderToTexture.xcode/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Samples.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Samples.xcodeproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Samples.xcodeproj/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Shadows/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Shadows/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Shadows/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Shadows/English.lproj/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Shadows/English.lproj/main.nib/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Shadows/Shadows.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Shadows/Shadows.xcode/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/SkeletalAnimation/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/SkeletalAnimation/English.lproj/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/SkeletalAnimation/English.lproj/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/SkeletalAnimation/SkeletalAnimation.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/SkeletalAnimation/SkeletalAnimation.xcode/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/SkeletalAnimation/SkeletalAnimation.xcode/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/SkyBox/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/SkyBox/English.lproj/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/SkyBox/SkyBox.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/SkyDome/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/SkyDome/English.lproj/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/SkyDome/English.lproj/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/SkyDome/SkyDome.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/SkyDome/SkyDome.xcode/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/SkyPlane/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/SkyPlane/SkyPlane.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Terrain/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Terrain/English.lproj/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Terrain/English.lproj/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Terrain/Terrain.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/TextureFX/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/TextureFX/English.lproj/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/TextureFX/English.lproj/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/TextureFX/TextureFX.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Transparency/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Transparency/Transparency.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Transparency/Transparency.xcode/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Water/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Water/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Water/CVS/Entries.Old
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Water/English.lproj/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/Water/Water.xcode/CVS/Entries
    trunk/Mogre/ogrenew/Mac/XCode/Samples/config.h
    trunk/Mogre/ogrenew/OgreMain/CVS/Entries
    trunk/Mogre/ogrenew/OgreMain/include/CVS/Entries
    trunk/Mogre/ogrenew/OgreMain/include/CVS/Entries.Extra
    trunk/Mogre/ogrenew/OgreMain/include/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/OgreMain/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/OgreMain/include/OgreAutoParamDataSource.h
    trunk/Mogre/ogrenew/OgreMain/include/OgreEntity.h
    trunk/Mogre/ogrenew/OgreMain/include/OgreOverlayElement.h
    trunk/Mogre/ogrenew/OgreMain/include/OgrePrerequisites.h
    trunk/Mogre/ogrenew/OgreMain/include/OgreRenderSystemCapabilities.h
    trunk/Mogre/ogrenew/OgreMain/include/OgreRibbonTrail.h
    trunk/Mogre/ogrenew/OgreMain/include/OgreRoot.h
    trunk/Mogre/ogrenew/OgreMain/include/OgreTextAreaOverlayElement.h
    trunk/Mogre/ogrenew/OgreMain/include/OgreTextureUnitState.h
    trunk/Mogre/ogrenew/OgreMain/include/OgreVector3.h
    trunk/Mogre/ogrenew/OgreMain/scripts/CVS/Entries
    trunk/Mogre/ogrenew/OgreMain/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/OgreMain/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/OgreMain/src/CVS/Entries
    trunk/Mogre/ogrenew/OgreMain/src/CVS/Entries.Extra
    trunk/Mogre/ogrenew/OgreMain/src/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/OgreMain/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/OgreMain/src/OgreAnimationTrack.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreAutoParamDataSource.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreBillboardChain.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreBillboardSet.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreBorderPanelOverlayElement.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreCamera.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreCompiler2Pass.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreEntity.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreGpuProgram.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreGpuProgramUsage.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreManualObject.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreMaterial.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreMaterialSerializer.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreMemoryManager.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreMesh.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreNode.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreOverlayContainer.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgrePass.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgrePixelFormat.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreProfiler.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreQuaternion.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreRenderSystemCapabilities.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreRibbonTrail.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreRoot.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreSceneManager.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreStaticGeometry.cpp
    trunk/Mogre/ogrenew/OgreMain/src/OgreTextureUnitState.cpp
    trunk/Mogre/ogrenew/Other/CVS/Entries
    trunk/Mogre/ogrenew/PlatformManagers/CVS/Entries
    trunk/Mogre/ogrenew/PlatformManagers/GLX/CVS/Entries
    trunk/Mogre/ogrenew/PlatformManagers/GLX/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlatformManagers/GLX/include/CVS/Entries
    trunk/Mogre/ogrenew/PlatformManagers/GLX/include/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlatformManagers/GLX/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlatformManagers/GLX/src/CVS/Entries
    trunk/Mogre/ogrenew/PlatformManagers/GLX/src/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlatformManagers/GLX/src/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/PlatformManagers/GLX/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlatformManagers/SDL/CVS/Entries
    trunk/Mogre/ogrenew/PlatformManagers/SDL/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlatformManagers/SDL/include/CVS/Entries
    trunk/Mogre/ogrenew/PlatformManagers/SDL/include/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlatformManagers/SDL/include/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/PlatformManagers/SDL/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlatformManagers/SDL/src/CVS/Entries
    trunk/Mogre/ogrenew/PlatformManagers/SDL/src/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlatformManagers/Win32/CVS/Entries
    trunk/Mogre/ogrenew/PlatformManagers/Win32/include/CVS/Entries
    trunk/Mogre/ogrenew/PlatformManagers/Win32/include/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlatformManagers/Win32/misc/CVS/Entries
    trunk/Mogre/ogrenew/PlatformManagers/Win32/misc/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlatformManagers/Win32/scripts/CVS/Entries
    trunk/Mogre/ogrenew/PlatformManagers/Win32/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlatformManagers/Win32/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlatformManagers/Win32/scripts/PlatformManager_Win32.cbp
    trunk/Mogre/ogrenew/PlatformManagers/Win32/src/CVS/Entries
    trunk/Mogre/ogrenew/PlatformManagers/Win32/src/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlatformManagers/Win32/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlatformManagers/gtk/CVS/Entries
    trunk/Mogre/ogrenew/PlatformManagers/gtk/include/CVS/Entries
    trunk/Mogre/ogrenew/PlatformManagers/gtk/src/CVS/Entries
    trunk/Mogre/ogrenew/PlatformManagers/gtk/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlugIns/BSPSceneManager/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/BSPSceneManager/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/PlugIns/BSPSceneManager/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlugIns/BSPSceneManager/include/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/BSPSceneManager/include/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlugIns/BSPSceneManager/include/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/PlugIns/BSPSceneManager/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlugIns/BSPSceneManager/misc/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/BSPSceneManager/scripts/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/BSPSceneManager/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlugIns/BSPSceneManager/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlugIns/BSPSceneManager/scripts/Plugin_BSPSceneManager.cbp
    trunk/Mogre/ogrenew/PlugIns/BSPSceneManager/src/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/BSPSceneManager/src/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlugIns/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlugIns/CgProgramManager/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/CgProgramManager/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlugIns/CgProgramManager/include/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/CgProgramManager/include/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlugIns/CgProgramManager/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlugIns/CgProgramManager/misc/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/CgProgramManager/scripts/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/CgProgramManager/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlugIns/CgProgramManager/scripts/Plugin_CgProgramManager.cbp
    trunk/Mogre/ogrenew/PlugIns/CgProgramManager/src/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/CgProgramManager/src/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlugIns/EXRCodec/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/EXRCodec/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlugIns/EXRCodec/include/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/EXRCodec/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlugIns/EXRCodec/misc/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/EXRCodec/misc/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlugIns/EXRCodec/src/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/EXRCodec/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlugIns/OctreeSceneManager/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/OctreeSceneManager/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/PlugIns/OctreeSceneManager/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlugIns/OctreeSceneManager/include/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/OctreeSceneManager/include/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlugIns/OctreeSceneManager/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlugIns/OctreeSceneManager/misc/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/OctreeSceneManager/misc/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlugIns/OctreeSceneManager/scripts/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/OctreeSceneManager/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlugIns/OctreeSceneManager/scripts/Plugin_OctreeSceneManager.cbp
    trunk/Mogre/ogrenew/PlugIns/OctreeSceneManager/src/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/OctreeSceneManager/src/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlugIns/OctreeSceneManager/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlugIns/OctreeSceneManager/src/OgreOctreeSceneManager.cpp
    trunk/Mogre/ogrenew/PlugIns/OctreeSceneManager/src/OgreTerrainPageSource.cpp
    trunk/Mogre/ogrenew/PlugIns/OctreeSceneManager/src/OgreTerrainSceneManager.cpp
    trunk/Mogre/ogrenew/PlugIns/ParticleFX/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/ParticleFX/include/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/ParticleFX/include/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlugIns/ParticleFX/misc/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/ParticleFX/misc/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlugIns/ParticleFX/scripts/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/ParticleFX/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/PlugIns/ParticleFX/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/PlugIns/ParticleFX/scripts/Plugin_ParticleFX.cbp
    trunk/Mogre/ogrenew/PlugIns/ParticleFX/src/CVS/Entries
    trunk/Mogre/ogrenew/PlugIns/ParticleFX/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/ReferenceApplication/BspCollision/CVS/Entries
    trunk/Mogre/ogrenew/ReferenceApplication/BspCollision/src/CVS/Entries
    trunk/Mogre/ogrenew/ReferenceApplication/BspCollision/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/ReferenceApplication/CVS/Entries
    trunk/Mogre/ogrenew/ReferenceApplication/CVS/Entries.Extra
    trunk/Mogre/ogrenew/ReferenceApplication/Common/include/CVS/Entries
    trunk/Mogre/ogrenew/ReferenceApplication/ReferenceAppLayer/CVS/Entries
    trunk/Mogre/ogrenew/ReferenceApplication/ReferenceAppLayer/include/CVS/Entries
    trunk/Mogre/ogrenew/ReferenceApplication/ReferenceAppLayer/include/CVS/Entries.Extra
    trunk/Mogre/ogrenew/ReferenceApplication/ReferenceAppLayer/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/ReferenceApplication/ReferenceAppLayer/scripts/CVS/Entries
    trunk/Mogre/ogrenew/ReferenceApplication/ReferenceAppLayer/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/ReferenceApplication/ReferenceAppLayer/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/ReferenceApplication/ReferenceAppLayer/scripts/ReferenceAppLayer.cbp
    trunk/Mogre/ogrenew/ReferenceApplication/ReferenceAppLayer/src/CVS/Entries
    trunk/Mogre/ogrenew/ReferenceApplication/ReferenceAppLayer/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/RenderSystems/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/CVS/Entries.Old
    trunk/Mogre/ogrenew/RenderSystems/Direct3D9/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/Direct3D9/include/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/Direct3D9/include/CVS/Entries.Extra
    trunk/Mogre/ogrenew/RenderSystems/Direct3D9/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/RenderSystems/Direct3D9/misc/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/Direct3D9/misc/CVS/Entries.Old
    trunk/Mogre/ogrenew/RenderSystems/Direct3D9/scripts/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/Direct3D9/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/RenderSystems/Direct3D9/scripts/RenderSystem_Direct3D9.cbp
    trunk/Mogre/ogrenew/RenderSystems/Direct3D9/src/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/Direct3D9/src/CVS/Entries.Extra
    trunk/Mogre/ogrenew/RenderSystems/Direct3D9/src/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/RenderSystems/Direct3D9/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/RenderSystems/Direct3D9/src/OgreD3D9HardwarePixelBuffer.cpp
    trunk/Mogre/ogrenew/RenderSystems/Direct3D9/src/OgreD3D9RenderSystem.cpp
    trunk/Mogre/ogrenew/RenderSystems/GL/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/include/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/include/CVS/Entries.Extra
    trunk/Mogre/ogrenew/RenderSystems/GL/include/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/RenderSystems/GL/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/RenderSystems/GL/include/GL/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/include/GL/CVS/Entries.Extra
    trunk/Mogre/ogrenew/RenderSystems/GL/include/GL/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/RenderSystems/GL/include/GL/CVS/Entries.Old
    trunk/Mogre/ogrenew/RenderSystems/GL/include/GLX/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/include/GLX/CVS/Entries.Extra
    trunk/Mogre/ogrenew/RenderSystems/GL/include/OgreGLFBORenderTexture.h
    trunk/Mogre/ogrenew/RenderSystems/GL/include/OgreGLHardwarePixelBuffer.h
    trunk/Mogre/ogrenew/RenderSystems/GL/include/OgreWin32GLSupport.h
    trunk/Mogre/ogrenew/RenderSystems/GL/include/gtk/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/include/gtk/CVS/Entries.Old
    trunk/Mogre/ogrenew/RenderSystems/GL/misc/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/misc/CVS/Entries.Old
    trunk/Mogre/ogrenew/RenderSystems/GL/scripts/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/RenderSystems/GL/scripts/RenderSystem_GL.cbp
    trunk/Mogre/ogrenew/RenderSystems/GL/src/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/src/CVS/Entries.Extra
    trunk/Mogre/ogrenew/RenderSystems/GL/src/GLSL/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/src/GLSL/include/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/src/GLSL/include/CVS/Entries.Extra
    trunk/Mogre/ogrenew/RenderSystems/GL/src/GLSL/src/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/src/GLSL/src/CVS/Entries.Extra
    trunk/Mogre/ogrenew/RenderSystems/GL/src/GLSL/src/OgreGLSLLinkProgram.cpp
    trunk/Mogre/ogrenew/RenderSystems/GL/src/GLX/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/src/GLX/CVS/Entries.Extra
    trunk/Mogre/ogrenew/RenderSystems/GL/src/OgreGLFBORenderTexture.cpp
    trunk/Mogre/ogrenew/RenderSystems/GL/src/OgreGLFrameBufferObject.cpp
    trunk/Mogre/ogrenew/RenderSystems/GL/src/OgreGLHardwareBufferManager.cpp
    trunk/Mogre/ogrenew/RenderSystems/GL/src/OgreGLHardwarePixelBuffer.cpp
    trunk/Mogre/ogrenew/RenderSystems/GL/src/OgreGLRenderSystem.cpp
    trunk/Mogre/ogrenew/RenderSystems/GL/src/OgreGLSupport.cpp
    trunk/Mogre/ogrenew/RenderSystems/GL/src/OgreGLTexture.cpp
    trunk/Mogre/ogrenew/RenderSystems/GL/src/OgreWin32GLSupport.cpp
    trunk/Mogre/ogrenew/RenderSystems/GL/src/OgreWin32Window.cpp
    trunk/Mogre/ogrenew/RenderSystems/GL/src/SDL/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/src/SDL/CVS/Entries.Extra
    trunk/Mogre/ogrenew/RenderSystems/GL/src/SDL/CVS/Entries.Old
    trunk/Mogre/ogrenew/RenderSystems/GL/src/atifs/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/src/atifs/include/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/src/atifs/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/RenderSystems/GL/src/atifs/src/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/src/atifs/src/CVS/Entries.Extra
    trunk/Mogre/ogrenew/RenderSystems/GL/src/atifs/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/RenderSystems/GL/src/gtk/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/src/gtk/CVS/Entries.Old
    trunk/Mogre/ogrenew/RenderSystems/GL/src/nvparse/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/src/nvparse/CVS/Entries.Extra
    trunk/Mogre/ogrenew/RenderSystems/GL/src/nvparse/CVS/Entries.Old
    trunk/Mogre/ogrenew/RenderSystems/GL/src/nvparse/winheaders/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/src/win32/CVS/Entries
    trunk/Mogre/ogrenew/RenderSystems/GL/src/win32/CVS/Entries.Extra
    trunk/Mogre/ogrenew/SDK/Win32/CVS/Entries
    trunk/Mogre/ogrenew/SDK/Win32/CVS/Entries.Extra
    trunk/Mogre/ogrenew/SDK/Win32/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/SDK/Win32/CVS/Entries.Old
    trunk/Mogre/ogrenew/SDK/Win32/docs/CVS/Entries
    trunk/Mogre/ogrenew/SDK/Win32/docs/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/SDK/Win32/docs/CVS/Entries.Old
    trunk/Mogre/ogrenew/SDK/Win32/ogresdk.nsh
    trunk/Mogre/ogrenew/SDK/Win32/samples/CVS/Entries
    trunk/Mogre/ogrenew/SDK/Win32/samples/CVS/Entries.Extra
    trunk/Mogre/ogrenew/SDK/Win32/samples/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/SDK/Win32/samples/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/BSP/CVS/Entries
    trunk/Mogre/ogrenew/Samples/BSP/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/BSP/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/BSP/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/BSP/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/BSP/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/BSP/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/BSP/scripts/Demo_BSP.cbp
    trunk/Mogre/ogrenew/Samples/BSP/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/BSP/src/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/BezierPatch/CVS/Entries
    trunk/Mogre/ogrenew/Samples/BezierPatch/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/BezierPatch/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/BezierPatch/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/BezierPatch/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/BezierPatch/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/BezierPatch/scripts/Demo_BezierPatch.cbp
    trunk/Mogre/ogrenew/Samples/BezierPatch/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/BezierPatch/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/CVS/Entries
    trunk/Mogre/ogrenew/Samples/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/CameraTrack/CVS/Entries
    trunk/Mogre/ogrenew/Samples/CameraTrack/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/CameraTrack/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/CameraTrack/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/CameraTrack/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/CameraTrack/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/CameraTrack/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/CameraTrack/scripts/Demo_CameraTrack.cbp
    trunk/Mogre/ogrenew/Samples/CameraTrack/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/CameraTrack/src/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/CameraTrack/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/CelShading/CVS/Entries
    trunk/Mogre/ogrenew/Samples/CelShading/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/CelShading/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/CelShading/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/CelShading/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/CelShading/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/CelShading/scripts/Demo_CelShading.cbp
    trunk/Mogre/ogrenew/Samples/CelShading/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/CelShading/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Common/CEGUIRenderer/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Common/CEGUIRenderer/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Common/CEGUIRenderer/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Common/CEGUIRenderer/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Common/CEGUIRenderer/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Common/CEGUIRenderer/scripts/OgreGUIRenderer.cbp
    trunk/Mogre/ogrenew/Samples/Common/CEGUIRenderer/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Common/CEGUIRenderer/src/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Common/CEGUIRenderer/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Common/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Common/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Common/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Common/bin/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Common/bin/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Common/bin/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Common/bin/Debug/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Common/bin/Debug/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Common/bin/Debug/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Common/bin/Debug/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Common/bin/Release/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Common/bin/Release/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Common/bin/Release/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Common/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Common/misc/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Common/setup/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Common/setup/demos.wxs
    trunk/Mogre/ogrenew/Samples/Common/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Compositor/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Compositor/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Compositor/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Compositor/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Compositor/include/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Compositor/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Compositor/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Compositor/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Compositor/scripts/Demo_Compositor.cbp
    trunk/Mogre/ogrenew/Samples/Compositor/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Compositor/src/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Compositor/src/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Compositor/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/CubeMapping/CVS/Entries
    trunk/Mogre/ogrenew/Samples/CubeMapping/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/CubeMapping/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/CubeMapping/include/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/CubeMapping/include/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/CubeMapping/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/CubeMapping/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/CubeMapping/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/CubeMapping/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/CubeMapping/scripts/Demo_CubeMapping.cbp
    trunk/Mogre/ogrenew/Samples/CubeMapping/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/CubeMapping/src/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/CubeMapping/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/DeferredShading/CVS/Entries
    trunk/Mogre/ogrenew/Samples/DeferredShading/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/DeferredShading/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/DeferredShading/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/DeferredShading/include/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/DeferredShading/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/DeferredShading/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/DeferredShading/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/DeferredShading/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/DeferredShading/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/DeferredShading/src/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/DeferredShading/src/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/DeferredShading/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Dot3Bump/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Dot3Bump/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Dot3Bump/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Dot3Bump/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Dot3Bump/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Dot3Bump/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Dot3Bump/scripts/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Dot3Bump/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Dot3Bump/scripts/Demo_Dot3Bump.cbp
    trunk/Mogre/ogrenew/Samples/Dot3Bump/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Dot3Bump/src/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Dot3Bump/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/DynTex/CVS/Entries
    trunk/Mogre/ogrenew/Samples/DynTex/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/DynTex/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/DynTex/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/DynTex/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/DynTex/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/DynTex/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/DynTex/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/DynTex/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/DynTex/scripts/Demo_DynTex.cbp
    trunk/Mogre/ogrenew/Samples/DynTex/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/EnvMapping/CVS/Entries
    trunk/Mogre/ogrenew/Samples/EnvMapping/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/EnvMapping/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/EnvMapping/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/EnvMapping/misc/CVS/Entries
    trunk/Mogre/ogrenew/Samples/EnvMapping/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/EnvMapping/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/EnvMapping/scripts/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/EnvMapping/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/EnvMapping/scripts/Demo_EnvMapping.cbp
    trunk/Mogre/ogrenew/Samples/EnvMapping/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/FacialAnimation/CVS/Entries
    trunk/Mogre/ogrenew/Samples/FacialAnimation/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/FacialAnimation/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/FacialAnimation/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/FacialAnimation/scripts/Demo_FacialAnimation.cbp
    trunk/Mogre/ogrenew/Samples/FacialAnimation/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/FacialAnimation/src/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Fresnel/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Fresnel/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Fresnel/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Fresnel/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Fresnel/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Fresnel/scripts/Demo_Fresnel.cbp
    trunk/Mogre/ogrenew/Samples/Fresnel/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/GTKDemo/CVS/Entries
    trunk/Mogre/ogrenew/Samples/GTKDemo/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/GTKDemo/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/GTKDemo/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/GTKDemo/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/GTKDemo/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Grass/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Grass/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Grass/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Grass/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Grass/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Grass/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Grass/scripts/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Grass/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Grass/scripts/Demo_Grass.cbp
    trunk/Mogre/ogrenew/Samples/Grass/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Grass/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Gui/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Gui/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Gui/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Gui/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Gui/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Gui/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Gui/scripts/Demo_Gui.cbp
    trunk/Mogre/ogrenew/Samples/Gui/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/HDRDemo/CVS/Entries
    trunk/Mogre/ogrenew/Samples/HDRDemo/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Lighting/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Lighting/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Lighting/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Lighting/include/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Lighting/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Lighting/misc/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Lighting/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Lighting/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Lighting/scripts/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Lighting/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Lighting/scripts/Demo_Lighting.cbp
    trunk/Mogre/ogrenew/Samples/Lighting/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Media/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Media/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Media/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Media/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Media/fonts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Media/gui/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Media/materials/programs/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Media/materials/programs/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Media/materials/programs/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Media/materials/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Media/materials/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Media/materials/scripts/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Media/materials/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Media/materials/scripts/Examples.compositor
    trunk/Mogre/ogrenew/Samples/Media/materials/textures/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Media/materials/textures/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Media/models/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Media/models/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Media/models/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Media/overlays/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Media/overlays/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Media/overlays/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Media/packs/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Media/particle/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Media/particle/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/OceanDemo/CVS/Entries
    trunk/Mogre/ogrenew/Samples/OceanDemo/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/OceanDemo/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/OceanDemo/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/OceanDemo/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/OceanDemo/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/OceanDemo/script/CVS/Entries
    trunk/Mogre/ogrenew/Samples/OceanDemo/script/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/OceanDemo/script/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/OceanDemo/script/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/OceanDemo/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/OceanDemo/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/ParticleFX/CVS/Entries
    trunk/Mogre/ogrenew/Samples/ParticleFX/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/ParticleFX/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/ParticleFX/misc/CVS/Entries
    trunk/Mogre/ogrenew/Samples/ParticleFX/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/ParticleFX/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/ParticleFX/scripts/Demo_ParticleFX.cbp
    trunk/Mogre/ogrenew/Samples/ParticleFX/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/ParticleFX/src/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/ParticleFX/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/RenderToTexture/CVS/Entries
    trunk/Mogre/ogrenew/Samples/RenderToTexture/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/RenderToTexture/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/RenderToTexture/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/RenderToTexture/misc/CVS/Entries
    trunk/Mogre/ogrenew/Samples/RenderToTexture/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/RenderToTexture/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/RenderToTexture/scripts/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/RenderToTexture/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/RenderToTexture/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/RenderToTexture/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Shadows/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Shadows/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Shadows/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Shadows/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Shadows/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Shadows/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Shadows/scripts/Demo_Shadows.cbp
    trunk/Mogre/ogrenew/Samples/Shadows/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Shadows/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/SkeletalAnimation/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkeletalAnimation/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/SkeletalAnimation/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/SkeletalAnimation/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkeletalAnimation/misc/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkeletalAnimation/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkeletalAnimation/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/SkeletalAnimation/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/SkeletalAnimation/scripts/Demo_SkeletalAnimation.cbp
    trunk/Mogre/ogrenew/Samples/SkeletalAnimation/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkeletalAnimation/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/SkyBox/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkyBox/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/SkyBox/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/SkyBox/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkyBox/include/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/SkyBox/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/SkyBox/misc/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkyBox/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkyBox/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/SkyBox/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/SkyBox/scripts/Demo_SkyBox.cbp
    trunk/Mogre/ogrenew/Samples/SkyBox/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkyBox/src/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/SkyBox/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/SkyDome/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkyDome/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/SkyDome/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/SkyDome/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkyDome/misc/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkyDome/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkyDome/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/SkyDome/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/SkyDome/scripts/Demo_SkyDome.cbp
    trunk/Mogre/ogrenew/Samples/SkyDome/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkyDome/src/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/SkyDome/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/SkyPlane/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkyPlane/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/SkyPlane/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkyPlane/misc/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkyPlane/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkyPlane/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/SkyPlane/scripts/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/SkyPlane/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/SkyPlane/scripts/Demo_SkyPlane.cbp
    trunk/Mogre/ogrenew/Samples/SkyPlane/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/SkyPlane/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Smoke/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Smoke/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Smoke/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Smoke/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Smoke/include/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Smoke/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Smoke/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Smoke/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Smoke/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Smoke/scripts/Demo_Smoke.cbp
    trunk/Mogre/ogrenew/Samples/Smoke/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Terrain/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Terrain/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Terrain/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Terrain/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Terrain/misc/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Terrain/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Terrain/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Terrain/scripts/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Terrain/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Terrain/scripts/Demo_Terrain.cbp
    trunk/Mogre/ogrenew/Samples/Terrain/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/TextureFX/CVS/Entries
    trunk/Mogre/ogrenew/Samples/TextureFX/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/TextureFX/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/TextureFX/misc/CVS/Entries
    trunk/Mogre/ogrenew/Samples/TextureFX/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/TextureFX/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/TextureFX/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/TextureFX/scripts/Demo_TextureFX.cbp
    trunk/Mogre/ogrenew/Samples/TextureFX/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/TextureFX/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Transpacency/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Transpacency/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Transpacency/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Transpacency/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Transpacency/include/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Transpacency/include/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Transpacency/misc/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Transpacency/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Transpacency/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Transpacency/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/Transpacency/scripts/Demo_Transparency.cbp
    trunk/Mogre/ogrenew/Samples/Transpacency/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Transpacency/src/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/Transpacency/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/VolumeTex/CVS/Entries
    trunk/Mogre/ogrenew/Samples/VolumeTex/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/VolumeTex/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/VolumeTex/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/VolumeTex/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/VolumeTex/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/VolumeTex/scripts/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Samples/VolumeTex/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Samples/VolumeTex/scripts/Demo_VolumeTex.cbp
    trunk/Mogre/ogrenew/Samples/VolumeTex/src/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Water/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Water/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Water/include/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Water/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Samples/Water/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Samples/Water/scripts/Demo_Water.cbp
    trunk/Mogre/ogrenew/Samples/Water/src/CVS/Entries
    trunk/Mogre/ogrenew/Scripts/CVS/Entries
    trunk/Mogre/ogrenew/Scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Scripts/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Scripts/m4/CVS/Entries
    trunk/Mogre/ogrenew/Tests/CVS/Entries
    trunk/Mogre/ogrenew/Tests/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Tests/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Tests/CVS/Entries.Old
    trunk/Mogre/ogrenew/Tests/OgreMain/include/CVS/Entries
    trunk/Mogre/ogrenew/Tests/OgreMain/misc/ArchiveTest/CVS/Entries
    trunk/Mogre/ogrenew/Tests/OgreMain/misc/ArchiveTest/level1/materials/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Tests/OgreMain/misc/ArchiveTest/level2/materials/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Tests/OgreMain/misc/ArchiveTest/level2/materials/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Tests/OgreMain/misc/CVS/Entries
    trunk/Mogre/ogrenew/Tests/OgreMain/src/CVS/Entries
    trunk/Mogre/ogrenew/Tests/OgreMain/src/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Tests/OgreMain/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Tests/PlayPen/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Tests/PlayPen/scripts/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Tests/PlayPen/scripts/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Tests/PlayPen/scripts/CVS/Entries.Old
    trunk/Mogre/ogrenew/Tests/PlayPen/src/CVS/Entries
    trunk/Mogre/ogrenew/Tests/PlayPen/src/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Tests/PlayPen/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Tests/PlayPen/src/PlayPen.cpp
    trunk/Mogre/ogrenew/Tests/src/CVS/Entries
    trunk/Mogre/ogrenew/Tests/src/CVS/Entries.Old
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/CVS/Entries.Old
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Docs/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Docs/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Docs/CVS/Entries.Old
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Docs/tutorials/skateboard/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Docs/tutorials/skateboard/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Docs/tutorials/skateboard/CVS/Entries.Old
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Docs/tutorials/skateboard/images/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Docs/tutorials/skateboard/images/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Docs/tutorials/skateboard/images/CVS/Entries.Old
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Docs/tutorials/skeleton/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Docs/tutorials/skeleton/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Docs/tutorials/skeleton/images/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Docs/tutorials/skeleton/images/CVS/Entries.Old
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Docs/tutorials/toolbar/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Docs/tutorials/toolbar/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Docs/tutorials/toolbar/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Docs/tutorials/toolbar/CVS/Entries.Old
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Docs/tutorials/toolbar/images/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/OgreExport/include/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/OgreExport/scripts/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/OgreExport/src/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Samples/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/Samples/CVS/Entries.Old
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/images/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/plugins/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/plugins/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/plugins/PhysiqueInterface_sources/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/plugins/PhysiqueInterface_sources/CVS/Entries.Old
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/CVS/Entries.Extra
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/CVS/Entries.Old
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/macros/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/macros/CVS/Entries.Old
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/scripts/startup/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/scripts/startup/CVS/Entries.Old
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/tutorial._files/CVS/Entries
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/tutorial._files/CVS/Entries.Extra.Old
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/tutorial._files/CVS/Entries.Old
    trunk/Mogre/ogrenew/Tools/3dsmaxExport/ui/Icons/CVS/Entries
    trunk...
 
[truncated message content]

[Mogre-svnmail] SF.net SVN: mogre: [70] trunk/Mogre/ogrenew/SDK/Win32/ogresdk.nsh

[<mog...@li...>]

Revision: 70
          http://svn.sourceforge.net/mogre/?rev=70&view=rev
Author:   bekas
Date:     2006-11-13 10:51:17 -0800 (Mon, 13 Nov 2006)

Log Message:
-----------


Modified Paths:
--------------
    trunk/Mogre/ogrenew/SDK/Win32/ogresdk.nsh

Modified: trunk/Mogre/ogrenew/SDK/Win32/ogresdk.nsh
===================================================================
--- trunk/Mogre/ogrenew/SDK/Win32/ogresdk.nsh	2006-11-13 00:58:15 UTC (rev 69)
+++ trunk/Mogre/ogrenew/SDK/Win32/ogresdk.nsh	2006-11-13 18:51:17 UTC (rev 70)
@@ -6,7 +6,7 @@
 !define PRODUCT_NAME "OGRE SDK"
 !define PRODUCT_VERSION "1.2.4"
 
-!define MOGRE_VERSION "0.1.8"
+!define MOGRE_VERSION "0.1.8.1"
 !define MOGRE_WEBSITE "http://sourceforge.net/projects/mogre"
 
 !define PRODUCT_PUBLISHER "The OGRE Team"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mogre-svnmail] SF.net SVN: mogre: [64] trunk/Mogre

[<mog...@li...>]

Revision: 64
          http://svn.sourceforge.net/mogre/?rev=64&view=rev
Author:   bekas
Date:     2006-10-30 01:36:22 -0800 (Mon, 30 Oct 2006)

Log Message:
-----------
Added 'Serializable' attribute to the pure .NET classes except for Math, PixelBox, VertexElement.

Modified Paths:
--------------
    trunk/Mogre/ChangeLog.txt
    trunk/Mogre/Mogre/include/Custom/MogreAxisAlignedBox.h
    trunk/Mogre/Mogre/include/Custom/MogreBox.h
    trunk/Mogre/Mogre/include/Custom/MogreColourValue.h
    trunk/Mogre/Mogre/include/Custom/MogreMath.h
    trunk/Mogre/Mogre/include/Custom/MogreMatrix3.h
    trunk/Mogre/Mogre/include/Custom/MogreMatrix4.h
    trunk/Mogre/Mogre/include/Custom/MogrePair.h
    trunk/Mogre/Mogre/include/Custom/MogrePlane.h
    trunk/Mogre/Mogre/include/Custom/MogreQuaternion.h
    trunk/Mogre/Mogre/include/Custom/MogreRay.h
    trunk/Mogre/Mogre/include/Custom/MogreRect.h
    trunk/Mogre/Mogre/include/Custom/MogreRectangle.h
    trunk/Mogre/Mogre/include/Custom/MogreSphere.h
    trunk/Mogre/Mogre/include/Custom/MogreVector2.h
    trunk/Mogre/Mogre/include/Custom/MogreVector3.h
    trunk/Mogre/Mogre/include/Custom/MogreVector4.h
    trunk/Mogre/Mogre/include/Marshalling.h
    trunk/Mogre/Mogre/src/Custom/ManagedDataStream.cpp

Modified: trunk/Mogre/ChangeLog.txt
===================================================================
--- trunk/Mogre/ChangeLog.txt	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/ChangeLog.txt	2006-10-30 09:36:22 UTC (rev 64)
@@ -9,10 +9,11 @@
 --[Added] MaterialSerializer and CompositorSerializer classes
 --[Added] Overrided operator == (in addition to the Equals method) for wrappers of Ogre classes that override '=='
 --[Added] static method 'FromResourcePtr' to SharedPtrs of Resource subclasses (MaterialPtr etc.). Mainly for languages that
-	may not support the implicit type conversion (C#/VB.NET works with implicit type conversion)
+	may not support the implicit type conversion (C#/VB.NET work with implicit type conversion)
+--[Added] 'Serializable' attribute to the pure .NET classes (http://www.ogre3d.org/wiki/index.php/MOGRE_pure_.NET_classes)
+	except for Math, PixelBox, VertexElement.
 
 
-
 ------------------------------------------------------------------------
 Changes since MOGRE v0.1.6
 ------------------------------------------------------------------------

Modified: trunk/Mogre/Mogre/include/Custom/MogreAxisAlignedBox.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreAxisAlignedBox.h	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/Mogre/include/Custom/MogreAxisAlignedBox.h	2006-10-30 09:36:22 UTC (rev 64)
@@ -41,6 +41,7 @@
 		    for an axis-aligned bounding box (AABB) for collision and
 		    visibility determination.
     */
+	[Serializable]
 	[StructLayout(LayoutKind::Explicit)]
     public ref class AxisAlignedBox
     {
@@ -67,11 +68,11 @@
 
 		//TODO: Find out a general way to get the size of bool-plus-packing (sizeof(bool) returns 1)
 		//Currently I manually insert 4
-		[FieldOffset(2*sizeof(Ogre::Vector3) + 4)]
+		[NonSerialized, FieldOffset(2*sizeof(Ogre::Vector3) + 4)]
 		inline_array_explicit<Vector3, 3*sizeof(Real), 8> mCorners;
 
 		//Managed AxisAlignedBox members
-		[FieldOffset(10*sizeof(Ogre::Vector3) + 4)]
+		[NonSerialized, FieldOffset(10*sizeof(Ogre::Vector3) + 4)]
 	    array<Vector3>^ clr_arr_Corners;
 
 	    /** Internal method for updating corner points.
@@ -482,5 +483,13 @@
 		}
 
 
+	private:
+		/// Used for setting the fields after serialization (only mMinimum, mMaximum, mNull get serialized)
+		[System::Runtime::Serialization::OnDeserialized]
+		void OnDeserialized(System::Runtime::Serialization::StreamingContext context)
+		 {
+			 clr_arr_Corners = gcnew array<Vector3>(8);
+			 updateCorners();
+		 }
     };
 }
\ No newline at end of file

Modified: trunk/Mogre/Mogre/include/Custom/MogreBox.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreBox.h	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/Mogre/include/Custom/MogreBox.h	2006-10-30 09:36:22 UTC (rev 64)
@@ -17,6 +17,7 @@
      	Note that the left, top, and front edges are included but the right, 
      	bottom and top ones are not.
      */
+	[Serializable]
     public value class Box
     {
 	public:

Modified: trunk/Mogre/Mogre/include/Custom/MogreColourValue.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreColourValue.h	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/Mogre/include/Custom/MogreColourValue.h	2006-10-30 09:36:22 UTC (rev 64)
@@ -34,6 +34,7 @@
     typedef Ogre::ABGR ABGR;
 	typedef Ogre::BGRA BGRA;
 
+	[Serializable]
 	[StructLayout(LayoutKind::Sequential)]
 	public value class ColourValue : IEquatable<ColourValue>
 	{

Modified: trunk/Mogre/Mogre/include/Custom/MogreMath.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreMath.h	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/Mogre/include/Custom/MogreMath.h	2006-10-30 09:36:22 UTC (rev 64)
@@ -46,6 +46,7 @@
         Radian values are interchangeable with Degree values, and conversions
         will be done automatically between them.
     */
+	[Serializable]
 	public value class Radian : IEquatable<Radian>
 	{
 		Real mRad;
@@ -88,6 +89,7 @@
         Degree values are interchangeable with Radian values, and conversions
         will be done automatically between them.
     */
+	[Serializable]
 	public value class Degree : IEquatable<Degree>
 	{
 		Real mDeg;
@@ -131,6 +133,7 @@
         Angle values will be automatically converted between radians and degrees,
         as appropriate.
     */
+	[Serializable]
 	public value class Angle
 	{
 		Real mAngle;

Modified: trunk/Mogre/Mogre/include/Custom/MogreMatrix3.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreMatrix3.h	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/Mogre/include/Custom/MogreMatrix3.h	2006-10-30 09:36:22 UTC (rev 64)
@@ -55,10 +55,12 @@
         @par
             The coordinate system is assumed to be <b>right-handed</b>.
     */
+	[Serializable]
 	[StructLayout(LayoutKind::Explicit)]
     public ref class Matrix3
     {
 	public:
+		[Serializable]
 		[StructLayout(LayoutKind::Sequential)]
 		value struct NativeValue
 		{
@@ -148,22 +150,22 @@
 			return !(lmat == rkMatrix);
 		}
 
-		virtual bool Equals(Object^ obj) override
-		{
-			Matrix3^ clr = dynamic_cast<Matrix3^>(obj);
-			if (clr == CLR_NULL)
-			{
-				return false;
-			}
-
-			return (this == clr);
-		}
-		
-		bool Equals(Matrix3^ obj)
-		{
-			return (this == obj);
-		}
+		virtual bool Equals(Object^ obj) override
+		{
+			Matrix3^ clr = dynamic_cast<Matrix3^>(obj);
+			if (clr == CLR_NULL)
+			{
+				return false;
+			}
 
+			return (this == clr);
+		}
+		
+		bool Equals(Matrix3^ obj)
+		{
+			return (this == obj);
+		}
+
         // arithmetic operations
         static Matrix3^ operator+ (Matrix3^ lmat, Matrix3^ rkMatrix);
         static Matrix3^ operator- (Matrix3^ lmat, Matrix3^ rkMatrix);

Modified: trunk/Mogre/Mogre/include/Custom/MogreMatrix4.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreMatrix4.h	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/Mogre/include/Custom/MogreMatrix4.h	2006-10-30 09:36:22 UTC (rev 64)
@@ -66,10 +66,12 @@
                 [ m30  m31  m32  m33 ]   {1}
             </pre>
     */
+	[Serializable]
 	[StructLayout(LayoutKind::Explicit)]
 	public ref class Matrix4
     {
 	public:
+		[Serializable]
 		[StructLayout(LayoutKind::Sequential)]
 		value struct NativeValue
 		{
@@ -381,22 +383,22 @@
             return false;
         }
 
-		virtual bool Equals(Object^ obj) override
-		{
-			Matrix4^ clr = dynamic_cast<Matrix4^>(obj);
-			if (clr == CLR_NULL)
-			{
-				return false;
-			}
-
-			return (this == clr);
-		}
-		
-		bool Equals(Matrix4^ obj)
-		{
-			return (this == obj);
-		}
+		virtual bool Equals(Object^ obj) override
+		{
+			Matrix4^ clr = dynamic_cast<Matrix4^>(obj);
+			if (clr == CLR_NULL)
+			{
+				return false;
+			}
 
+			return (this == clr);
+		}
+		
+		bool Equals(Matrix4^ obj)
+		{
+			return (this == obj);
+		}
+
         /** Assignment from 3x3 matrix.
         */
         inline void operator = ( Matrix3^ mat3 )

Modified: trunk/Mogre/Mogre/include/Custom/MogrePair.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogrePair.h	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/Mogre/include/Custom/MogrePair.h	2006-10-30 09:36:22 UTC (rev 64)
@@ -3,6 +3,7 @@
 namespace Mogre
 {
 	generic <typename Type1, typename Type2>
+	[System::Serializable]
 	public value struct Pair
 	{
 	   typedef Type1 first_type;

Modified: trunk/Mogre/Mogre/include/Custom/MogrePlane.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogrePlane.h	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/Mogre/include/Custom/MogrePlane.h	2006-10-30 09:36:22 UTC (rev 64)
@@ -44,6 +44,7 @@
             respectively), and a constant (D) which is the distance along
             the normal you have to go to move the plane back to the origin.
      */
+	[Serializable]
 	public value class Plane : IEquatable<Plane>
     {
 	public:

Modified: trunk/Mogre/Mogre/include/Custom/MogreQuaternion.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreQuaternion.h	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/Mogre/include/Custom/MogreQuaternion.h	2006-10-30 09:36:22 UTC (rev 64)
@@ -49,6 +49,7 @@
 
     /** Implementation of a Quaternion, i.e. a rotation around an axis.
     */
+	[Serializable]
 	public value class Quaternion : IEquatable<Quaternion>
     {
     public:
@@ -99,9 +100,10 @@
 		/// Construct a quaternion from 4 manual w/x/y/z values
 		inline Quaternion(array<Real>^ valptr)
 		{
-			pin_ptr<Real> dest = &w;
-			pin_ptr<Real> src = &valptr[0];
-			memcpy(dest, src, sizeof(Real)*4);
+			w = valptr[0];
+			x = valptr[1];
+			y = valptr[2];
+			z = valptr[3];
 		}
 
         void FromRotationMatrix (Matrix3^ kRot);

Modified: trunk/Mogre/Mogre/include/Custom/MogreRay.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreRay.h	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/Mogre/include/Custom/MogreRay.h	2006-10-30 09:36:22 UTC (rev 64)
@@ -34,6 +34,7 @@
 namespace Mogre
 {
     /** Representation of a ray in space, ie a line with an origin and direction. */
+	[Serializable]
     public value class Ray
     {
 	protected:

Modified: trunk/Mogre/Mogre/include/Custom/MogreRect.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreRect.h	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/Mogre/include/Custom/MogreRect.h	2006-10-30 09:36:22 UTC (rev 64)
@@ -4,6 +4,7 @@
 
 namespace Mogre
 {
+	[Serializable]
 	public value class FloatRect
 	{
 	public:
@@ -32,6 +33,7 @@
 	};
 
 
+	[Serializable]
 	public value class Rect
 	{
 	public:

Modified: trunk/Mogre/Mogre/include/Custom/MogreRectangle.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreRectangle.h	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/Mogre/include/Custom/MogreRectangle.h	2006-10-30 09:36:22 UTC (rev 64)
@@ -4,6 +4,7 @@
 
 namespace Mogre
 {
+	[Serializable]
 	public value class Rectangle
 	{
 	public:

Modified: trunk/Mogre/Mogre/include/Custom/MogreSphere.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreSphere.h	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/Mogre/include/Custom/MogreSphere.h	2006-10-30 09:36:22 UTC (rev 64)
@@ -38,6 +38,7 @@
         x^2 + y^2 + z^2 = r^2 (for sphere's centered on the origin). Ogre stores spheres
         simply as a center point and a radius.
     */
+	[Serializable]
     public value class Sphere
     {
     protected:

Modified: trunk/Mogre/Mogre/include/Custom/MogreVector2.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreVector2.h	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/Mogre/include/Custom/MogreVector2.h	2006-10-30 09:36:22 UTC (rev 64)
@@ -36,6 +36,7 @@
             scaling factors can be represented by a vector, depending on how
             you interpret the values.
     */
+	[Serializable]
 	public value class Vector2 : IEquatable<Vector2>
     {
     public:

Modified: trunk/Mogre/Mogre/include/Custom/MogreVector3.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreVector3.h	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/Mogre/include/Custom/MogreVector3.h	2006-10-30 09:36:22 UTC (rev 64)
@@ -39,6 +39,7 @@
             scaling factors can be represented by a vector, depending on how
             you interpret the values.
     */
+	[Serializable]
 	public value class Vector3 : IEquatable<Vector3>
     {
     public:

Modified: trunk/Mogre/Mogre/include/Custom/MogreVector4.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreVector4.h	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/Mogre/include/Custom/MogreVector4.h	2006-10-30 09:36:22 UTC (rev 64)
@@ -31,6 +31,7 @@
 {
     /** 4-dimensional homogenous vector.
     */
+	[Serializable]
 	public value class Vector4 : IEquatable<Vector4>
     {
     public:

Modified: trunk/Mogre/Mogre/include/Marshalling.h
===================================================================
--- trunk/Mogre/Mogre/include/Marshalling.h	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/Mogre/include/Marshalling.h	2006-10-30 09:36:22 UTC (rev 64)
@@ -359,6 +359,8 @@
 	template <typename MElem, typename NElem>
 	array<MElem>^ GetValueArrayFromNativeArray(const NElem* src, int len)
 	{
+		STATIC_ASSERT( sizeof(MElem) == sizeof(NElem) )
+
 		array<MElem>^ arr = gcnew array<MElem>(len);
 		pin_ptr<MElem> p_arr = &arr[0];
         memcpy( p_arr, src, len*sizeof(NElem) );

Modified: trunk/Mogre/Mogre/src/Custom/ManagedDataStream.cpp
===================================================================
--- trunk/Mogre/Mogre/src/Custom/ManagedDataStream.cpp	2006-10-28 11:02:23 UTC (rev 63)
+++ trunk/Mogre/Mogre/src/Custom/ManagedDataStream.cpp	2006-10-30 09:36:22 UTC (rev 64)
@@ -16,8 +16,7 @@
 		array<System::Byte>^ managedBuf = gcnew array<System::Byte>(count);
 		int bytesRead = _managed->_stream->Read(managedBuf, 0, count);
 
-		pin_ptr<System::Byte> ptr = &managedBuf[0];
-		memcpy(buf, ptr, bytesRead);
+		Marshal::Copy(managedBuf, 0, (IntPtr)buf, bytesRead);
 
 		return bytesRead;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mogre-svnmail] SF.net SVN: mogre: [63] trunk/Mogre

[<mog...@li...>]

Revision: 63
          http://svn.sourceforge.net/mogre/?rev=63&view=rev
Author:   bekas
Date:     2006-10-28 04:02:23 -0700 (Sat, 28 Oct 2006)

Log Message:
-----------


Modified Paths:
--------------
    trunk/Mogre/ChangeLog.txt
    trunk/Mogre/Mogre/include/auto/MogreCompositor.h
    trunk/Mogre/Mogre/include/auto/MogreFont.h
    trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h
    trunk/Mogre/Mogre/include/auto/MogreMaterial.h
    trunk/Mogre/Mogre/include/auto/MogreMesh.h
    trunk/Mogre/Mogre/include/auto/MogreSkeleton.h
    trunk/Mogre/Mogre/include/auto/MogreTexture.h

Modified: trunk/Mogre/ChangeLog.txt
===================================================================
--- trunk/Mogre/ChangeLog.txt	2006-10-27 23:20:40 UTC (rev 62)
+++ trunk/Mogre/ChangeLog.txt	2006-10-28 11:02:23 UTC (rev 63)
@@ -8,8 +8,8 @@
 --[Added] OgreDotNet's CeguiNet bindings, a CeguiNet renderer for Mogre and ported Ogre's Gui sample
 --[Added] MaterialSerializer and CompositorSerializer classes
 --[Added] Overrided operator == (in addition to the Equals method) for wrappers of Ogre classes that override '=='
---[Added] static method 'FromResourcePtr' to SharedPtrs of Resource subclasses (MaterialPtr etc.). Mainly because the implicit
-	type conversion doesn't work with VB.NET.
+--[Added] static method 'FromResourcePtr' to SharedPtrs of Resource subclasses (MaterialPtr etc.). Mainly for languages that
+	may not support the implicit type conversion (C#/VB.NET works with implicit type conversion)
 
 
 

Modified: trunk/Mogre/Mogre/include/auto/MogreCompositor.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreCompositor.h	2006-10-27 23:20:40 UTC (rev 62)
+++ trunk/Mogre/Mogre/include/auto/MogreCompositor.h	2006-10-28 11:02:23 UTC (rev 63)
@@ -105,7 +105,7 @@
 	
 		static CompositorPtr^ FromResourcePtr( ResourcePtr^ ptr )
 		{
-			return gcnew CompositorPtr( (Ogre::CompositorPtr) *(ptr->_sharedPtr) );
+			return (CompositorPtr^) ptr;
 		}
 	
 		static operator CompositorPtr^ ( ResourcePtr^ ptr )

Modified: trunk/Mogre/Mogre/include/auto/MogreFont.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreFont.h	2006-10-27 23:20:40 UTC (rev 62)
+++ trunk/Mogre/Mogre/include/auto/MogreFont.h	2006-10-28 11:02:23 UTC (rev 63)
@@ -136,7 +136,7 @@
 	
 		static FontPtr^ FromResourcePtr( ResourcePtr^ ptr )
 		{
-			return gcnew FontPtr( (Ogre::FontPtr) *(ptr->_sharedPtr) );
+			return (FontPtr^) ptr;
 		}
 	
 		static operator FontPtr^ ( ResourcePtr^ ptr )

Modified: trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h	2006-10-27 23:20:40 UTC (rev 62)
+++ trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h	2006-10-28 11:02:23 UTC (rev 63)
@@ -881,7 +881,7 @@
 	
 		static GpuProgramPtr^ FromResourcePtr( ResourcePtr^ ptr )
 		{
-			return gcnew GpuProgramPtr( (Ogre::GpuProgramPtr) *(ptr->_sharedPtr) );
+			return (GpuProgramPtr^) ptr;
 		}
 	
 		static operator GpuProgramPtr^ ( ResourcePtr^ ptr )

Modified: trunk/Mogre/Mogre/include/auto/MogreMaterial.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreMaterial.h	2006-10-27 23:20:40 UTC (rev 62)
+++ trunk/Mogre/Mogre/include/auto/MogreMaterial.h	2006-10-28 11:02:23 UTC (rev 63)
@@ -231,7 +231,7 @@
 	
 		static MaterialPtr^ FromResourcePtr( ResourcePtr^ ptr )
 		{
-			return gcnew MaterialPtr( (Ogre::MaterialPtr) *(ptr->_sharedPtr) );
+			return (MaterialPtr^) ptr;
 		}
 	
 		static operator MaterialPtr^ ( ResourcePtr^ ptr )

Modified: trunk/Mogre/Mogre/include/auto/MogreMesh.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreMesh.h	2006-10-27 23:20:40 UTC (rev 62)
+++ trunk/Mogre/Mogre/include/auto/MogreMesh.h	2006-10-28 11:02:23 UTC (rev 63)
@@ -384,7 +384,7 @@
 	
 		static MeshPtr^ FromResourcePtr( ResourcePtr^ ptr )
 		{
-			return gcnew MeshPtr( (Ogre::MeshPtr) *(ptr->_sharedPtr) );
+			return (MeshPtr^) ptr;
 		}
 	
 		static operator MeshPtr^ ( ResourcePtr^ ptr )

Modified: trunk/Mogre/Mogre/include/auto/MogreSkeleton.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreSkeleton.h	2006-10-27 23:20:40 UTC (rev 62)
+++ trunk/Mogre/Mogre/include/auto/MogreSkeleton.h	2006-10-28 11:02:23 UTC (rev 63)
@@ -245,7 +245,7 @@
 	
 		static SkeletonPtr^ FromResourcePtr( ResourcePtr^ ptr )
 		{
-			return gcnew SkeletonPtr( (Ogre::SkeletonPtr) *(ptr->_sharedPtr) );
+			return (SkeletonPtr^) ptr;
 		}
 	
 		static operator SkeletonPtr^ ( ResourcePtr^ ptr )

Modified: trunk/Mogre/Mogre/include/auto/MogreTexture.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreTexture.h	2006-10-27 23:20:40 UTC (rev 62)
+++ trunk/Mogre/Mogre/include/auto/MogreTexture.h	2006-10-28 11:02:23 UTC (rev 63)
@@ -211,7 +211,7 @@
 	
 		static TexturePtr^ FromResourcePtr( ResourcePtr^ ptr )
 		{
-			return gcnew TexturePtr( (Ogre::TexturePtr) *(ptr->_sharedPtr) );
+			return (TexturePtr^) ptr;
 		}
 	
 		static operator TexturePtr^ ( ResourcePtr^ ptr )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mogre-svnmail] SF.net SVN: mogre: [62] trunk/Mogre

[<mog...@li...>]

Revision: 62
          http://svn.sourceforge.net/mogre/?rev=62&view=rev
Author:   bekas
Date:     2006-10-27 16:20:40 -0700 (Fri, 27 Oct 2006)

Log Message:
-----------
Added static method 'FromResourcePtr' to SharedPtrs of Resource subclasses (MaterialPtr etc.). Mainly because the implicit type conversion doesn't work with VB.NET.

Modified Paths:
--------------
    trunk/Mogre/ChangeLog.txt
    trunk/Mogre/Mogre/include/STLMap.h
    trunk/Mogre/Mogre/include/auto/MogreCompositor.h
    trunk/Mogre/Mogre/include/auto/MogreFont.h
    trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h
    trunk/Mogre/Mogre/include/auto/MogreMaterial.h
    trunk/Mogre/Mogre/include/auto/MogreMesh.h
    trunk/Mogre/Mogre/include/auto/MogreSkeleton.h
    trunk/Mogre/Mogre/include/auto/MogreTexture.h

Modified: trunk/Mogre/ChangeLog.txt
===================================================================
--- trunk/Mogre/ChangeLog.txt	2006-10-27 15:58:23 UTC (rev 61)
+++ trunk/Mogre/ChangeLog.txt	2006-10-27 23:20:40 UTC (rev 62)
@@ -8,6 +8,8 @@
 --[Added] OgreDotNet's CeguiNet bindings, a CeguiNet renderer for Mogre and ported Ogre's Gui sample
 --[Added] MaterialSerializer and CompositorSerializer classes
 --[Added] Overrided operator == (in addition to the Equals method) for wrappers of Ogre classes that override '=='
+--[Added] static method 'FromResourcePtr' to SharedPtrs of Resource subclasses (MaterialPtr etc.). Mainly because the implicit
+	type conversion doesn't work with VB.NET.
 
 
 

Modified: trunk/Mogre/Mogre/include/STLMap.h
===================================================================
--- trunk/Mogre/Mogre/include/STLMap.h	2006-10-27 15:58:23 UTC (rev 61)
+++ trunk/Mogre/Mogre/include/STLMap.h	2006-10-27 23:20:40 UTC (rev 62)
@@ -96,13 +96,13 @@
 																					\
 		virtual bool Equals(Object^ obj) override									\
 		{																			\
-			Iterator^ clr = dynamic_cast<Iterator^>(obj);							\
-			if (clr == CLR_NULL)													\
-			{																		\
-				return false;														\
-			}																		\
-																					\
-			return (this == clr);													\
+			Iterator^ clr = dynamic_cast<Iterator^>(obj);							\
+			if (clr == CLR_NULL)													\
+			{																		\
+				return false;														\
+			}																		\
+																					\
+			return (this == clr);													\
 		}																			\
 																					\
 		inline static bool operator ==(Iterator^ it1, Iterator^ it2)				\
@@ -380,13 +380,13 @@
 																					\
 		virtual bool Equals(Object^ obj) override									\
 		{																			\
-			ConstIterator^ clr = dynamic_cast<ConstIterator^>(obj);					\
-			if (clr == CLR_NULL)													\
-			{																		\
-				return false;														\
-			}																		\
-																					\
-			return (this == clr);													\
+			ConstIterator^ clr = dynamic_cast<ConstIterator^>(obj);					\
+			if (clr == CLR_NULL)													\
+			{																		\
+				return false;														\
+			}																		\
+																					\
+			return (this == clr);													\
 		}																			\
 																					\
 		inline static bool operator ==(ConstIterator^ it1, ConstIterator^ it2)		\

Modified: trunk/Mogre/Mogre/include/auto/MogreCompositor.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreCompositor.h	2006-10-27 15:58:23 UTC (rev 61)
+++ trunk/Mogre/Mogre/include/auto/MogreCompositor.h	2006-10-27 23:20:40 UTC (rev 62)
@@ -103,6 +103,11 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( CompositorPtr )
 	
+		static CompositorPtr^ FromResourcePtr( ResourcePtr^ ptr )
+		{
+			return gcnew CompositorPtr( (Ogre::CompositorPtr) *(ptr->_sharedPtr) );
+		}
+	
 		static operator CompositorPtr^ ( ResourcePtr^ ptr )
 		{
 			return gcnew CompositorPtr( (Ogre::CompositorPtr) *(ptr->_sharedPtr) );

Modified: trunk/Mogre/Mogre/include/auto/MogreFont.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreFont.h	2006-10-27 15:58:23 UTC (rev 61)
+++ trunk/Mogre/Mogre/include/auto/MogreFont.h	2006-10-27 23:20:40 UTC (rev 62)
@@ -134,6 +134,11 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( FontPtr )
 	
+		static FontPtr^ FromResourcePtr( ResourcePtr^ ptr )
+		{
+			return gcnew FontPtr( (Ogre::FontPtr) *(ptr->_sharedPtr) );
+		}
+	
 		static operator FontPtr^ ( ResourcePtr^ ptr )
 		{
 			return gcnew FontPtr( (Ogre::FontPtr) *(ptr->_sharedPtr) );

Modified: trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h	2006-10-27 15:58:23 UTC (rev 61)
+++ trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h	2006-10-27 23:20:40 UTC (rev 62)
@@ -879,6 +879,11 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( GpuProgramPtr )
 	
+		static GpuProgramPtr^ FromResourcePtr( ResourcePtr^ ptr )
+		{
+			return gcnew GpuProgramPtr( (Ogre::GpuProgramPtr) *(ptr->_sharedPtr) );
+		}
+	
 		static operator GpuProgramPtr^ ( ResourcePtr^ ptr )
 		{
 			return gcnew GpuProgramPtr( (Ogre::GpuProgramPtr) *(ptr->_sharedPtr) );

Modified: trunk/Mogre/Mogre/include/auto/MogreMaterial.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreMaterial.h	2006-10-27 15:58:23 UTC (rev 61)
+++ trunk/Mogre/Mogre/include/auto/MogreMaterial.h	2006-10-27 23:20:40 UTC (rev 62)
@@ -229,6 +229,11 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( MaterialPtr )
 	
+		static MaterialPtr^ FromResourcePtr( ResourcePtr^ ptr )
+		{
+			return gcnew MaterialPtr( (Ogre::MaterialPtr) *(ptr->_sharedPtr) );
+		}
+	
 		static operator MaterialPtr^ ( ResourcePtr^ ptr )
 		{
 			return gcnew MaterialPtr( (Ogre::MaterialPtr) *(ptr->_sharedPtr) );

Modified: trunk/Mogre/Mogre/include/auto/MogreMesh.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreMesh.h	2006-10-27 15:58:23 UTC (rev 61)
+++ trunk/Mogre/Mogre/include/auto/MogreMesh.h	2006-10-27 23:20:40 UTC (rev 62)
@@ -382,6 +382,11 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( MeshPtr )
 	
+		static MeshPtr^ FromResourcePtr( ResourcePtr^ ptr )
+		{
+			return gcnew MeshPtr( (Ogre::MeshPtr) *(ptr->_sharedPtr) );
+		}
+	
 		static operator MeshPtr^ ( ResourcePtr^ ptr )
 		{
 			return gcnew MeshPtr( (Ogre::MeshPtr) *(ptr->_sharedPtr) );

Modified: trunk/Mogre/Mogre/include/auto/MogreSkeleton.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreSkeleton.h	2006-10-27 15:58:23 UTC (rev 61)
+++ trunk/Mogre/Mogre/include/auto/MogreSkeleton.h	2006-10-27 23:20:40 UTC (rev 62)
@@ -243,6 +243,11 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( SkeletonPtr )
 	
+		static SkeletonPtr^ FromResourcePtr( ResourcePtr^ ptr )
+		{
+			return gcnew SkeletonPtr( (Ogre::SkeletonPtr) *(ptr->_sharedPtr) );
+		}
+	
 		static operator SkeletonPtr^ ( ResourcePtr^ ptr )
 		{
 			return gcnew SkeletonPtr( (Ogre::SkeletonPtr) *(ptr->_sharedPtr) );

Modified: trunk/Mogre/Mogre/include/auto/MogreTexture.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreTexture.h	2006-10-27 15:58:23 UTC (rev 61)
+++ trunk/Mogre/Mogre/include/auto/MogreTexture.h	2006-10-27 23:20:40 UTC (rev 62)
@@ -209,6 +209,11 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( TexturePtr )
 	
+		static TexturePtr^ FromResourcePtr( ResourcePtr^ ptr )
+		{
+			return gcnew TexturePtr( (Ogre::TexturePtr) *(ptr->_sharedPtr) );
+		}
+	
 		static operator TexturePtr^ ( ResourcePtr^ ptr )
 		{
 			return gcnew TexturePtr( (Ogre::TexturePtr) *(ptr->_sharedPtr) );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mogre-svnmail] SF.net SVN: mogre: [61] trunk/Mogre/ChangeLog.txt

[<mog...@li...>]

Revision: 61
          http://svn.sourceforge.net/mogre/?rev=61&view=rev
Author:   bekas
Date:     2006-10-27 08:58:23 -0700 (Fri, 27 Oct 2006)

Log Message:
-----------


Modified Paths:
--------------
    trunk/Mogre/ChangeLog.txt

Modified: trunk/Mogre/ChangeLog.txt
===================================================================
--- trunk/Mogre/ChangeLog.txt	2006-10-27 15:01:12 UTC (rev 60)
+++ trunk/Mogre/ChangeLog.txt	2006-10-27 15:58:23 UTC (rev 61)
@@ -7,6 +7,7 @@
 	in order to compare pointers.
 --[Added] OgreDotNet's CeguiNet bindings, a CeguiNet renderer for Mogre and ported Ogre's Gui sample
 --[Added] MaterialSerializer and CompositorSerializer classes
+--[Added] Overrided operator == (in addition to the Equals method) for wrappers of Ogre classes that override '=='
 
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mogre-svnmail] SF.net SVN: mogre: [60] trunk/Mogre

[<mog...@li...>]

Revision: 60
          http://svn.sourceforge.net/mogre/?rev=60&view=rev
Author:   bekas
Date:     2006-10-27 08:01:12 -0700 (Fri, 27 Oct 2006)

Log Message:
-----------
--[FIX] Matrix3/4's overrided operator == didn't check for null parameters, fixed it.
--[FIX] When a method returned a null Ogre::VertexElement*, a null reference exception was thrown; fixed it.
--[Modified] Removed overrided operator == from all *_NativePtr classes.
--Added Equals method to all value classes
--Added checks for null parameters and overrided operator == of STL Iterator classes, and added Equals method to them
--For every Ogre class that overrides == operator, its wrapper overrides == too
--Added a few parameter checks for safety.

Modified Paths:
--------------
    trunk/Mogre/ChangeLog.txt
    trunk/Mogre/Mogre/include/Custom/MogreColourValue.h
    trunk/Mogre/Mogre/include/Custom/MogreMath.h
    trunk/Mogre/Mogre/include/Custom/MogreMatrix3.h
    trunk/Mogre/Mogre/include/Custom/MogreMatrix4.h
    trunk/Mogre/Mogre/include/Custom/MogrePlane.h
    trunk/Mogre/Mogre/include/Custom/MogreQuaternion.h
    trunk/Mogre/Mogre/include/Custom/MogreVector2.h
    trunk/Mogre/Mogre/include/Custom/MogreVector3.h
    trunk/Mogre/Mogre/include/Custom/MogreVector4.h
    trunk/Mogre/Mogre/include/Custom/MogreVertexElement.i
    trunk/Mogre/Mogre/include/STLDeque.h
    trunk/Mogre/Mogre/include/STLHashMap.h
    trunk/Mogre/Mogre/include/STLList.h
    trunk/Mogre/Mogre/include/STLMap.h
    trunk/Mogre/Mogre/include/STLMultiMap.h
    trunk/Mogre/Mogre/include/STLMultiSet.h
    trunk/Mogre/Mogre/include/STLSet.h
    trunk/Mogre/Mogre/include/STLVector.h
    trunk/Mogre/Mogre/include/auto/MogreAnimable.h
    trunk/Mogre/Mogre/include/auto/MogreAnimationState.h
    trunk/Mogre/Mogre/include/auto/MogreArchive.h
    trunk/Mogre/Mogre/include/auto/MogreBillboardChain.h
    trunk/Mogre/Mogre/include/auto/MogreBlendMode.h
    trunk/Mogre/Mogre/include/auto/MogreCodec.h
    trunk/Mogre/Mogre/include/auto/MogreCompositionTechnique.h
    trunk/Mogre/Mogre/include/auto/MogreCompositor.h
    trunk/Mogre/Mogre/include/auto/MogreConfigOptionMap.h
    trunk/Mogre/Mogre/include/auto/MogreDataStream.h
    trunk/Mogre/Mogre/include/auto/MogreEdgeListBuilder.h
    trunk/Mogre/Mogre/include/auto/MogreException.h
    trunk/Mogre/Mogre/include/auto/MogreFont.h
    trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h
    trunk/Mogre/Mogre/include/auto/MogreHardwareIndexBuffer.h
    trunk/Mogre/Mogre/include/auto/MogreHardwarePixelBuffer.h
    trunk/Mogre/Mogre/include/auto/MogreHardwareVertexBuffer.h
    trunk/Mogre/Mogre/include/auto/MogreHighLevelGpuProgram.h
    trunk/Mogre/Mogre/include/auto/MogreImage.h
    trunk/Mogre/Mogre/include/auto/MogreMaterial.h
    trunk/Mogre/Mogre/include/auto/MogreMesh.h
    trunk/Mogre/Mogre/include/auto/MogreParticleSystem.h
    trunk/Mogre/Mogre/include/auto/MogrePass.h
    trunk/Mogre/Mogre/include/auto/MogrePatchMesh.h
    trunk/Mogre/Mogre/include/auto/MogreRenderQueueSortingGrouping.h
    trunk/Mogre/Mogre/include/auto/MogreRenderTargetListener.h
    trunk/Mogre/Mogre/include/auto/MogreResource.h
    trunk/Mogre/Mogre/include/auto/MogreResourceGroupManager.h
    trunk/Mogre/Mogre/include/auto/MogreSceneManager.h
    trunk/Mogre/Mogre/include/auto/MogreSkeleton.h
    trunk/Mogre/Mogre/include/auto/MogreStaticGeometry.h
    trunk/Mogre/Mogre/include/auto/MogreStringInterface.h
    trunk/Mogre/Mogre/include/auto/MogreStringVector.h
    trunk/Mogre/Mogre/include/auto/MogreTechnique.h
    trunk/Mogre/Mogre/include/auto/MogreTexture.h
    trunk/Mogre/Mogre/include/auto/MogreTextureUnitState.h
    trunk/Mogre/Mogre/include/auto/MogreVertexIndexData.h
    trunk/Mogre/Mogre/src/Custom/MogreMatrix3.cpp
    trunk/Mogre/Mogre/src/auto/MogreAnimationState.cpp
    trunk/Mogre/Mogre/src/auto/MogreBlendMode.cpp
    trunk/Mogre/Mogre/src/auto/MogreHardwareVertexBuffer.cpp

Modified: trunk/Mogre/ChangeLog.txt
===================================================================
--- trunk/Mogre/ChangeLog.txt	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/ChangeLog.txt	2006-10-27 15:01:12 UTC (rev 60)
@@ -1,7 +1,10 @@
 ------------------------------------------------------------------------
 Changes since MOGRE v0.1.7
 ------------------------------------------------------------------------
---[FIX] VertexElement's overrided operator == didn't check for null parameters, fixed it.
+--[FIX] VertexElement's and Matrix3/4's overrided operator == didn't check for null parameters, fixed it.
+--[FIX] When a method returned a null Ogre::VertexElement*, a null reference exception was thrown; fixed it.
+--[Modified] Removed overrided operator == from all *_NativePtr classes. You must use the 'NativePtr' property directly
+	in order to compare pointers.
 --[Added] OgreDotNet's CeguiNet bindings, a CeguiNet renderer for Mogre and ported Ogre's Gui sample
 --[Added] MaterialSerializer and CompositorSerializer classes
 

Modified: trunk/Mogre/Mogre/include/Custom/MogreColourValue.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreColourValue.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/Custom/MogreColourValue.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -35,7 +35,7 @@
 	typedef Ogre::BGRA BGRA;
 
 	[StructLayout(LayoutKind::Sequential)]
-    public value class ColourValue
+	public value class ColourValue : IEquatable<ColourValue>
 	{
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_VALUECLASS( ColourValue )
@@ -60,6 +60,8 @@
 	    static bool operator==(ColourValue lhs, ColourValue rhs);
 	    static bool operator!=(ColourValue lhs, ColourValue rhs);
 
+		virtual bool Equals(ColourValue other) { return *this == other; }
+
         float r,g,b,a;
 
 	    /** Retrieves colour as RGBA.

Modified: trunk/Mogre/Mogre/include/Custom/MogreMath.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreMath.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/Custom/MogreMath.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -46,7 +46,7 @@
         Radian values are interchangeable with Degree values, and conversions
         will be done automatically between them.
     */
-	public value class Radian
+	public value class Radian : IEquatable<Radian>
 	{
 		Real mRad;
 
@@ -78,6 +78,8 @@
 		inline static bool operator >= ( Radian l, Radian r ) { return l.mRad >= r.mRad; }
 		inline static bool operator >  ( Radian l, Radian r ) { return l.mRad >  r.mRad; }
 
+		virtual bool Equals(Radian other) { return *this == other; }
+
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_VALUECLASS( Radian )
 	};
 
@@ -86,7 +88,7 @@
         Degree values are interchangeable with Radian values, and conversions
         will be done automatically between them.
     */
-	public value class Degree
+	public value class Degree : IEquatable<Degree>
 	{
 		Real mDeg;
 
@@ -118,6 +120,8 @@
 		inline static bool operator >= ( Degree l, Degree d ) { return l.mDeg >= d.mDeg; }
 		inline static bool operator >  ( Degree l, Degree d ) { return l.mDeg >  d.mDeg; }
 
+		virtual bool Equals(Degree other) { return *this == other; }
+
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_VALUECLASS( Degree )
 	};
 

Modified: trunk/Mogre/Mogre/include/Custom/MogreMatrix3.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreMatrix3.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/Custom/MogreMatrix3.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -148,6 +148,22 @@
 			return !(lmat == rkMatrix);
 		}
 
+		virtual bool Equals(Object^ obj) override
+		{
+			Matrix3^ clr = dynamic_cast<Matrix3^>(obj);
+			if (clr == CLR_NULL)
+			{
+				return false;
+			}
+
+			return (this == clr);
+		}
+		
+		bool Equals(Matrix3^ obj)
+		{
+			return (this == obj);
+		}
+
         // arithmetic operations
         static Matrix3^ operator+ (Matrix3^ lmat, Matrix3^ rkMatrix);
         static Matrix3^ operator- (Matrix3^ lmat, Matrix3^ rkMatrix);

Modified: trunk/Mogre/Mogre/include/Custom/MogreMatrix4.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreMatrix4.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/Custom/MogreMatrix4.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -353,6 +353,9 @@
         */
         inline static bool operator == ( Matrix4^ m1, Matrix4^ m2 )
         {
+			if ((Object^)m1 == (Object^)m2) return true;
+			if ((Object^)m1 == nullptr || (Object^)m2 == nullptr) return false;
+
             if( 
                 m1->m00 != m2->m00 || m1->m01 != m2->m01 || m1->m02 != m2->m02 || m1->m03 != m2->m03 ||
                 m1->m10 != m2->m10 || m1->m11 != m2->m11 || m1->m12 != m2->m12 || m1->m13 != m2->m13 ||
@@ -366,6 +369,9 @@
         */
         inline static bool operator != ( Matrix4^ m1, Matrix4^ m2 )
         {
+			if ((Object^)m1 == (Object^)m2) return false;
+			if ((Object^)m1 == nullptr || (Object^)m2 == nullptr) return true;
+
             if( 
                 m1->m00 != m2->m00 || m1->m01 != m2->m01 || m1->m02 != m2->m02 || m1->m03 != m2->m03 ||
                 m1->m10 != m2->m10 || m1->m11 != m2->m11 || m1->m12 != m2->m12 || m1->m13 != m2->m13 ||
@@ -375,6 +381,22 @@
             return false;
         }
 
+		virtual bool Equals(Object^ obj) override
+		{
+			Matrix4^ clr = dynamic_cast<Matrix4^>(obj);
+			if (clr == CLR_NULL)
+			{
+				return false;
+			}
+
+			return (this == clr);
+		}
+		
+		bool Equals(Matrix4^ obj)
+		{
+			return (this == obj);
+		}
+
         /** Assignment from 3x3 matrix.
         */
         inline void operator = ( Matrix3^ mat3 )

Modified: trunk/Mogre/Mogre/include/Custom/MogrePlane.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogrePlane.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/Custom/MogrePlane.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -44,7 +44,7 @@
             respectively), and a constant (D) which is the distance along
             the normal you have to go to move the plane back to the origin.
      */
-    public value class Plane
+	public value class Plane : IEquatable<Plane>
     {
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_VALUECLASS( Plane )
@@ -104,6 +104,8 @@
             return (rhs.d != lhs.d || rhs.normal != lhs.normal);
         }
 
+		virtual bool Equals(Plane other) { return *this == other; }
+
         virtual String^ ToString() override;
     };
 }
\ No newline at end of file

Modified: trunk/Mogre/Mogre/include/Custom/MogreQuaternion.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreQuaternion.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/Custom/MogreQuaternion.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -49,7 +49,7 @@
 
     /** Implementation of a Quaternion, i.e. a rotation around an axis.
     */
-    public value class Quaternion
+	public value class Quaternion : IEquatable<Quaternion>
     {
     public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_VALUECLASS( Quaternion )
@@ -158,7 +158,10 @@
 		{
 			return !(lhs == rhs);
 		}
-        // functions of a quaternion
+
+		virtual bool Equals(Quaternion other) { return *this == other; }
+
+		// functions of a quaternion
         Real Dot (Quaternion rkQ);  // dot product
 		property Real Norm  // squared-length
 		{

Modified: trunk/Mogre/Mogre/include/Custom/MogreVector2.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreVector2.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/Custom/MogreVector2.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -36,7 +36,7 @@
             scaling factors can be represented by a vector, depending on how
             you interpret the values.
     */
-    public value class Vector2
+	public value class Vector2 : IEquatable<Vector2>
     {
     public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_VALUECLASS( Vector2 )
@@ -98,7 +98,9 @@
             return ( lvec.x != rkVector.x || lvec.y != rkVector.y  );
         }
 
-        // arithmetic operations
+		virtual bool Equals(Vector2 other) { return *this == other; }
+
+		// arithmetic operations
         inline static Vector2 operator + ( Vector2 lvec, Vector2 rkVector )
         {
             Vector2 kSum;

Modified: trunk/Mogre/Mogre/include/Custom/MogreVector3.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreVector3.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/Custom/MogreVector3.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -39,7 +39,7 @@
             scaling factors can be represented by a vector, depending on how
             you interpret the values.
     */
-    public value class Vector3
+	public value class Vector3 : IEquatable<Vector3>
     {
     public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_VALUECLASS( Vector3 )
@@ -104,6 +104,8 @@
             return ( lvec.x != rvec.x || lvec.y != rvec.y || lvec.z != rvec.z );
         }
 
+		virtual bool Equals(Vector3 other) { return *this == other; }
+
 		// arithmetic operations
 		inline static Vector3 operator + ( Vector3 lvec, Vector3 rvec)
         {

Modified: trunk/Mogre/Mogre/include/Custom/MogreVector4.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreVector4.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/Custom/MogreVector4.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -31,7 +31,7 @@
 {
     /** 4-dimensional homogenous vector.
     */
-    public value class Vector4
+	public value class Vector4 : IEquatable<Vector4>
     {
     public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_VALUECLASS( Vector4 )
@@ -105,6 +105,8 @@
                 lvec.w != rkVector.w );
         }
 
+		virtual bool Equals(Vector4 other) { return *this == other; }
+
         inline static operator Vector4 (Vector3 rhs)
         {
 			Vector4 vec;

Modified: trunk/Mogre/Mogre/include/Custom/MogreVertexElement.i
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreVertexElement.i	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/Custom/MogreVertexElement.i	2006-10-27 15:01:12 UTC (rev 60)
@@ -21,7 +21,10 @@
 	
 	static operator VertexElement^ (const Ogre::VertexElement* pelem)
 	{
-		return (pelem) ? *pelem : (VertexElement^)nullptr;
+		if (pelem)
+			return (VertexElement^) *pelem;
+		else
+			return nullptr;
 	}
 	
 	static operator Ogre::VertexElement (VertexElement^ elem)
@@ -121,31 +124,26 @@
 		static VertexElementType get();
 	}
 
-	virtual bool Equals(Object^ obj) override
-	{
-		if (obj == CLR_NULL)
-		{
-			return false;
-		}
-
-		VertexElement^ clr = dynamic_cast<VertexElement^>(obj);
-		if (clr == CLR_NULL)
-		{
-			return false;
-		}
-
-		return (this == clr);
-	}
-	
-	bool Equals(VertexElement^ obj)
-	{
-		return (this == obj);
-	}
+	virtual bool Equals(Object^ obj) override
+	{
+		VertexElement^ clr = dynamic_cast<VertexElement^>(obj);
+		if (clr == CLR_NULL)
+		{
+			return false;
+		}
 
+		return (this == clr);
+	}
+	
+	bool Equals(VertexElement^ obj)
+	{
+		return (this == obj);
+	}
+
     inline static bool operator== (VertexElement^ lhs, VertexElement^ rhs)
     {
-		if ((Object^)lhs == (Object^)rhs) return true;
-		if ((Object^)lhs == nullptr || (Object^)rhs == nullptr) return false;
+		if ((Object^)lhs == (Object^)rhs) return true;
+		if ((Object^)lhs == nullptr || (Object^)rhs == nullptr) return false;
 			
         if (lhs->mType != rhs->mType ||
             lhs->mIndex != rhs->mIndex ||

Modified: trunk/Mogre/Mogre/include/STLDeque.h
===================================================================
--- trunk/Mogre/Mogre/include/STLDeque.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/STLDeque.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -90,14 +90,28 @@
 			void set(M value);														\
 		}																			\
 																					\
+		virtual bool Equals(Object^ obj) override									\
+		{																			\
+			Iterator^ clr = dynamic_cast<Iterator^>(obj);							\
+			if (clr == CLR_NULL)													\
+			{																		\
+				return false;														\
+			}																		\
+																					\
+			return (this == clr);													\
+		}																			\
+																					\
 		inline static bool operator ==(Iterator^ it1, Iterator^ it2)				\
 		{																			\
+			if ((Object^)it1 == (Object^)it2) return true;							\
+			if ((Object^)it1 == nullptr || (Object^)it2 == nullptr) return false;	\
+																					\
 			return (*it1->_native) == (*it2->_native);								\
 		}																			\
 																					\
 		inline static bool operator !=(Iterator^ it1, Iterator^ it2)				\
 		{																			\
-			return (*it1->_native) != (*it2->_native);								\
+			return !(it1 == it2);													\
 		}																			\
 																					\
 		inline static Iterator^ operator ++(Iterator^ it)							\
@@ -388,14 +402,28 @@
 			M get();																\
 		}																			\
 																					\
+		virtual bool Equals(Object^ obj) override									\
+		{																			\
+			ConstIterator^ clr = dynamic_cast<ConstIterator^>(obj);					\
+			if (clr == CLR_NULL)													\
+			{																		\
+				return false;														\
+			}																		\
+																					\
+			return (this == clr);													\
+		}																			\
+																					\
 		inline static bool operator ==(ConstIterator^ it1, ConstIterator^ it2)		\
 		{																			\
+			if ((Object^)it1 == (Object^)it2) return true;							\
+			if ((Object^)it1 == nullptr || (Object^)it2 == nullptr) return false;	\
+																					\
 			return (*it1->_native) == (*it2->_native);								\
 		}																			\
 																					\
 		inline static bool operator !=(ConstIterator^ it1, ConstIterator^ it2)		\
 		{																			\
-			return (*it1->_native) != (*it2->_native);								\
+			return !(it1 == it2);													\
 		}																			\
 																					\
 		inline static ConstIterator^ operator ++(ConstIterator^ it)					\

Modified: trunk/Mogre/Mogre/include/STLHashMap.h
===================================================================
--- trunk/Mogre/Mogre/include/STLHashMap.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/STLHashMap.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -94,14 +94,28 @@
 			void set(MV value);														\
 		}																			\
 																					\
+		virtual bool Equals(Object^ obj) override									\
+		{																			\
+			Iterator^ clr = dynamic_cast<Iterator^>(obj);							\
+			if (clr == CLR_NULL)													\
+			{																		\
+				return false;														\
+			}																		\
+																					\
+			return (this == clr);													\
+		}																			\
+																					\
 		inline static bool operator ==(Iterator^ it1, Iterator^ it2)				\
 		{																			\
+			if ((Object^)it1 == (Object^)it2) return true;							\
+			if ((Object^)it1 == nullptr || (Object^)it2 == nullptr) return false;	\
+																					\
 			return (*it1->_native) == (*it2->_native);								\
 		}																			\
 																					\
 		inline static bool operator !=(Iterator^ it1, Iterator^ it2)				\
 		{																			\
-			return (*it1->_native) != (*it2->_native);								\
+			return !(it1 == it2);													\
 		}																			\
 																					\
 		inline static Iterator^ operator ++(Iterator^ it)							\
@@ -364,14 +378,28 @@
 			MV get();																\
 		}																			\
 																					\
+		virtual bool Equals(Object^ obj) override									\
+		{																			\
+			ConstIterator^ clr = dynamic_cast<ConstIterator^>(obj);					\
+			if (clr == CLR_NULL)													\
+			{																		\
+				return false;														\
+			}																		\
+																					\
+			return (this == clr);													\
+		}																			\
+																					\
 		inline static bool operator ==(ConstIterator^ it1, ConstIterator^ it2)		\
 		{																			\
+			if ((Object^)it1 == (Object^)it2) return true;							\
+			if ((Object^)it1 == nullptr || (Object^)it2 == nullptr) return false;	\
+																					\
 			return (*it1->_native) == (*it2->_native);								\
 		}																			\
 																					\
 		inline static bool operator !=(ConstIterator^ it1, ConstIterator^ it2)		\
 		{																			\
-			return (*it1->_native) != (*it2->_native);								\
+			return !(it1 == it2);													\
 		}																			\
 																					\
 		inline static ConstIterator^ operator ++(ConstIterator^ it)					\

Modified: trunk/Mogre/Mogre/include/STLList.h
===================================================================
--- trunk/Mogre/Mogre/include/STLList.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/STLList.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -110,14 +110,28 @@
 			void set(M value);														\
 		}																			\
 																					\
+		virtual bool Equals(Object^ obj) override									\
+		{																			\
+			Iterator^ clr = dynamic_cast<Iterator^>(obj);							\
+			if (clr == CLR_NULL)													\
+			{																		\
+				return false;														\
+			}																		\
+																					\
+			return (this == clr);													\
+		}																			\
+																					\
 		inline static bool operator ==(Iterator^ it1, Iterator^ it2)				\
 		{																			\
+			if ((Object^)it1 == (Object^)it2) return true;							\
+			if ((Object^)it1 == nullptr || (Object^)it2 == nullptr) return false;	\
+																					\
 			return (*it1->_native) == (*it2->_native);								\
 		}																			\
 																					\
 		inline static bool operator !=(Iterator^ it1, Iterator^ it2)				\
 		{																			\
-			return (*it1->_native) != (*it2->_native);								\
+			return !(it1 == it2);													\
 		}																			\
 																					\
 		inline static Iterator^ operator ++(Iterator^ it)							\
@@ -394,14 +408,28 @@
 			M get();																\
 		}																			\
 																					\
+		virtual bool Equals(Object^ obj) override									\
+		{																			\
+			ConstIterator^ clr = dynamic_cast<ConstIterator^>(obj);					\
+			if (clr == CLR_NULL)													\
+			{																		\
+				return false;														\
+			}																		\
+																					\
+			return (this == clr);													\
+		}																			\
+																					\
 		inline static bool operator ==(ConstIterator^ it1, ConstIterator^ it2)		\
 		{																			\
+			if ((Object^)it1 == (Object^)it2) return true;							\
+			if ((Object^)it1 == nullptr || (Object^)it2 == nullptr) return false;	\
+																					\
 			return (*it1->_native) == (*it2->_native);								\
 		}																			\
 																					\
 		inline static bool operator !=(ConstIterator^ it1, ConstIterator^ it2)		\
 		{																			\
-			return (*it1->_native) != (*it2->_native);								\
+			return !(it1 == it2);													\
 		}																			\
 																					\
 		inline static ConstIterator^ operator ++(ConstIterator^ it)					\

Modified: trunk/Mogre/Mogre/include/STLMap.h
===================================================================
--- trunk/Mogre/Mogre/include/STLMap.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/STLMap.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -94,14 +94,28 @@
 			void set(MV value);														\
 		}																			\
 																					\
+		virtual bool Equals(Object^ obj) override									\
+		{																			\
+			Iterator^ clr = dynamic_cast<Iterator^>(obj);							\
+			if (clr == CLR_NULL)													\
+			{																		\
+				return false;														\
+			}																		\
+																					\
+			return (this == clr);													\
+		}																			\
+																					\
 		inline static bool operator ==(Iterator^ it1, Iterator^ it2)				\
 		{																			\
+			if ((Object^)it1 == (Object^)it2) return true;							\
+			if ((Object^)it1 == nullptr || (Object^)it2 == nullptr) return false;	\
+																					\
 			return (*it1->_native) == (*it2->_native);								\
 		}																			\
 																					\
 		inline static bool operator !=(Iterator^ it1, Iterator^ it2)				\
 		{																			\
-			return (*it1->_native) != (*it2->_native);								\
+			return !(it1 == it2);													\
 		}																			\
 																					\
 		inline static Iterator^ operator ++(Iterator^ it)							\
@@ -364,14 +378,28 @@
 			MV get();																\
 		}																			\
 																					\
+		virtual bool Equals(Object^ obj) override									\
+		{																			\
+			ConstIterator^ clr = dynamic_cast<ConstIterator^>(obj);					\
+			if (clr == CLR_NULL)													\
+			{																		\
+				return false;														\
+			}																		\
+																					\
+			return (this == clr);													\
+		}																			\
+																					\
 		inline static bool operator ==(ConstIterator^ it1, ConstIterator^ it2)		\
 		{																			\
+			if ((Object^)it1 == (Object^)it2) return true;							\
+			if ((Object^)it1 == nullptr || (Object^)it2 == nullptr) return false;	\
+																					\
 			return (*it1->_native) == (*it2->_native);								\
 		}																			\
 																					\
 		inline static bool operator !=(ConstIterator^ it1, ConstIterator^ it2)		\
 		{																			\
-			return (*it1->_native) != (*it2->_native);								\
+			return !(it1 == it2);													\
 		}																			\
 																					\
 		inline static ConstIterator^ operator ++(ConstIterator^ it)					\

Modified: trunk/Mogre/Mogre/include/STLMultiMap.h
===================================================================
--- trunk/Mogre/Mogre/include/STLMultiMap.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/STLMultiMap.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -94,14 +94,28 @@
 			void set(MV value);														\
 		}																			\
 																					\
+		virtual bool Equals(Object^ obj) override									\
+		{																			\
+			Iterator^ clr = dynamic_cast<Iterator^>(obj);							\
+			if (clr == CLR_NULL)													\
+			{																		\
+				return false;														\
+			}																		\
+																					\
+			return (this == clr);													\
+		}																			\
+																					\
 		inline static bool operator ==(Iterator^ it1, Iterator^ it2)				\
 		{																			\
+			if ((Object^)it1 == (Object^)it2) return true;							\
+			if ((Object^)it1 == nullptr || (Object^)it2 == nullptr) return false;	\
+																					\
 			return (*it1->_native) == (*it2->_native);								\
 		}																			\
 																					\
 		inline static bool operator !=(Iterator^ it1, Iterator^ it2)				\
 		{																			\
-			return (*it1->_native) != (*it2->_native);								\
+			return !(it1 == it2);													\
 		}																			\
 																					\
 		inline static Iterator^ operator ++(Iterator^ it)							\
@@ -364,14 +378,28 @@
 			MV get();																\
 		}																			\
 																					\
+		virtual bool Equals(Object^ obj) override									\
+		{																			\
+			ConstIterator^ clr = dynamic_cast<ConstIterator^>(obj);					\
+			if (clr == CLR_NULL)													\
+			{																		\
+				return false;														\
+			}																		\
+																					\
+			return (this == clr);													\
+		}																			\
+																					\
 		inline static bool operator ==(ConstIterator^ it1, ConstIterator^ it2)		\
 		{																			\
+			if ((Object^)it1 == (Object^)it2) return true;							\
+			if ((Object^)it1 == nullptr || (Object^)it2 == nullptr) return false;	\
+																					\
 			return (*it1->_native) == (*it2->_native);								\
 		}																			\
 																					\
 		inline static bool operator !=(ConstIterator^ it1, ConstIterator^ it2)		\
 		{																			\
-			return (*it1->_native) != (*it2->_native);								\
+			return !(it1 == it2);													\
 		}																			\
 																					\
 		inline static ConstIterator^ operator ++(ConstIterator^ it)					\

Modified: trunk/Mogre/Mogre/include/STLMultiSet.h
===================================================================
--- trunk/Mogre/Mogre/include/STLMultiSet.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/STLMultiSet.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -90,14 +90,28 @@
 			void set(M value);														\
 		}																			\
 																					\
+		virtual bool Equals(Object^ obj) override									\
+		{																			\
+			Iterator^ clr = dynamic_cast<Iterator^>(obj);							\
+			if (clr == CLR_NULL)													\
+			{																		\
+				return false;														\
+			}																		\
+																					\
+			return (this == clr);													\
+		}																			\
+																					\
 		inline static bool operator ==(Iterator^ it1, Iterator^ it2)				\
 		{																			\
+			if ((Object^)it1 == (Object^)it2) return true;							\
+			if ((Object^)it1 == nullptr || (Object^)it2 == nullptr) return false;	\
+																					\
 			return (*it1->_native) == (*it2->_native);								\
 		}																			\
 																					\
 		inline static bool operator !=(Iterator^ it1, Iterator^ it2)				\
 		{																			\
-			return (*it1->_native) != (*it2->_native);								\
+			return !(it1 == it2);													\
 		}																			\
 																					\
 		inline static Iterator^ operator ++(Iterator^ it)							\
@@ -354,14 +368,28 @@
 			M get();																\
 		}																			\
 																					\
+		virtual bool Equals(Object^ obj) override									\
+		{																			\
+			ConstIterator^ clr = dynamic_cast<ConstIterator^>(obj);					\
+			if (clr == CLR_NULL)													\
+			{																		\
+				return false;														\
+			}																		\
+																					\
+			return (this == clr);													\
+		}																			\
+																					\
 		inline static bool operator ==(ConstIterator^ it1, ConstIterator^ it2)		\
 		{																			\
+			if ((Object^)it1 == (Object^)it2) return true;							\
+			if ((Object^)it1 == nullptr || (Object^)it2 == nullptr) return false;	\
+																					\
 			return (*it1->_native) == (*it2->_native);								\
 		}																			\
 																					\
 		inline static bool operator !=(ConstIterator^ it1, ConstIterator^ it2)		\
 		{																			\
-			return (*it1->_native) != (*it2->_native);								\
+			return !(it1 == it2);													\
 		}																			\
 																					\
 		inline static ConstIterator^ operator ++(ConstIterator^ it)					\

Modified: trunk/Mogre/Mogre/include/STLSet.h
===================================================================
--- trunk/Mogre/Mogre/include/STLSet.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/STLSet.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -90,14 +90,28 @@
 			void set(M value);														\
 		}																			\
 																					\
+		virtual bool Equals(Object^ obj) override									\
+		{																			\
+			Iterator^ clr = dynamic_cast<Iterator^>(obj);							\
+			if (clr == CLR_NULL)													\
+			{																		\
+				return false;														\
+			}																		\
+																					\
+			return (this == clr);													\
+		}																			\
+																					\
 		inline static bool operator ==(Iterator^ it1, Iterator^ it2)				\
 		{																			\
+			if ((Object^)it1 == (Object^)it2) return true;							\
+			if ((Object^)it1 == nullptr || (Object^)it2 == nullptr) return false;	\
+																					\
 			return (*it1->_native) == (*it2->_native);								\
 		}																			\
 																					\
 		inline static bool operator !=(Iterator^ it1, Iterator^ it2)				\
 		{																			\
-			return (*it1->_native) != (*it2->_native);								\
+			return !(it1 == it2);													\
 		}																			\
 																					\
 		inline static Iterator^ operator ++(Iterator^ it)							\
@@ -352,14 +366,28 @@
 			M get();																\
 		}																			\
 																					\
+		virtual bool Equals(Object^ obj) override									\
+		{																			\
+			ConstIterator^ clr = dynamic_cast<ConstIterator^>(obj);					\
+			if (clr == CLR_NULL)													\
+			{																		\
+				return false;														\
+			}																		\
+																					\
+			return (this == clr);													\
+		}																			\
+																					\
 		inline static bool operator ==(ConstIterator^ it1, ConstIterator^ it2)		\
 		{																			\
+			if ((Object^)it1 == (Object^)it2) return true;							\
+			if ((Object^)it1 == nullptr || (Object^)it2 == nullptr) return false;	\
+																					\
 			return (*it1->_native) == (*it2->_native);								\
 		}																			\
 																					\
 		inline static bool operator !=(ConstIterator^ it1, ConstIterator^ it2)		\
 		{																			\
-			return (*it1->_native) != (*it2->_native);								\
+			return !(it1 == it2);													\
 		}																			\
 																					\
 		inline static ConstIterator^ operator ++(ConstIterator^ it)					\

Modified: trunk/Mogre/Mogre/include/STLVector.h
===================================================================
--- trunk/Mogre/Mogre/include/STLVector.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/STLVector.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -90,14 +90,28 @@
 			void set(M value);														\
 		}																			\
 																					\
+		virtual bool Equals(Object^ obj) override									\
+		{																			\
+			Iterator^ clr = dynamic_cast<Iterator^>(obj);							\
+			if (clr == CLR_NULL)													\
+			{																		\
+				return false;														\
+			}																		\
+																					\
+			return (this == clr);													\
+		}																			\
+																					\
 		inline static bool operator ==(Iterator^ it1, Iterator^ it2)				\
 		{																			\
+			if ((Object^)it1 == (Object^)it2) return true;							\
+			if ((Object^)it1 == nullptr || (Object^)it2 == nullptr) return false;	\
+																					\
 			return (*it1->_native) == (*it2->_native);								\
 		}																			\
 																					\
 		inline static bool operator !=(Iterator^ it1, Iterator^ it2)				\
 		{																			\
-			return (*it1->_native) != (*it2->_native);								\
+			return !(it1 == it2);													\
 		}																			\
 																					\
 		inline static Iterator^ operator ++(Iterator^ it)							\
@@ -392,14 +406,28 @@
 			M get();																\
 		}																			\
 																					\
+		virtual bool Equals(Object^ obj) override									\
+		{																			\
+			ConstIterator^ clr = dynamic_cast<ConstIterator^>(obj);					\
+			if (clr == CLR_NULL)													\
+			{																		\
+				return false;														\
+			}																		\
+																					\
+			return (this == clr);													\
+		}																			\
+																					\
 		inline static bool operator ==(ConstIterator^ it1, ConstIterator^ it2)		\
 		{																			\
+			if ((Object^)it1 == (Object^)it2) return true;							\
+			if ((Object^)it1 == nullptr || (Object^)it2 == nullptr) return false;	\
+																					\
 			return (*it1->_native) == (*it2->_native);								\
 		}																			\
 																					\
 		inline static bool operator !=(ConstIterator^ it1, ConstIterator^ it2)		\
 		{																			\
-			return (*it1->_native) != (*it2->_native);								\
+			return !(it1 == it2);													\
 		}																			\
 																					\
 		inline static ConstIterator^ operator ++(ConstIterator^ it)					\

Modified: trunk/Mogre/Mogre/include/auto/MogreAnimable.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreAnimable.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreAnimable.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -224,11 +224,6 @@
 	
 		virtual bool Equals(Object^ obj) override
 		{
-			if (obj == CLR_NULL)
-			{
-				return false;
-			}
-	
 			AnimableValuePtr^ clr = dynamic_cast<AnimableValuePtr^>(obj);
 			if (clr == CLR_NULL)
 			{

Modified: trunk/Mogre/Mogre/include/auto/MogreAnimationState.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreAnimationState.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreAnimationState.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -92,9 +92,14 @@
 	
 		virtual bool Equals(Object^ obj) override;
 		bool Equals(AnimationState^ obj);
+		static bool operator == (AnimationState^ obj1, AnimationState^ obj2);
+		static bool operator != (AnimationState^ obj1, AnimationState^ obj2);
 	
 		void CopyTo(AnimationState^ dest)
 		{
+			if (_native == NULL) throw gcnew Exception("The underlying native object for the caller is null.");
+			if (dest->_native == NULL) throw gcnew ArgumentException("The underlying native object for parameter 'dest' is null.");
+	
 			*(dest->_native) = *_native;
 		}
 	

Modified: trunk/Mogre/Mogre/include/auto/MogreArchive.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreArchive.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreArchive.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -69,9 +69,10 @@
 	
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_NATIVEPTRVALUECLASS( FileInfo_NativePtr, Ogre::FileInfo )
 	
-		property Ogre::FileInfo* NativePtr
+	
+		property IntPtr NativePtr
 		{
-			Ogre::FileInfo* get() { return _native; }
+			IntPtr get() { return (IntPtr)_native; }
 		}
 	
 		static FileInfo_NativePtr Create();
@@ -86,16 +87,6 @@
 			bool get() { return (_native == 0); }
 		}
 	
-		static bool operator == (FileInfo_NativePtr val1, FileInfo_NativePtr val2)
-		{
-			return (val1._native == val2._native);
-		}
-	
-		static bool operator != (FileInfo_NativePtr val1, FileInfo_NativePtr val2)
-		{
-			return (val1._native != val2._native);
-		}
-	
 		//Protected Declarations
 	protected public:
 	
@@ -141,11 +132,6 @@
 	
 		virtual bool Equals(Object^ obj) override
 		{
-			if (obj == CLR_NULL)
-			{
-				return false;
-			}
-	
 			FileInfoListPtr^ clr = dynamic_cast<FileInfoListPtr^>(obj);
 			if (clr == CLR_NULL)
 			{

Modified: trunk/Mogre/Mogre/include/auto/MogreBillboardChain.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreBillboardChain.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreBillboardChain.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -81,9 +81,10 @@
 	
 			DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_NATIVEPTRVALUECLASS( BillboardChain::Element_NativePtr, Ogre::BillboardChain::Element )
 	
-			property Ogre::BillboardChain::Element* NativePtr
+	
+			property IntPtr NativePtr
 			{
-				Ogre::BillboardChain::Element* get() { return _native; }
+				IntPtr get() { return (IntPtr)_native; }
 			}
 	
 			static Element_NativePtr Create( );
@@ -99,16 +100,6 @@
 				bool get() { return (_native == 0); }
 			}
 	
-			static bool operator == (Element_NativePtr val1, Element_NativePtr val2)
-			{
-				return (val1._native == val2._native);
-			}
-	
-			static bool operator != (Element_NativePtr val1, Element_NativePtr val2)
-			{
-				return (val1._native != val2._native);
-			}
-	
 			//Protected Declarations
 		protected public:
 	

Modified: trunk/Mogre/Mogre/include/auto/MogreBlendMode.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreBlendMode.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreBlendMode.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -166,13 +166,23 @@
 	
 		virtual bool Equals(Object^ obj) override;
 		bool Equals(LayerBlendModeEx_NativePtr obj);
+		static bool operator == (LayerBlendModeEx_NativePtr obj1, LayerBlendModeEx_NativePtr obj2);
+		static bool operator != (LayerBlendModeEx_NativePtr obj1, LayerBlendModeEx_NativePtr obj2);
 	
+		void CopyTo(LayerBlendModeEx_NativePtr dest)
+		{
+			if (_native == NULL) throw gcnew Exception("The underlying native object for the caller is null.");
+			if (dest._native == NULL) throw gcnew ArgumentException("The underlying native object for parameter 'dest' is null.");
 	
+			*(dest._native) = *_native;
+		}
+	
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_NATIVEPTRVALUECLASS( LayerBlendModeEx_NativePtr, Ogre::LayerBlendModeEx )
 	
-		property Ogre::LayerBlendModeEx* NativePtr
+	
+		property IntPtr NativePtr
 		{
-			Ogre::LayerBlendModeEx* get() { return _native; }
+			IntPtr get() { return (IntPtr)_native; }
 		}
 	
 		static LayerBlendModeEx_NativePtr Create();
@@ -187,16 +197,6 @@
 			bool get() { return (_native == 0); }
 		}
 	
-		static bool operator == (LayerBlendModeEx_NativePtr val1, LayerBlendModeEx_NativePtr val2)
-		{
-			return (val1._native == val2._native);
-		}
-	
-		static bool operator != (LayerBlendModeEx_NativePtr val1, LayerBlendModeEx_NativePtr val2)
-		{
-			return (val1._native != val2._native);
-		}
-	
 		//Protected Declarations
 	protected public:
 	

Modified: trunk/Mogre/Mogre/include/auto/MogreCodec.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreCodec.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreCodec.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -85,11 +85,6 @@
 	
 			virtual bool Equals(Object^ obj) override
 			{
-				if (obj == CLR_NULL)
-				{
-					return false;
-				}
-	
 				CodecDataPtr^ clr = dynamic_cast<CodecDataPtr^>(obj);
 				if (clr == CLR_NULL)
 				{

Modified: trunk/Mogre/Mogre/include/auto/MogreCompositionTechnique.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreCompositionTechnique.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreCompositionTechnique.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -72,9 +72,10 @@
 	
 			DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_NATIVEPTRVALUECLASS( CompositionTechnique::TextureDefinition_NativePtr, Ogre::CompositionTechnique::TextureDefinition )
 	
-			property Ogre::CompositionTechnique::TextureDefinition* NativePtr
+	
+			property IntPtr NativePtr
 			{
-				Ogre::CompositionTechnique::TextureDefinition* get() { return _native; }
+				IntPtr get() { return (IntPtr)_native; }
 			}
 	
 			static TextureDefinition_NativePtr Create( );
@@ -89,16 +90,6 @@
 				bool get() { return (_native == 0); }
 			}
 	
-			static bool operator == (TextureDefinition_NativePtr val1, TextureDefinition_NativePtr val2)
-			{
-				return (val1._native == val2._native);
-			}
-	
-			static bool operator != (TextureDefinition_NativePtr val1, TextureDefinition_NativePtr val2)
-			{
-				return (val1._native != val2._native);
-			}
-	
 			//Protected Declarations
 		protected public:
 	

Modified: trunk/Mogre/Mogre/include/auto/MogreCompositor.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreCompositor.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreCompositor.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -115,11 +115,6 @@
 	
 		virtual bool Equals(Object^ obj) override
 		{
-			if (obj == CLR_NULL)
-			{
-				return false;
-			}
-	
 			CompositorPtr^ clr = dynamic_cast<CompositorPtr^>(obj);
 			if (clr == CLR_NULL)
 			{

Modified: trunk/Mogre/Mogre/include/auto/MogreConfigOptionMap.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreConfigOptionMap.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreConfigOptionMap.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -61,9 +61,10 @@
 	
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_NATIVEPTRVALUECLASS( ConfigOption_NativePtr, Ogre::_ConfigOption )
 	
-		property Ogre::_ConfigOption* NativePtr
+	
+		property IntPtr NativePtr
 		{
-			Ogre::_ConfigOption* get() { return _native; }
+			IntPtr get() { return (IntPtr)_native; }
 		}
 	
 		static ConfigOption_NativePtr Create();
@@ -78,16 +79,6 @@
 			bool get() { return (_native == 0); }
 		}
 	
-		static bool operator == (ConfigOption_NativePtr val1, ConfigOption_NativePtr val2)
-		{
-			return (val1._native == val2._native);
-		}
-	
-		static bool operator != (ConfigOption_NativePtr val1, ConfigOption_NativePtr val2)
-		{
-			return (val1._native != val2._native);
-		}
-	
 		//Protected Declarations
 	protected public:
 	

Modified: trunk/Mogre/Mogre/include/auto/MogreDataStream.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreDataStream.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreDataStream.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -187,11 +187,6 @@
 	
 		virtual bool Equals(Object^ obj) override
 		{
-			if (obj == CLR_NULL)
-			{
-				return false;
-			}
-	
 			DataStreamPtr^ clr = dynamic_cast<DataStreamPtr^>(obj);
 			if (clr == CLR_NULL)
 			{
@@ -306,11 +301,6 @@
 	
 		virtual bool Equals(Object^ obj) override
 		{
-			if (obj == CLR_NULL)
-			{
-				return false;
-			}
-	
 			DataStreamListPtr^ clr = dynamic_cast<DataStreamListPtr^>(obj);
 			if (clr == CLR_NULL)
 			{
@@ -419,11 +409,6 @@
 	
 		virtual bool Equals(Object^ obj) override
 		{
-			if (obj == CLR_NULL)
-			{
-				return false;
-			}
-	
 			MemoryDataStreamPtr^ clr = dynamic_cast<MemoryDataStreamPtr^>(obj);
 			if (clr == CLR_NULL)
 			{

Modified: trunk/Mogre/Mogre/include/auto/MogreEdgeListBuilder.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreEdgeListBuilder.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreEdgeListBuilder.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -65,9 +65,10 @@
 	
 			DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_NATIVEPTRVALUECLASS( EdgeData::Edge_NativePtr, Ogre::EdgeData::Edge )
 	
-			property Ogre::EdgeData::Edge* NativePtr
+	
+			property IntPtr NativePtr
 			{
-				Ogre::EdgeData::Edge* get() { return _native; }
+				IntPtr get() { return (IntPtr)_native; }
 			}
 	
 			static Edge_NativePtr Create();
@@ -82,16 +83,6 @@
 				bool get() { return (_native == 0); }
 			}
 	
-			static bool operator == (Edge_NativePtr val1, Edge_NativePtr val2)
-			{
-				return (val1._native == val2._native);
-			}
-	
-			static bool operator != (Edge_NativePtr val1, Edge_NativePtr val2)
-			{
-				return (val1._native != val2._native);
-			}
-	
 			//Protected Declarations
 		protected public:
 	
@@ -140,9 +131,10 @@
 	
 			DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_NATIVEPTRVALUECLASS( EdgeData::EdgeGroup_NativePtr, Ogre::EdgeData::EdgeGroup )
 	
-			property Ogre::EdgeData::EdgeGroup* NativePtr
+	
+			property IntPtr NativePtr
 			{
-				Ogre::EdgeData::EdgeGroup* get() { return _native; }
+				IntPtr get() { return (IntPtr)_native; }
 			}
 	
 			static EdgeGroup_NativePtr Create();
@@ -157,16 +149,6 @@
 				bool get() { return (_native == 0); }
 			}
 	
-			static bool operator == (EdgeGroup_NativePtr val1, EdgeGroup_NativePtr val2)
-			{
-				return (val1._native == val2._native);
-			}
-	
-			static bool operator != (EdgeGroup_NativePtr val1, EdgeGroup_NativePtr val2)
-			{
-				return (val1._native != val2._native);
-			}
-	
 			//Protected Declarations
 		protected public:
 	
@@ -237,9 +219,10 @@
 	
 			DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_NATIVEPTRVALUECLASS( EdgeData::Triangle_NativePtr, Ogre::EdgeData::Triangle )
 	
-			property Ogre::EdgeData::Triangle* NativePtr
+	
+			property IntPtr NativePtr
 			{
-				Ogre::EdgeData::Triangle* get() { return _native; }
+				IntPtr get() { return (IntPtr)_native; }
 			}
 	
 			static Triangle_NativePtr Create();
@@ -254,16 +237,6 @@
 				bool get() { return (_native == 0); }
 			}
 	
-			static bool operator == (Triangle_NativePtr val1, Triangle_NativePtr val2)
-			{
-				return (val1._native == val2._native);
-			}
-	
-			static bool operator != (Triangle_NativePtr val1, Triangle_NativePtr val2)
-			{
-				return (val1._native != val2._native);
-			}
-	
 			//Protected Declarations
 		protected public:
 	

Modified: trunk/Mogre/Mogre/include/auto/MogreException.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreException.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreException.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -115,6 +115,9 @@
 	
 		void CopyTo(OgreException^ dest)
 		{
+			if (_native == NULL) throw gcnew Exception("The underlying native object for the caller is null.");
+			if (dest->_native == NULL) throw gcnew ArgumentException("The underlying native object for parameter 'dest' is null.");
+	
 			*(dest->_native) = *_native;
 		}
 	

Modified: trunk/Mogre/Mogre/include/auto/MogreFont.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreFont.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreFont.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -146,11 +146,6 @@
 	
 		virtual bool Equals(Object^ obj) override
 		{
-			if (obj == CLR_NULL)
-			{
-				return false;
-			}
-	
 			FontPtr^ clr = dynamic_cast<FontPtr^>(obj);
 			if (clr == CLR_NULL)
 			{

Modified: trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -179,9 +179,10 @@
 	
 			DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_NATIVEPTRVALUECLASS( GpuProgramParameters::AutoConstantDefinition_NativePtr, Ogre::GpuProgramParameters::AutoConstantDefinition )
 	
-			property Ogre::GpuProgramParameters::AutoConstantDefinition* NativePtr
+	
+			property IntPtr NativePtr
 			{
-				Ogre::GpuProgramParameters::AutoConstantDefinition* get() { return _native; }
+				IntPtr get() { return (IntPtr)_native; }
 			}
 	
 			static AutoConstantDefinition_NativePtr Create( Mogre::GpuProgramParameters::AutoConstantType _acType, String^ _name, size_t _elementCount, Mogre::GpuProgramParameters::ElementType _elementType, Mogre::GpuProgramParameters::ACDataType _dataType );
@@ -196,16 +197,6 @@
 				bool get() { return (_native == 0); }
 			}
 	
-			static bool operator == (AutoConstantDefinition_NativePtr val1, AutoConstantDefinition_NativePtr val2)
-			{
-				return (val1._native == val2._native);
-			}
-	
-			static bool operator != (AutoConstantDefinition_NativePtr val1, AutoConstantDefinition_NativePtr val2)
-			{
-				return (val1._native != val2._native);
-			}
-	
 			//Protected Declarations
 		protected public:
 	
@@ -264,9 +255,10 @@
 	
 			DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_NATIVEPTRVALUECLASS( GpuProgramParameters::AutoConstantEntry_NativePtr, Ogre::GpuProgramParameters::AutoConstantEntry )
 	
-			property Ogre::GpuProgramParameters::AutoConstantEntry* NativePtr
+	
+			property IntPtr NativePtr
 			{
-				Ogre::GpuProgramParameters::AutoConstantEntry* get() { return _native; }
+				IntPtr get() { return (IntPtr)_native; }
 			}
 	
 			static AutoConstantEntry_NativePtr Create( Mogre::GpuProgramParameters::AutoConstantType theType, size_t theIndex, size_t theData );
@@ -282,16 +274,6 @@
 				bool get() { return (_native == 0); }
 			}
 	
-			static bool operator == (AutoConstantEntry_NativePtr val1, AutoConstantEntry_NativePtr val2)
-			{
-				return (val1._native == val2._native);
-			}
-	
-			static bool operator != (AutoConstantEntry_NativePtr val1, AutoConstantEntry_NativePtr val2)
-			{
-				return (val1._native != val2._native);
-			}
-	
 			//Protected Declarations
 		protected public:
 	
@@ -382,9 +364,10 @@
 	
 			DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_NATIVEPTRVALUECLASS( GpuProgramParameters::ConstantDefinition_NativePtr, Ogre::GpuProgramParameters::ConstantDefinition )
 	
-			property Ogre::GpuProgramParameters::ConstantDefinition* NativePtr
+	
+			property IntPtr NativePtr
 			{
-				Ogre::GpuProgramParameters::ConstantDefinition* get() { return _native; }
+				IntPtr get() { return (IntPtr)_native; }
 			}
 	
 			static ConstantDefinition_NativePtr Create( );
@@ -399,16 +382,6 @@
 				bool get() { return (_native == 0); }
 			}
 	
-			static bool operator == (ConstantDefinition_NativePtr val1, ConstantDefinition_NativePtr val2)
-			{
-				return (val1._native == val2._native);
-			}
-	
-			static bool operator != (ConstantDefinition_NativePtr val1, ConstantDefinition_NativePtr val2)
-			{
-				return (val1._native != val2._native);
-			}
-	
 			//Protected Declarations
 		protected public:
 	
@@ -449,9 +422,10 @@
 	
 			DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_NATIVEPTRVALUECLASS( GpuProgramParameters::IntConstantEntry_NativePtr, Ogre::GpuProgramParameters::IntConstantEntry )
 	
-			property Ogre::GpuProgramParameters::IntConstantEntry* NativePtr
+	
+			property IntPtr NativePtr
 			{
-				Ogre::GpuProgramParameters::IntConstantEntry* get() { return _native; }
+				IntPtr get() { return (IntPtr)_native; }
 			}
 	
 			static IntConstantEntry_NativePtr Create( );
@@ -466,16 +440,6 @@
 				bool get() { return (_native == 0); }
 			}
 	
-			static bool operator == (IntConstantEntry_NativePtr val1, IntConstantEntry_NativePtr val2)
-			{
-				return (val1._native == val2._native);
-			}
-	
-			static bool operator != (IntConstantEntry_NativePtr val1, IntConstantEntry_NativePtr val2)
-			{
-				return (val1._native != val2._native);
-			}
-	
 			//Protected Declarations
 		protected public:
 	
@@ -516,9 +480,10 @@
 	
 			DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_NATIVEPTRVALUECLASS( GpuProgramParameters::RealConstantEntry_NativePtr, Ogre::GpuProgramParameters::RealConstantEntry )
 	
-			property Ogre::GpuProgramParameters::RealConstantEntry* NativePtr
+	
+			property IntPtr NativePtr
 			{
-				Ogre::GpuProgramParameters::RealConstantEntry* get() { return _native; }
+				IntPtr get() { return (IntPtr)_native; }
 			}
 	
 			static RealConstantEntry_NativePtr Create( );
@@ -533,16 +498,6 @@
 				bool get() { return (_native == 0); }
 			}
 	
-			static bool operator == (RealConstantEntry_NativePtr val1, RealConstantEntry_NativePtr val2)
-			{
-				return (val1._native == val2._native);
-			}
-	
-			static bool operator != (RealConstantEntry_NativePtr val1, RealConstantEntry_NativePtr val2)
-			{
-				return (val1._native != val2._native);
-			}
-	
 			//Protected Declarations
 		protected public:
 	
@@ -657,6 +612,9 @@
 	
 		void CopyTo(GpuProgramParameters^ dest)
 		{
+			if (_native == NULL) throw gcnew Exception("The underlying native object for the caller is null.");
+			if (dest->_native == NULL) throw gcnew ArgumentException("The underlying native object for parameter 'dest' is null.");
+	
 			*(dest->_native) = *_native;
 		}
 	
@@ -933,11 +891,6 @@
 	
 		virtual bool Equals(Object^ obj) override
 		{
-			if (obj == CLR_NULL)
-			{
-				return false;
-			}
-	
 			GpuProgramPtr^ clr = dynamic_cast<GpuProgramPtr^>(obj);
 			if (clr == CLR_NULL)
 			{
@@ -1046,11 +999,6 @@
 	
 		virtual bool Equals(Object^ obj) override
 		{
-			if (obj == CLR_NULL)
-			{
-				return false;
-			}
-	
 			GpuProgramParametersSharedPtr^ clr = dynamic_cast<GpuProgramParametersSharedPtr^>(obj);
 			if (clr == CLR_NULL)
 			{

Modified: trunk/Mogre/Mogre/include/auto/MogreHardwareIndexBuffer.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreHardwareIndexBuffer.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreHardwareIndexBuffer.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -95,11 +95,6 @@
 	
 		virtual bool Equals(Object^ obj) override
 		{
-			if (obj == CLR_NULL)
-			{
-				return false;
-			}
-	
 			HardwareIndexBufferSharedPtr^ clr = dynamic_cast<HardwareIndexBufferSharedPtr^>(obj);
 			if (clr == CLR_NULL)
 			{

Modified: trunk/Mogre/Mogre/include/auto/MogreHardwarePixelBuffer.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreHardwarePixelBuffer.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreHardwarePixelBuffer.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -127,11 +127,6 @@
 	
 		virtual bool Equals(Object^ obj) override
 		{
-			if (obj == CLR_NULL)
-			{
-				return false;
-			}
-	
 			HardwarePixelBufferSharedPtr^ clr = dynamic_cast<HardwarePixelBufferSharedPtr^>(obj);
 			if (clr == CLR_NULL)
 			{

Modified: trunk/Mogre/Mogre/include/auto/MogreHardwareVertexBuffer.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreHardwareVertexBuffer.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreHardwareVertexBuffer.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -112,11 +112,6 @@
 	
 		virtual bool Equals(Object^ obj) override
 		{
-			if (obj == CLR_NULL)
-			{
-				return false;
-			}
-	
 			HardwareVertexBufferSharedPtr^ clr = dynamic_cast<HardwareVertexBufferSharedPtr^>(obj);
 			if (clr == CLR_NULL)
 			{
@@ -276,9 +271,14 @@
 	
 		virtual bool Equals(Object^ obj) override;
 		bool Equals(VertexDeclaration^ obj);
+		static bool operator == (VertexDeclaration^ obj1, VertexDeclaration^ obj2);
+		static bool operator != (VertexDeclaration^ obj1, VertexDeclaration^ obj2);
 	
 		void CopyTo(VertexDeclaration^ dest)
 		{
+			if (_native == NULL) throw gcnew Exception("The underlying native object for the caller is null.");
+			if (dest->_native == NULL) throw gcnew ArgumentException("The underlying native object for parameter 'dest' is null.");
+	
 			*(dest->_native) = *_native;
 		}
 	

Modified: trunk/Mogre/Mogre/include/auto/MogreHighLevelGpuProgram.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreHighLevelGpuProgram.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreHighLevelGpuProgram.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -75,11 +75,6 @@
 	
 		virtual bool Equals(Object^ obj) override
 		{
-			if (obj == CLR_NULL)
-			{
-				return false;
-			}
-	
 			HighLevelGpuProgramPtr^ clr = dynamic_cast<HighLevelGpuProgramPtr^>(obj);
 			if (clr == CLR_NULL)
 			{

Modified: trunk/Mogre/Mogre/include/auto/MogreImage.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreImage.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreImage.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -139,6 +139,9 @@
 	
 		void CopyTo(Image^ dest)
 		{
+			if (_native == NULL) throw gcnew Exception("The underlying native object for the caller is null.");
+			if (dest->_native == NULL) throw gcnew ArgumentException("The underlying native object for parameter 'dest' is null.");
+	
 			*(dest->_native) = *_native;
 		}
 	

Modified: trunk/Mogre/Mogre/include/auto/MogreMaterial.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreMaterial.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreMaterial.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -89,6 +89,9 @@
 	
 		void CopyTo(Material^ dest)
 		{
+			if (_native == NULL) throw gcnew Exception("The underlying native object for the caller is null.");
+			if (dest->_native == NULL) throw gcnew ArgumentException("The underlying native object for parameter 'dest' is null.");
+	
 			*(dest->_native) = *_native;
 		}
 	
@@ -238,11 +241,6 @@
 	
 		virtual bool Equals(Object^ obj) override
 		{
-			if (obj == CLR_NULL)
-			{
-				return false;
-			}
-	
 			MaterialPtr^ clr = dynamic_cast<MaterialPtr^>(obj);
 			if (clr == CLR_NULL)
 			{

Modified: trunk/Mogre/Mogre/include/auto/MogreMesh.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreMesh.h	2006-10-27 10:59:20 UTC (rev 59)
+++ trunk/Mogre/Mogre/include/auto/MogreMesh.h	2006-10-27 15:01:12 UTC (rev 60)
@@ -394,11 +394,6 @@
 	
 		virtual bool Equals(Object^ obj) override
 		{
-			if (obj == CLR_NULL)
-			{
-				return false;
-			}
-	
 			MeshPtr^ clr...
 
[truncated message content]

[Mogre-svnmail] SF.net SVN: mogre: [59] trunk/Mogre

[<mog...@li...>]

Revision: 59
          http://svn.sourceforge.net/mogre/?rev=59&view=rev
Author:   bekas
Date:     2006-10-27 03:59:20 -0700 (Fri, 27 Oct 2006)

Log Message:
-----------
VertexElement's overrided operator == didn't check for null parameters, fixed it.

Modified Paths:
--------------
    trunk/Mogre/ChangeLog.txt
    trunk/Mogre/Mogre/include/Custom/MogreVertexElement.i

Modified: trunk/Mogre/ChangeLog.txt
===================================================================
--- trunk/Mogre/ChangeLog.txt	2006-10-23 15:36:38 UTC (rev 58)
+++ trunk/Mogre/ChangeLog.txt	2006-10-27 10:59:20 UTC (rev 59)
@@ -1,6 +1,7 @@
 ------------------------------------------------------------------------
 Changes since MOGRE v0.1.7
 ------------------------------------------------------------------------
+--[FIX] VertexElement's overrided operator == didn't check for null parameters, fixed it.
 --[Added] OgreDotNet's CeguiNet bindings, a CeguiNet renderer for Mogre and ported Ogre's Gui sample
 --[Added] MaterialSerializer and CompositorSerializer classes
 

Modified: trunk/Mogre/Mogre/include/Custom/MogreVertexElement.i
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreVertexElement.i	2006-10-23 15:36:38 UTC (rev 58)
+++ trunk/Mogre/Mogre/include/Custom/MogreVertexElement.i	2006-10-27 10:59:20 UTC (rev 59)
@@ -121,8 +121,32 @@
 		static VertexElementType get();
 	}
 
+	virtual bool Equals(Object^ obj) override
+	{
+		if (obj == CLR_NULL)
+		{
+			return false;
+		}
+
+		VertexElement^ clr = dynamic_cast<VertexElement^>(obj);
+		if (clr == CLR_NULL)
+		{
+			return false;
+		}
+
+		return (this == clr);
+	}
+	
+	bool Equals(VertexElement^ obj)
+	{
+		return (this == obj);
+	}
+
     inline static bool operator== (VertexElement^ lhs, VertexElement^ rhs)
     {
+		if ((Object^)lhs == (Object^)rhs) return true;
+		if ((Object^)lhs == nullptr || (Object^)rhs == nullptr) return false;
+			
         if (lhs->mType != rhs->mType ||
             lhs->mIndex != rhs->mIndex ||
             lhs->mOffset != rhs->mOffset ||


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mogre-svnmail] SF.net SVN: mogre: [58] trunk/Mogre

[<mog...@li...>]

Revision: 58
          http://svn.sourceforge.net/mogre/?rev=58&view=rev
Author:   bekas
Date:     2006-10-23 08:36:38 -0700 (Mon, 23 Oct 2006)

Log Message:
-----------
Added MaterialSerializer and CompositorSerializer

Modified Paths:
--------------
    trunk/Mogre/ChangeLog.txt
    trunk/Mogre/Mogre/Mogre.vcproj
    trunk/Mogre/Mogre/include/auto/MakePublicDeclarations.h
    trunk/Mogre/Mogre/include/auto/MogreMaterialSerializer.h
    trunk/Mogre/Mogre/include/auto/PreDeclarations.h

Added Paths:
-----------
    trunk/Mogre/Mogre/include/auto/MogreCompositorSerializer.h
    trunk/Mogre/Mogre/src/auto/MogreCompositorSerializer.cpp
    trunk/Mogre/Mogre/src/auto/MogreMaterialSerializer.cpp

Modified: trunk/Mogre/ChangeLog.txt
===================================================================
--- trunk/Mogre/ChangeLog.txt	2006-10-18 12:55:31 UTC (rev 57)
+++ trunk/Mogre/ChangeLog.txt	2006-10-23 15:36:38 UTC (rev 58)
@@ -1,7 +1,8 @@
 ------------------------------------------------------------------------
 Changes since MOGRE v0.1.7
 ------------------------------------------------------------------------
---Added OgreDotNet's CeguiNet bindings, a CeguiNet renderer for Mogre and ported Ogre's Gui sample
+--[Added] OgreDotNet's CeguiNet bindings, a CeguiNet renderer for Mogre and ported Ogre's Gui sample
+--[Added] MaterialSerializer and CompositorSerializer classes
 
 
 

Modified: trunk/Mogre/Mogre/Mogre.vcproj
===================================================================
--- trunk/Mogre/Mogre/Mogre.vcproj	2006-10-18 12:55:31 UTC (rev 57)
+++ trunk/Mogre/Mogre/Mogre.vcproj	2006-10-23 15:36:38 UTC (rev 58)
@@ -372,6 +372,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\src\auto\MogreCompositorSerializer.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\src\auto\MogreConfigFile.cpp"
 				>
 			</File>
@@ -496,6 +500,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\src\auto\MogreMaterialSerializer.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\src\Custom\MogreMath.cpp"
 				>
 				<FileConfiguration
@@ -1132,6 +1140,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\include\auto\MogreCompositorSerializer.h"
+				>
+			</File>
+			<File
 				RelativePath=".\include\auto\MogreConfigFile.h"
 				>
 			</File>

Modified: trunk/Mogre/Mogre/include/auto/MakePublicDeclarations.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MakePublicDeclarations.h	2006-10-18 12:55:31 UTC (rev 57)
+++ trunk/Mogre/Mogre/include/auto/MakePublicDeclarations.h	2006-10-23 15:36:38 UTC (rev 58)
@@ -52,6 +52,7 @@
 #include "OgreRenderTargetListener.h"
 #include "OgreCompositorManager.h"
 #include "OgreRenderable.h"
+#include "OgreCompositorSerializer.h"
 #include "OgreConfigFile.h"
 #include "OgreConfigOptionMap.h"
 #include "OgreDataStream.h"
@@ -87,6 +88,7 @@
 #include "OgreLogManager.h"
 #include "OgreManualObject.h"
 #include "OgreMaterialManager.h"
+#include "OgreMaterialSerializer.h"
 #include "OgreSubMesh.h"
 #include "OgrePose.h"
 #include "OgreMeshManager.h"
@@ -207,6 +209,7 @@
 #pragma make_public( Ogre::RenderTargetViewportEvent )
 #pragma make_public( Ogre::CompositorManager )
 #pragma make_public( Ogre::Renderable )
+#pragma make_public( Ogre::CompositorSerializer )
 #pragma make_public( Ogre::ConfigFile )
 #pragma make_public( Ogre::_ConfigOption )
 #pragma make_public( Ogre::DataStream )
@@ -260,6 +263,7 @@
 #pragma make_public( Ogre::ManualObjectFactory )
 #pragma make_public( Ogre::Material )
 #pragma make_public( Ogre::MaterialManager )
+#pragma make_public( Ogre::MaterialSerializer )
 #pragma make_public( Ogre::Mesh )
 #pragma make_public( Ogre::SubMesh )
 #pragma make_public( Ogre::Pose )

Added: trunk/Mogre/Mogre/include/auto/MogreCompositorSerializer.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreCompositorSerializer.h	                        (rev 0)
+++ trunk/Mogre/Mogre/include/auto/MogreCompositorSerializer.h	2006-10-23 15:36:38 UTC (rev 58)
@@ -0,0 +1,60 @@
+/*  This file is produced by the C++/CLI AutoWrapper utility.
+        Copyright (c) 2006 by Argiris Kirtzidis  */
+
+#pragma once
+
+#include "OgreCompositorSerializer.h"
+#include "MogrePrerequisites.h"
+
+namespace Mogre
+{
+	//################################################################
+	//CompositorSerializer
+	//################################################################
+	
+	public ref class CompositorSerializer
+	{
+		//Nested Types
+	
+		//Private Declarations
+	private protected:
+	
+		//Internal Declarations
+	internal:
+		CompositorSerializer( Ogre::CompositorSerializer* obj ) : _native(obj), _createdByCLR(false)
+		{
+		}
+	
+		~CompositorSerializer()
+		{
+			this->!CompositorSerializer();
+		}
+		!CompositorSerializer()
+		{
+			if (_createdByCLR &&_native)
+			{
+				delete _native;
+				_native = 0;
+			}
+		}
+	
+		Ogre::CompositorSerializer* _native;
+		bool _createdByCLR;
+	
+	
+		//Public Declarations
+	public:
+		CompositorSerializer( );
+	
+	
+		void ParseScript( Mogre::DataStreamPtr^ stream, String^ groupName );
+	
+		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_PLAINWRAPPER( CompositorSerializer )
+	
+		//Protected Declarations
+	protected public:
+	
+	};
+	
+
+}

Modified: trunk/Mogre/Mogre/include/auto/MogreMaterialSerializer.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreMaterialSerializer.h	2006-10-18 12:55:31 UTC (rev 57)
+++ trunk/Mogre/Mogre/include/auto/MogreMaterialSerializer.h	2006-10-23 15:36:38 UTC (rev 58)
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "OgreMaterialSerializer.h"
+#include "MogrePrerequisites.h"
 
 namespace Mogre
 {
@@ -22,5 +23,74 @@
 	
 	typedef Ogre::ATTRIBUTE_PARSER ATTRIBUTE_PARSER;
 	
+	//################################################################
+	//MaterialSerializer
+	//################################################################
+	
+	public ref class MaterialSerializer
+	{
+		//Nested Types
+	
+		//Private Declarations
+	private protected:
+	
+		//Internal Declarations
+	internal:
+		MaterialSerializer( Ogre::MaterialSerializer* obj ) : _native(obj), _createdByCLR(false)
+		{
+		}
+	
+		~MaterialSerializer()
+		{
+			this->!MaterialSerializer();
+		}
+		!MaterialSerializer()
+		{
+			if (_createdByCLR &&_native)
+			{
+				delete _native;
+				_native = 0;
+			}
+		}
+	
+		Ogre::MaterialSerializer* _native;
+		bool _createdByCLR;
+	
+	
+		//Public Declarations
+	public:
+		MaterialSerializer( );
+	
+	
+		property String^ QueuedAsString
+		{
+		public:
+			String^ get();
+		}
+	
+		void QueueForExport( Mogre::MaterialPtr^ pMat, bool clearQueued, bool exportDefaults );
+		void QueueForExport( Mogre::MaterialPtr^ pMat, bool clearQueued );
+		void QueueForExport( Mogre::MaterialPtr^ pMat );
+	
+		void ExportQueued( String^ filename, bool includeProgDef, String^ programFilename );
+		void ExportQueued( String^ filename, bool includeProgDef );
+		void ExportQueued( String^ filename );
+	
+		void ExportMaterial( Mogre::MaterialPtr^ pMat, String^ filename, bool exportDefaults, bool includeProgDef, String^ programFilename );
+		void ExportMaterial( Mogre::MaterialPtr^ pMat, String^ filename, bool exportDefaults, bool includeProgDef );
+		void ExportMaterial( Mogre::MaterialPtr^ pMat, String^ filename, bool exportDefaults );
+		void ExportMaterial( Mogre::MaterialPtr^ pMat, String^ filename );
+	
+		void ClearQueue( );
+	
+		void ParseScript( Mogre::DataStreamPtr^ stream, String^ groupName );
+	
+		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_PLAINWRAPPER( MaterialSerializer )
+	
+		//Protected Declarations
+	protected public:
+	
+	};
+	
 
 }

Modified: trunk/Mogre/Mogre/include/auto/PreDeclarations.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/PreDeclarations.h	2006-10-18 12:55:31 UTC (rev 57)
+++ trunk/Mogre/Mogre/include/auto/PreDeclarations.h	2006-10-23 15:36:38 UTC (rev 58)
@@ -49,6 +49,7 @@
 ref class CompositorChain;
 ref class CompositorInstance;
 ref class CompositorManager;
+ref class CompositorSerializer;
 ref class ConfigFile;
 value class ConfigOption_NativePtr;
 ref class ConfigOptionMap;
@@ -107,6 +108,7 @@
 ref class Material;
 ref class MaterialPtr;
 ref class MaterialManager;
+ref class MaterialSerializer;
 ref class Mesh;
 ref class MeshPtr;
 ref class MeshLodUsage;

Added: trunk/Mogre/Mogre/src/auto/MogreCompositorSerializer.cpp
===================================================================
--- trunk/Mogre/Mogre/src/auto/MogreCompositorSerializer.cpp	                        (rev 0)
+++ trunk/Mogre/Mogre/src/auto/MogreCompositorSerializer.cpp	2006-10-23 15:36:38 UTC (rev 58)
@@ -0,0 +1,39 @@
+/*  This file is produced by the C++/CLI AutoWrapper utility.
+        Copyright (c) 2006 by Argiris Kirtzidis  */
+
+#include "stdafx.h"
+
+#include "MogreCompositorSerializer.h"
+#include "MogreDataStream.h"
+
+namespace Mogre
+{
+	//################################################################
+	//CompositorSerializer
+	//################################################################
+	
+	//Nested Types
+	//Private Declarations
+	
+	//Internal Declarations
+	
+	//Public Declarations
+	CompositorSerializer::CompositorSerializer( )
+	{
+		_createdByCLR = true;
+		_native = new Ogre::CompositorSerializer();
+	}
+	
+	void CompositorSerializer::ParseScript( Mogre::DataStreamPtr^ stream, String^ groupName )
+	{
+		DECLARE_OGRE_STRING( o_groupName, groupName )
+	
+		static_cast<Ogre::CompositorSerializer*>(_native)->parseScript( (Ogre::DataStreamPtr&)stream, o_groupName );
+	}
+	
+	
+	//Protected Declarations
+	
+	
+
+}

Added: trunk/Mogre/Mogre/src/auto/MogreMaterialSerializer.cpp
===================================================================
--- trunk/Mogre/Mogre/src/auto/MogreMaterialSerializer.cpp	                        (rev 0)
+++ trunk/Mogre/Mogre/src/auto/MogreMaterialSerializer.cpp	2006-10-23 15:36:38 UTC (rev 58)
@@ -0,0 +1,109 @@
+/*  This file is produced by the C++/CLI AutoWrapper utility.
+        Copyright (c) 2006 by Argiris Kirtzidis  */
+
+#include "stdafx.h"
+
+#include "MogreMaterialSerializer.h"
+#include "MogreMaterial.h"
+#include "MogreDataStream.h"
+
+namespace Mogre
+{
+	//################################################################
+	//MaterialSerializer
+	//################################################################
+	
+	//Nested Types
+	//Private Declarations
+	
+	//Internal Declarations
+	
+	//Public Declarations
+	MaterialSerializer::MaterialSerializer( )
+	{
+		_createdByCLR = true;
+		_native = new Ogre::MaterialSerializer();
+	}
+	
+	String^ MaterialSerializer::QueuedAsString::get()
+	{
+		return TO_CLR_STRING( static_cast<const Ogre::MaterialSerializer*>(_native)->getQueuedAsString( ) );
+	}
+	
+	void MaterialSerializer::QueueForExport( Mogre::MaterialPtr^ pMat, bool clearQueued, bool exportDefaults )
+	{
+		static_cast<Ogre::MaterialSerializer*>(_native)->queueForExport( (const Ogre::MaterialPtr&)pMat, clearQueued, exportDefaults );
+	}
+	void MaterialSerializer::QueueForExport( Mogre::MaterialPtr^ pMat, bool clearQueued )
+	{
+		static_cast<Ogre::MaterialSerializer*>(_native)->queueForExport( (const Ogre::MaterialPtr&)pMat, clearQueued );
+	}
+	void MaterialSerializer::QueueForExport( Mogre::MaterialPtr^ pMat )
+	{
+		static_cast<Ogre::MaterialSerializer*>(_native)->queueForExport( (const Ogre::MaterialPtr&)pMat );
+	}
+	
+	void MaterialSerializer::ExportQueued( String^ filename, bool includeProgDef, String^ programFilename )
+	{
+		DECLARE_OGRE_STRING( o_filename, filename )
+		DECLARE_OGRE_STRING( o_programFilename, programFilename )
+	
+		static_cast<Ogre::MaterialSerializer*>(_native)->exportQueued( o_filename, includeProgDef, o_programFilename );
+	}
+	void MaterialSerializer::ExportQueued( String^ filename, bool includeProgDef )
+	{
+		DECLARE_OGRE_STRING( o_filename, filename )
+	
+		static_cast<Ogre::MaterialSerializer*>(_native)->exportQueued( o_filename, includeProgDef );
+	}
+	void MaterialSerializer::ExportQueued( String^ filename )
+	{
+		DECLARE_OGRE_STRING( o_filename, filename )
+	
+		static_cast<Ogre::MaterialSerializer*>(_native)->exportQueued( o_filename );
+	}
+	
+	void MaterialSerializer::ExportMaterial( Mogre::MaterialPtr^ pMat, String^ filename, bool exportDefaults, bool includeProgDef, String^ programFilename )
+	{
+		DECLARE_OGRE_STRING( o_filename, filename )
+		DECLARE_OGRE_STRING( o_programFilename, programFilename )
+	
+		static_cast<Ogre::MaterialSerializer*>(_native)->exportMaterial( (const Ogre::MaterialPtr&)pMat, o_filename, exportDefaults, includeProgDef, o_programFilename );
+	}
+	void MaterialSerializer::ExportMaterial( Mogre::MaterialPtr^ pMat, String^ filename, bool exportDefaults, bool includeProgDef )
+	{
+		DECLARE_OGRE_STRING( o_filename, filename )
+	
+		static_cast<Ogre::MaterialSerializer*>(_native)->exportMaterial( (const Ogre::MaterialPtr&)pMat, o_filename, exportDefaults, includeProgDef );
+	}
+	void MaterialSerializer::ExportMaterial( Mogre::MaterialPtr^ pMat, String^ filename, bool exportDefaults )
+	{
+		DECLARE_OGRE_STRING( o_filename, filename )
+	
+		static_cast<Ogre::MaterialSerializer*>(_native)->exportMaterial( (const Ogre::MaterialPtr&)pMat, o_filename, exportDefaults );
+	}
+	void MaterialSerializer::ExportMaterial( Mogre::MaterialPtr^ pMat, String^ filename )
+	{
+		DECLARE_OGRE_STRING( o_filename, filename )
+	
+		static_cast<Ogre::MaterialSerializer*>(_native)->exportMaterial( (const Ogre::MaterialPtr&)pMat, o_filename );
+	}
+	
+	void MaterialSerializer::ClearQueue( )
+	{
+		static_cast<Ogre::MaterialSerializer*>(_native)->clearQueue( );
+	}
+	
+	void MaterialSerializer::ParseScript( Mogre::DataStreamPtr^ stream, String^ groupName )
+	{
+		DECLARE_OGRE_STRING( o_groupName, groupName )
+	
+		static_cast<Ogre::MaterialSerializer*>(_native)->parseScript( (Ogre::DataStreamPtr&)stream, o_groupName );
+	}
+	
+	
+	//Protected Declarations
+	
+	
+
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mogre-svnmail] SF.net SVN: mogre: [57] trunk/Mogre/Mogre/include

[<mog...@li...>]

Revision: 57
          http://svn.sourceforge.net/mogre/?rev=57&view=rev
Author:   bekas
Date:     2006-10-18 05:55:31 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------


Modified Paths:
--------------
    trunk/Mogre/Mogre/include/STLDeque.h
    trunk/Mogre/Mogre/include/STLHashMap.h
    trunk/Mogre/Mogre/include/STLList.h
    trunk/Mogre/Mogre/include/STLMap.h
    trunk/Mogre/Mogre/include/STLMultiMap.h
    trunk/Mogre/Mogre/include/STLMultiSet.h
    trunk/Mogre/Mogre/include/STLSet.h
    trunk/Mogre/Mogre/include/STLVector.h

Modified: trunk/Mogre/Mogre/include/STLDeque.h
===================================================================
--- trunk/Mogre/Mogre/include/STLDeque.h	2006-10-17 22:58:11 UTC (rev 56)
+++ trunk/Mogre/Mogre/include/STLDeque.h	2006-10-18 12:55:31 UTC (rev 57)
@@ -102,24 +102,24 @@
 																					\
 		inline static Iterator^ operator ++(Iterator^ it)							\
 		{																			\
-			(*it->_native)++;														\
+			++(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		inline static Iterator^ operator --(Iterator^ it)							\
 		{																			\
-			(*it->_native)--;														\
+			--(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		void MoveNext()																\
 		{																			\
-			(*_native)++;															\
+			++(*_native);															\
 		}																			\
 																					\
 		void MovePrevious()															\
 		{																			\
-			(*_native)--;															\
+			--(*_native);															\
 		}																			\
 	};																				\
 																					\
@@ -400,24 +400,24 @@
 																					\
 		inline static ConstIterator^ operator ++(ConstIterator^ it)					\
 		{																			\
-			(*it->_native)++;														\
+			++(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		inline static ConstIterator^ operator --(ConstIterator^ it)					\
 		{																			\
-			(*it->_native)--;														\
+			--(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		void MoveNext()																\
 		{																			\
-			(*_native)++;															\
+			++(*_native);															\
 		}																			\
 																					\
 		void MovePrevious()															\
 		{																			\
-			(*_native)--;															\
+			--(*_native);															\
 		}																			\
 	};																				\
 																					\
@@ -575,7 +575,7 @@
 			}																		\
 			else																	\
 			{																		\
-				(*_pIter)++;														\
+				++(*_pIter);														\
 			}																		\
 																					\
 			if ( (*_pIter) == _pCont->end() )										\
@@ -678,7 +678,7 @@
 			}																		\
 			else																	\
 			{																		\
-				(*_pIter)++;														\
+				++(*_pIter);														\
 			}																		\
 																					\
 			if ( (*_pIter) == _pCont->end() )										\

Modified: trunk/Mogre/Mogre/include/STLHashMap.h
===================================================================
--- trunk/Mogre/Mogre/include/STLHashMap.h	2006-10-17 22:58:11 UTC (rev 56)
+++ trunk/Mogre/Mogre/include/STLHashMap.h	2006-10-18 12:55:31 UTC (rev 57)
@@ -106,24 +106,24 @@
 																					\
 		inline static Iterator^ operator ++(Iterator^ it)							\
 		{																			\
-			(*it->_native)++;														\
+			++(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		inline static Iterator^ operator --(Iterator^ it)							\
 		{																			\
-			(*it->_native)--;														\
+			--(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		void MoveNext()																\
 		{																			\
-			(*_native)++;															\
+			++(*_native);															\
 		}																			\
 																					\
 		void MovePrevious()															\
 		{																			\
-			(*_native)--;															\
+			--(*_native);															\
 		}																			\
 	};																				\
 																					\
@@ -376,24 +376,24 @@
 																					\
 		inline static ConstIterator^ operator ++(ConstIterator^ it)					\
 		{																			\
-			(*it->_native)++;														\
+			++(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		inline static ConstIterator^ operator --(ConstIterator^ it)					\
 		{																			\
-			(*it->_native)--;														\
+			--(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		void MoveNext()																\
 		{																			\
-			(*_native)++;															\
+			++(*_native);															\
 		}																			\
 																					\
 		void MovePrevious()															\
 		{																			\
-			(*_native)--;															\
+			--(*_native);															\
 		}																			\
 	};																				\
 																					\
@@ -548,7 +548,7 @@
 			}																		\
 			else																	\
 			{																		\
-				(*_pIter)++;														\
+				++(*_pIter);														\
 			}																		\
 																					\
 			if ( (*_pIter) == _pCont->end() )										\
@@ -646,7 +646,7 @@
 			}																		\
 			else																	\
 			{																		\
-				(*_pIter)++;														\
+				++(*_pIter);														\
 			}																		\
 																					\
 			if ( (*_pIter) == _pCont->end() )										\

Modified: trunk/Mogre/Mogre/include/STLList.h
===================================================================
--- trunk/Mogre/Mogre/include/STLList.h	2006-10-17 22:58:11 UTC (rev 56)
+++ trunk/Mogre/Mogre/include/STLList.h	2006-10-18 12:55:31 UTC (rev 57)
@@ -122,24 +122,24 @@
 																					\
 		inline static Iterator^ operator ++(Iterator^ it)							\
 		{																			\
-			(*it->_native)++;														\
+			++(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		inline static Iterator^ operator --(Iterator^ it)							\
 		{																			\
-			(*it->_native)--;														\
+			--(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		void MoveNext()																\
 		{																			\
-			(*_native)++;															\
+			++(*_native);															\
 		}																			\
 																					\
 		void MovePrevious()															\
 		{																			\
-			(*_native)--;															\
+			--(*_native);															\
 		}																			\
 	};																				\
 																					\
@@ -406,24 +406,24 @@
 																					\
 		inline static ConstIterator^ operator ++(ConstIterator^ it)					\
 		{																			\
-			(*it->_native)++;														\
+			++(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		inline static ConstIterator^ operator --(ConstIterator^ it)					\
 		{																			\
-			(*it->_native)--;														\
+			--(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		void MoveNext()																\
 		{																			\
-			(*_native)++;															\
+			++(*_native);															\
 		}																			\
 																					\
 		void MovePrevious()															\
 		{																			\
-			(*_native)--;															\
+			--(*_native);															\
 		}																			\
 	};																				\
 																					\
@@ -576,7 +576,7 @@
 			}																		\
 			else																	\
 			{																		\
-				(*_pIter)++;														\
+				++(*_pIter);														\
 			}																		\
 																					\
 			if ( (*_pIter) == _pCont->end() )										\
@@ -654,7 +654,7 @@
 			}																		\
 			else																	\
 			{																		\
-				(*_pIter)++;														\
+				++(*_pIter);														\
 			}																		\
 																					\
 			if ( (*_pIter) == _pCont->end() )										\

Modified: trunk/Mogre/Mogre/include/STLMap.h
===================================================================
--- trunk/Mogre/Mogre/include/STLMap.h	2006-10-17 22:58:11 UTC (rev 56)
+++ trunk/Mogre/Mogre/include/STLMap.h	2006-10-18 12:55:31 UTC (rev 57)
@@ -106,24 +106,24 @@
 																					\
 		inline static Iterator^ operator ++(Iterator^ it)							\
 		{																			\
-			(*it->_native)++;														\
+			++(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		inline static Iterator^ operator --(Iterator^ it)							\
 		{																			\
-			(*it->_native)--;														\
+			--(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		void MoveNext()																\
 		{																			\
-			(*_native)++;															\
+			++(*_native);															\
 		}																			\
 																					\
 		void MovePrevious()															\
 		{																			\
-			(*_native)--;															\
+			--(*_native);															\
 		}																			\
 	};																				\
 																					\
@@ -376,24 +376,24 @@
 																					\
 		inline static ConstIterator^ operator ++(ConstIterator^ it)					\
 		{																			\
-			(*it->_native)++;														\
+			++(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		inline static ConstIterator^ operator --(ConstIterator^ it)					\
 		{																			\
-			(*it->_native)--;														\
+			--(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		void MoveNext()																\
 		{																			\
-			(*_native)++;															\
+			++(*_native);															\
 		}																			\
 																					\
 		void MovePrevious()															\
 		{																			\
-			(*_native)--;															\
+			--(*_native);															\
 		}																			\
 	};																				\
 																					\
@@ -549,7 +549,7 @@
 			}																		\
 			else																	\
 			{																		\
-				(*_pIter)++;														\
+				++(*_pIter);														\
 			}																		\
 																					\
 			if ( (*_pIter) == _pCont->end() )										\
@@ -647,7 +647,7 @@
 			}																		\
 			else																	\
 			{																		\
-				(*_pIter)++;														\
+				++(*_pIter);														\
 			}																		\
 																					\
 			if ( (*_pIter) == _pCont->end() )										\

Modified: trunk/Mogre/Mogre/include/STLMultiMap.h
===================================================================
--- trunk/Mogre/Mogre/include/STLMultiMap.h	2006-10-17 22:58:11 UTC (rev 56)
+++ trunk/Mogre/Mogre/include/STLMultiMap.h	2006-10-18 12:55:31 UTC (rev 57)
@@ -106,24 +106,24 @@
 																					\
 		inline static Iterator^ operator ++(Iterator^ it)							\
 		{																			\
-			(*it->_native)++;														\
+			++(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		inline static Iterator^ operator --(Iterator^ it)							\
 		{																			\
-			(*it->_native)--;														\
+			--(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		void MoveNext()																\
 		{																			\
-			(*_native)++;															\
+			++(*_native);															\
 		}																			\
 																					\
 		void MovePrevious()															\
 		{																			\
-			(*_native)--;															\
+			--(*_native);															\
 		}																			\
 	};																				\
 																					\
@@ -376,24 +376,24 @@
 																					\
 		inline static ConstIterator^ operator ++(ConstIterator^ it)					\
 		{																			\
-			(*it->_native)++;														\
+			++(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		inline static ConstIterator^ operator --(ConstIterator^ it)					\
 		{																			\
-			(*it->_native)--;														\
+			--(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		void MoveNext()																\
 		{																			\
-			(*_native)++;															\
+			++(*_native);															\
 		}																			\
 																					\
 		void MovePrevious()															\
 		{																			\
-			(*_native)--;															\
+			--(*_native);															\
 		}																			\
 	};																				\
 																					\
@@ -550,7 +550,7 @@
 			}																		\
 			else																	\
 			{																		\
-				(*_pIter)++;														\
+				++(*_pIter);														\
 			}																		\
 																					\
 			if ( (*_pIter) == _pCont->end() )										\
@@ -664,7 +664,7 @@
 			}																		\
 			else																	\
 			{																		\
-				(*_pIter)++;														\
+				++(*_pIter);														\
 			}																		\
 																					\
 			if ( (*_pIter) == _pCont->end() )										\

Modified: trunk/Mogre/Mogre/include/STLMultiSet.h
===================================================================
--- trunk/Mogre/Mogre/include/STLMultiSet.h	2006-10-17 22:58:11 UTC (rev 56)
+++ trunk/Mogre/Mogre/include/STLMultiSet.h	2006-10-18 12:55:31 UTC (rev 57)
@@ -102,24 +102,24 @@
 																					\
 		inline static Iterator^ operator ++(Iterator^ it)							\
 		{																			\
-			(*it->_native)++;														\
+			++(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		inline static Iterator^ operator --(Iterator^ it)							\
 		{																			\
-			(*it->_native)--;														\
+			--(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		void MoveNext()																\
 		{																			\
-			(*_native)++;															\
+			++(*_native);															\
 		}																			\
 																					\
 		void MovePrevious()															\
 		{																			\
-			(*_native)--;															\
+			--(*_native);															\
 		}																			\
 	};																				\
 																					\
@@ -366,24 +366,24 @@
 																					\
 		inline static ConstIterator^ operator ++(ConstIterator^ it)					\
 		{																			\
-			(*it->_native)++;														\
+			++(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		inline static ConstIterator^ operator --(ConstIterator^ it)					\
 		{																			\
-			(*it->_native)--;														\
+			--(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		void MoveNext()																\
 		{																			\
-			(*_native)++;															\
+			++(*_native);															\
 		}																			\
 																					\
 		void MovePrevious()															\
 		{																			\
-			(*_native)--;															\
+			--(*_native);															\
 		}																			\
 	};																				\
 																					\
@@ -536,7 +536,7 @@
 			}																		\
 			else																	\
 			{																		\
-				(*_pIter)++;														\
+				++(*_pIter);														\
 			}																		\
 																					\
 			if ( (*_pIter) == _pCont->end() )										\
@@ -635,7 +635,7 @@
 			}																		\
 			else																	\
 			{																		\
-				(*_pIter)++;														\
+				++(*_pIter);														\
 			}																		\
 																					\
 			if ( (*_pIter) == _pCont->end() )										\

Modified: trunk/Mogre/Mogre/include/STLSet.h
===================================================================
--- trunk/Mogre/Mogre/include/STLSet.h	2006-10-17 22:58:11 UTC (rev 56)
+++ trunk/Mogre/Mogre/include/STLSet.h	2006-10-18 12:55:31 UTC (rev 57)
@@ -102,24 +102,24 @@
 																					\
 		inline static Iterator^ operator ++(Iterator^ it)							\
 		{																			\
-			(*it->_native)++;														\
+			++(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		inline static Iterator^ operator --(Iterator^ it)							\
 		{																			\
-			(*it->_native)--;														\
+			--(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		void MoveNext()																\
 		{																			\
-			(*_native)++;															\
+			++(*_native);															\
 		}																			\
 																					\
 		void MovePrevious()															\
 		{																			\
-			(*_native)--;															\
+			--(*_native);															\
 		}																			\
 	};																				\
 																					\
@@ -364,24 +364,24 @@
 																					\
 		inline static ConstIterator^ operator ++(ConstIterator^ it)					\
 		{																			\
-			(*it->_native)++;														\
+			++(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		inline static ConstIterator^ operator --(ConstIterator^ it)					\
 		{																			\
-			(*it->_native)--;														\
+			--(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		void MoveNext()																\
 		{																			\
-			(*_native)++;															\
+			++(*_native);															\
 		}																			\
 																					\
 		void MovePrevious()															\
 		{																			\
-			(*_native)--;															\
+			--(*_native);															\
 		}																			\
 	};																				\
 																					\
@@ -532,7 +532,7 @@
 			}																		\
 			else																	\
 			{																		\
-				(*_pIter)++;														\
+				++(*_pIter);														\
 			}																		\
 																					\
 			if ( (*_pIter) == _pCont->end() )										\
@@ -627,7 +627,7 @@
 			}																		\
 			else																	\
 			{																		\
-				(*_pIter)++;														\
+				++(*_pIter);														\
 			}																		\
 																					\
 			if ( (*_pIter) == _pCont->end() )										\

Modified: trunk/Mogre/Mogre/include/STLVector.h
===================================================================
--- trunk/Mogre/Mogre/include/STLVector.h	2006-10-17 22:58:11 UTC (rev 56)
+++ trunk/Mogre/Mogre/include/STLVector.h	2006-10-18 12:55:31 UTC (rev 57)
@@ -102,24 +102,24 @@
 																					\
 		inline static Iterator^ operator ++(Iterator^ it)							\
 		{																			\
-			(*it->_native)++;														\
+			++(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		inline static Iterator^ operator --(Iterator^ it)							\
 		{																			\
-			(*it->_native)--;														\
+			--(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		void MoveNext()																\
 		{																			\
-			(*_native)++;															\
+			++(*_native);															\
 		}																			\
 																					\
 		void MovePrevious()															\
 		{																			\
-			(*_native)--;															\
+			--(*_native);															\
 		}																			\
 	};																				\
 																					\
@@ -404,24 +404,24 @@
 																					\
 		inline static ConstIterator^ operator ++(ConstIterator^ it)					\
 		{																			\
-			(*it->_native)++;														\
+			++(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		inline static ConstIterator^ operator --(ConstIterator^ it)					\
 		{																			\
-			(*it->_native)--;														\
+			--(*it->_native);														\
 			return it;																\
 		}																			\
 																					\
 		void MoveNext()																\
 		{																			\
-			(*_native)++;															\
+			++(*_native);															\
 		}																			\
 																					\
 		void MovePrevious()															\
 		{																			\
-			(*_native)--;															\
+			--(*_native);															\
 		}																			\
 	};																				\
 																					\
@@ -584,7 +584,7 @@
 			}																		\
 			else																	\
 			{																		\
-				(*_pIter)++;														\
+				++(*_pIter);														\
 			}																		\
 																					\
 			if ( (*_pIter) == _pCont->end() )										\
@@ -682,7 +682,7 @@
 			}																		\
 			else																	\
 			{																		\
-				(*_pIter)++;														\
+				++(*_pIter);														\
 			}																		\
 																					\
 			if ( (*_pIter) == _pCont->end() )										\


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mogre-svnmail] SF.net SVN: mogre: [56] trunk/Mogre/Samples/MogreForm/MogreForm.cs

[<mog...@li...>]

Revision: 56
          http://svn.sourceforge.net/mogre/?rev=56&view=rev
Author:   bekas
Date:     2006-10-17 15:58:11 -0700 (Tue, 17 Oct 2006)

Log Message:
-----------


Modified Paths:
--------------
    trunk/Mogre/Samples/MogreForm/MogreForm.cs

Modified: trunk/Mogre/Samples/MogreForm/MogreForm.cs
===================================================================
--- trunk/Mogre/Samples/MogreForm/MogreForm.cs	2006-10-17 20:44:52 UTC (rev 55)
+++ trunk/Mogre/Samples/MogreForm/MogreForm.cs	2006-10-17 22:58:11 UTC (rev 56)
@@ -104,10 +104,10 @@
             root.RenderSystem.SetConfigOption("Full Screen", "No");
             root.RenderSystem.SetConfigOption("Video Mode", "640 x 480 @ 32-bit colour");
 
-            root.Initialise(false, "Simple mOgre Form Window");
+            root.Initialise(false);
 	        NameValuePairList misc = new NameValuePairList();
             misc["externalWindowHandle"] = hWnd.ToString();
-	        window = root.CreateRenderWindow( "My sub render window", 0, 0, false, misc );
+            window = root.CreateRenderWindow("Simple Mogre Form Window", 0, 0, false, misc);
             ResourceGroupManager.Singleton.InitialiseAllResourceGroups();
 
             //----------------------------------------------------- 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mogre-svnmail] SF.net SVN: mogre: [55] trunk/Mogre/Samples/MogreForm

[<mog...@li...>]

Revision: 55
          http://svn.sourceforge.net/mogre/?rev=55&view=rev
Author:   bekas
Date:     2006-10-17 13:44:52 -0700 (Tue, 17 Oct 2006)

Log Message:
-----------
Changed "parentWindowHandle" parameter to "externalWindowHandle" for MogreForm sample.

Modified Paths:
--------------
    trunk/Mogre/Samples/MogreForm/MogreForm.Designer.cs
    trunk/Mogre/Samples/MogreForm/MogreForm.cs

Modified: trunk/Mogre/Samples/MogreForm/MogreForm.Designer.cs
===================================================================
--- trunk/Mogre/Samples/MogreForm/MogreForm.Designer.cs	2006-10-16 11:25:43 UTC (rev 54)
+++ trunk/Mogre/Samples/MogreForm/MogreForm.Designer.cs	2006-10-17 20:44:52 UTC (rev 55)
@@ -28,13 +28,22 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.mogrePanel = new System.Windows.Forms.Panel();
             this.SuspendLayout();
             // 
+            // mogrePanel
+            // 
+            this.mogrePanel.Location = new System.Drawing.Point(150, 68);
+            this.mogrePanel.Name = "mogrePanel";
+            this.mogrePanel.Size = new System.Drawing.Size(483, 375);
+            this.mogrePanel.TabIndex = 0;
+            // 
             // MogreForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(856, 580);
+            this.ClientSize = new System.Drawing.Size(810, 544);
+            this.Controls.Add(this.mogrePanel);
             this.Name = "MogreForm";
             this.Text = "Simple Mogre Form";
             this.Paint += new System.Windows.Forms.PaintEventHandler(this.MogreForm_Paint);
@@ -44,6 +53,8 @@
 
         #endregion
 
+        private System.Windows.Forms.Panel mogrePanel;
+
     }
 }
 

Modified: trunk/Mogre/Samples/MogreForm/MogreForm.cs
===================================================================
--- trunk/Mogre/Samples/MogreForm/MogreForm.cs	2006-10-16 11:25:43 UTC (rev 54)
+++ trunk/Mogre/Samples/MogreForm/MogreForm.cs	2006-10-17 20:44:52 UTC (rev 55)
@@ -18,7 +18,7 @@
             InitializeComponent();
             this.Disposed += new EventHandler(MogreForm_Disposed);
 
-            mogreWin = new OgreWindow(new Point(100, 30), this.Handle);
+            mogreWin = new OgreWindow(new Point(100, 30), mogrePanel.Handle);
             mogreWin.InitMogre();
         }
 
@@ -42,12 +42,12 @@
         protected Viewport viewport;
         protected RenderWindow window;
         protected Point position;
-        protected IntPtr ParentHWnd;
+        protected IntPtr hWnd;
 
         public OgreWindow(Point origin, IntPtr hWnd)
         {
             position = origin;
-            ParentHWnd = hWnd;
+            this.hWnd = hWnd;
         }
 
         public void InitMogre()
@@ -106,10 +106,8 @@
 
             root.Initialise(false, "Simple mOgre Form Window");
 	        NameValuePairList misc = new NameValuePairList();
-            misc["parentWindowHandle"] = ParentHWnd.ToString();
-            misc["left"] = position.X.ToString();
-            misc["top"] = position.Y.ToString();
-	        window = root.CreateRenderWindow( "My sub render window", 640, 480, false, misc );
+            misc["externalWindowHandle"] = hWnd.ToString();
+	        window = root.CreateRenderWindow( "My sub render window", 0, 0, false, misc );
             ResourceGroupManager.Singleton.InitialiseAllResourceGroups();
 
             //----------------------------------------------------- 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mogre-svnmail] SF.net SVN: mogre: [54] trunk/Mogre/ogrenew/Samples/Common/bin

[<mog...@li...>]

Revision: 54
          http://svn.sourceforge.net/mogre/?rev=54&view=rev
Author:   bekas
Date:     2006-10-16 04:25:43 -0700 (Mon, 16 Oct 2006)

Log Message:
-----------
Added the correct version of Mogre.Cegui.dll

Added Paths:
-----------
    trunk/Mogre/ogrenew/Samples/Common/bin/Debug/Mogre.Cegui.dll
    trunk/Mogre/ogrenew/Samples/Common/bin/Release/Mogre.Cegui.dll

Removed Paths:
-------------
    trunk/Mogre/ogrenew/Samples/Common/bin/Debug/CeGuiDotNet.Mogre.dll
    trunk/Mogre/ogrenew/Samples/Common/bin/Release/CeGuiDotNet.Mogre.dll

Deleted: trunk/Mogre/ogrenew/Samples/Common/bin/Debug/CeGuiDotNet.Mogre.dll
===================================================================
(Binary files differ)

Added: trunk/Mogre/ogrenew/Samples/Common/bin/Debug/Mogre.Cegui.dll
===================================================================
(Binary files differ)


Property changes on: trunk/Mogre/ogrenew/Samples/Common/bin/Debug/Mogre.Cegui.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/Mogre/ogrenew/Samples/Common/bin/Release/CeGuiDotNet.Mogre.dll
===================================================================
(Binary files differ)

Added: trunk/Mogre/ogrenew/Samples/Common/bin/Release/Mogre.Cegui.dll
===================================================================
(Binary files differ)


Property changes on: trunk/Mogre/ogrenew/Samples/Common/bin/Release/Mogre.Cegui.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mogre-svnmail] SF.net SVN: mogre: [53] trunk/Mogre

[<mog...@li...>]

Revision: 53
          http://svn.sourceforge.net/mogre/?rev=53&view=rev
Author:   bekas
Date:     2006-10-04 20:32:20 -0700 (Wed, 04 Oct 2006)

Log Message:
-----------
--Added CeguiNet, CeguioNet renderer, and Gui Sample
--Modified OgreException.h and OgreException.cpp to add getIsThrown static function so that I can check whether the exception that is thrown is really an Ogre exception or something else

Modified Paths:
--------------
    trunk/Mogre/ChangeLog.txt
    trunk/Mogre/Mogre/include/auto/MogreAnimable.h
    trunk/Mogre/Mogre/include/auto/MogreArchive.h
    trunk/Mogre/Mogre/include/auto/MogreCodec.h
    trunk/Mogre/Mogre/include/auto/MogreCompositor.h
    trunk/Mogre/Mogre/include/auto/MogreDataStream.h
    trunk/Mogre/Mogre/include/auto/MogreException.h
    trunk/Mogre/Mogre/include/auto/MogreFont.h
    trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h
    trunk/Mogre/Mogre/include/auto/MogreHardwareIndexBuffer.h
    trunk/Mogre/Mogre/include/auto/MogreHardwarePixelBuffer.h
    trunk/Mogre/Mogre/include/auto/MogreHardwareVertexBuffer.h
    trunk/Mogre/Mogre/include/auto/MogreHighLevelGpuProgram.h
    trunk/Mogre/Mogre/include/auto/MogreMaterial.h
    trunk/Mogre/Mogre/include/auto/MogreMesh.h
    trunk/Mogre/Mogre/include/auto/MogrePatchMesh.h
    trunk/Mogre/Mogre/include/auto/MogreResource.h
    trunk/Mogre/Mogre/include/auto/MogreSkeleton.h
    trunk/Mogre/Mogre/include/auto/MogreStringVector.h
    trunk/Mogre/Mogre/include/auto/MogreTexture.h
    trunk/Mogre/Mogre/src/auto/MogreException.cpp
    trunk/Mogre/Mogre.sln
    trunk/Mogre/Samples/ExampleApplication/Demo.ExampleApplication.csproj
    trunk/Mogre/Samples/ExampleApplication/Example.cs
    trunk/Mogre/Samples/Fresnel/Program.cs
    trunk/Mogre/Samples/SkeletalAnimation/Program.cs
    trunk/Mogre/ogrenew/OgreMain/include/OgreException.h
    trunk/Mogre/ogrenew/OgreMain/src/OgreException.cpp
    trunk/MogreNewt/Samples/Basics/Basics.cs
    trunk/MogreNewt/Samples/Basics/Demo.Basics.csproj
    trunk/MogreNewt/Samples/Basics/Program.cs
    trunk/MogreNewt/Samples/SimpleVehicle/Demo.SimpleVehicle.csproj
    trunk/MogreNewt/Samples/SimpleVehicle/Program.cs
    trunk/MogreNewt/Samples/SimpleVehicle/SimpleVehicleApp.cs

Added Paths:
-----------
    trunk/Mogre/Samples/Gui/
    trunk/Mogre/Samples/Gui/Demo.Gui.csproj
    trunk/Mogre/Samples/Gui/Gui.cs
    trunk/Mogre/Samples/Gui/Program.cs
    trunk/Mogre/Samples/Gui/Properties/
    trunk/Mogre/Samples/Gui/Properties/AssemblyInfo.cs
    trunk/Mogre/ogrenew/Samples/Common/bin/Debug/CeGuiDotNet.Mogre.dll
    trunk/Mogre/ogrenew/Samples/Common/bin/Debug/CeguiBindings.dll
    trunk/Mogre/ogrenew/Samples/Common/bin/Debug/CeguiDotNet.dll
    trunk/Mogre/ogrenew/Samples/Common/bin/Debug/OgreBindings_Cegui.dll
    trunk/Mogre/ogrenew/Samples/Common/bin/Release/CeGuiDotNet.Mogre.dll
    trunk/Mogre/ogrenew/Samples/Common/bin/Release/CeguiBindings.dll
    trunk/Mogre/ogrenew/Samples/Common/bin/Release/CeguiDotNet.dll
    trunk/Mogre/ogrenew/Samples/Common/bin/Release/OgreBindings_Cegui.dll

Modified: trunk/Mogre/ChangeLog.txt
===================================================================
--- trunk/Mogre/ChangeLog.txt	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/ChangeLog.txt	2006-10-05 03:32:20 UTC (rev 53)
@@ -1,3 +1,11 @@
+------------------------------------------------------------------------
+Changes since MOGRE v0.1.7
+------------------------------------------------------------------------
+--Added OgreDotNet's CeguiNet bindings, a CeguiNet renderer for Mogre and ported Ogre's Gui sample
+
+
+
+------------------------------------------------------------------------
 Changes since MOGRE v0.1.6
 ------------------------------------------------------------------------
 --Added PLSM2Helper library for accessing the options of PagingLandScapeSceneManager2

Modified: trunk/Mogre/Mogre/include/auto/MogreAnimable.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreAnimable.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogreAnimable.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -264,6 +264,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreArchive.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreArchive.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogreArchive.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -181,6 +181,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreCodec.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreCodec.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogreCodec.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -125,6 +125,11 @@
 				return reinterpret_cast<int>( _native );
 			}
 	
+			property IntPtr NativePtr
+			{
+				IntPtr get() { return (IntPtr)_sharedPtr; }
+			}
+	
 			property bool Unique
 			{
 				bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreCompositor.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreCompositor.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogreCompositor.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -155,6 +155,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreDataStream.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreDataStream.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogreDataStream.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -227,6 +227,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()
@@ -341,6 +346,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()
@@ -449,6 +459,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreException.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreException.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogreException.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -83,6 +83,12 @@
 			String^ get();
 		}
 	
+		property bool IsThrown
+		{
+		public:
+			static bool get();
+		}
+	
 		property Mogre::OgreException^ LastException
 		{
 		public:

Modified: trunk/Mogre/Mogre/include/auto/MogreFont.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreFont.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogreFont.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -186,6 +186,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -973,6 +973,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()
@@ -1081,6 +1086,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreHardwareIndexBuffer.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreHardwareIndexBuffer.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogreHardwareIndexBuffer.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -135,6 +135,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreHardwarePixelBuffer.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreHardwarePixelBuffer.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogreHardwarePixelBuffer.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -167,6 +167,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreHardwareVertexBuffer.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreHardwareVertexBuffer.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogreHardwareVertexBuffer.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -152,6 +152,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreHighLevelGpuProgram.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreHighLevelGpuProgram.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogreHighLevelGpuProgram.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -115,6 +115,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreMaterial.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreMaterial.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogreMaterial.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -278,6 +278,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreMesh.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreMesh.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogreMesh.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -434,6 +434,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogrePatchMesh.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogrePatchMesh.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogrePatchMesh.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -127,6 +127,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreResource.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreResource.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogreResource.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -264,6 +264,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreSkeleton.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreSkeleton.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogreSkeleton.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -304,6 +304,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreStringVector.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreStringVector.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogreStringVector.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -88,6 +88,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreTexture.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreTexture.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/include/auto/MogreTexture.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -261,6 +261,11 @@
 			return reinterpret_cast<int>( _native );
 		}
 	
+		property IntPtr NativePtr
+		{
+			IntPtr get() { return (IntPtr)_sharedPtr; }
+		}
+	
 		property bool Unique
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/src/auto/MogreException.cpp
===================================================================
--- trunk/Mogre/Mogre/src/auto/MogreException.cpp	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre/src/auto/MogreException.cpp	2006-10-05 03:32:20 UTC (rev 53)
@@ -54,6 +54,11 @@
 		return TO_CLR_STRING( static_cast<const Ogre::Exception*>(_native)->getFullDescription( ) );
 	}
 	
+	bool OgreException::IsThrown::get()
+	{
+		return Ogre::Exception::getIsThrown( );
+	}
+	
 	Mogre::OgreException^ OgreException::LastException::get()
 	{
 		return Ogre::Exception::getLastException( );

Modified: trunk/Mogre/Mogre.sln
===================================================================
--- trunk/Mogre/Mogre.sln	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Mogre.sln	2006-10-05 03:32:20 UTC (rev 53)
@@ -9,6 +9,10 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.MogreForm", "Samples\MogreForm\Demo.MogreForm.csproj", "{18FB9BEC-359F-426D-9B2B-C554AF60F00D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.Fresnel", "Samples\Fresnel\Demo.Fresnel.csproj", "{C9CD7851-1136-4AF8-A379-E94534444217}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.Gui", "Samples\Gui\Demo.Gui.csproj", "{0951FEC6-3EF9-4337-A5A8-2C8433BA9ABF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -59,6 +63,26 @@
 		{18FB9BEC-359F-426D-9B2B-C554AF60F00D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{18FB9BEC-359F-426D-9B2B-C554AF60F00D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{18FB9BEC-359F-426D-9B2B-C554AF60F00D}.Release|Win32.ActiveCfg = Release|Any CPU
+		{C9CD7851-1136-4AF8-A379-E94534444217}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9CD7851-1136-4AF8-A379-E94534444217}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9CD7851-1136-4AF8-A379-E94534444217}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C9CD7851-1136-4AF8-A379-E94534444217}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C9CD7851-1136-4AF8-A379-E94534444217}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{C9CD7851-1136-4AF8-A379-E94534444217}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C9CD7851-1136-4AF8-A379-E94534444217}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9CD7851-1136-4AF8-A379-E94534444217}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C9CD7851-1136-4AF8-A379-E94534444217}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C9CD7851-1136-4AF8-A379-E94534444217}.Release|Win32.ActiveCfg = Release|Any CPU
+		{0951FEC6-3EF9-4337-A5A8-2C8433BA9ABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0951FEC6-3EF9-4337-A5A8-2C8433BA9ABF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0951FEC6-3EF9-4337-A5A8-2C8433BA9ABF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0951FEC6-3EF9-4337-A5A8-2C8433BA9ABF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0951FEC6-3EF9-4337-A5A8-2C8433BA9ABF}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{0951FEC6-3EF9-4337-A5A8-2C8433BA9ABF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0951FEC6-3EF9-4337-A5A8-2C8433BA9ABF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0951FEC6-3EF9-4337-A5A8-2C8433BA9ABF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0951FEC6-3EF9-4337-A5A8-2C8433BA9ABF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0951FEC6-3EF9-4337-A5A8-2C8433BA9ABF}.Release|Win32.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/Mogre/Samples/ExampleApplication/Demo.ExampleApplication.csproj
===================================================================
--- trunk/Mogre/Samples/ExampleApplication/Demo.ExampleApplication.csproj	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Samples/ExampleApplication/Demo.ExampleApplication.csproj	2006-10-05 03:32:20 UTC (rev 53)
@@ -35,9 +35,9 @@
   <ItemGroup>
     <Reference Include="Microsoft.DirectX, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
     <Reference Include="Microsoft.DirectX.DirectInput, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-    <Reference Include="Mogre, Version=0.1.6.0, Culture=neutral, processorArchitecture=x86">
+    <Reference Include="Mogre, Version=0.1.7.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\ogrenew\Samples\Common\bin\Release\Mogre.dll</HintPath>
+      <HintPath>..\..\ogrenew\Samples\Common\bin\Debug\Mogre.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

Modified: trunk/Mogre/Samples/ExampleApplication/Example.cs
===================================================================
--- trunk/Mogre/Samples/ExampleApplication/Example.cs	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Samples/ExampleApplication/Example.cs	2006-10-05 03:32:20 UTC (rev 53)
@@ -8,15 +8,10 @@
 {
     public abstract class Example
     {
-        public static void CheckForOgreException(Exception e)
+        public static void ShowOgreException()
         {
-            if (e is System.Runtime.InteropServices.SEHException)
-            {
-                // It must be an Ogre Exception
-                OgreException ogreException = OgreException.LastException;
-                if (ogreException != null)
-                    System.Windows.Forms.MessageBox.Show(OgreException.LastException.FullDescription, "An exception has occured!", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
-            }
+            if (OgreException.IsThrown)
+                System.Windows.Forms.MessageBox.Show(OgreException.LastException.FullDescription, "An exception has occured!", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
         }
 
         protected Root root;
@@ -36,7 +31,9 @@
         protected float camSpeed = 100f;
         protected Degree rotateSpeed = 36;
 
+        protected bool shutDown = false;
 
+
         //Do NOT call root.Dispose at the finalizer thread because GL renderer requires that disposing of its objects is made
         //in the same thread as the thread that created the GL renderer.
         //~ExampleApplication()
@@ -145,13 +142,17 @@
             if (window.IsClosed)
                 return false;
 
-            float moveScale;
-            Degree rotScale;
+            HandleInput(evt);
 
+            return !shutDown;
+        }
+
+        protected virtual void HandleInput(FrameEvent evt)
+        {
 			// Move about 100 units per second,
-			moveScale = camSpeed * evt.timeSinceLastFrame;
+			float moveScale = camSpeed * evt.timeSinceLastFrame;
 			// Take about 10 seconds for full rotation
-			rotScale = rotateSpeed * evt.timeSinceLastFrame;
+			Degree rotScale = rotateSpeed * evt.timeSinceLastFrame;
 
 	        Vector3 translateVector = Vector3.ZERO;
 
@@ -167,7 +168,7 @@
             if (input.IsKeyPressed(KeyCodes.Escape))
             {
                 // stop rendering loop
-                return false;
+                shutDown = true;
             }
 
             if (input.IsKeyPressed(KeyCodes.A))
@@ -262,7 +263,7 @@
                 toggleDelay = 1;
             }
 
-            if (input.IsKeyPressed(KeyCodes.P))
+            if (input.IsKeyPressed(KeyCodes.PrintScreen))
             {
                 string[] temp = System.IO.Directory.GetFiles(Environment.CurrentDirectory, "screenshot*.jpg");
                 string fileName = string.Format("screenshot{0}.jpg", temp.Length + 1);
@@ -325,8 +326,14 @@
             {
                 debugTextDelay -= evt.timeSinceLastFrame;
             }
+        }
 
-            return true;
+        protected void TakeScreenshot()
+        {
+            string[] temp = System.IO.Directory.GetFiles(Environment.CurrentDirectory, "screenshot*.jpg");
+            string fileName = string.Format("screenshot{0}.jpg", temp.Length + 1);
+
+            TakeScreenshot(fileName);
         }
 
         protected void TakeScreenshot(string fileName)

Modified: trunk/Mogre/Samples/Fresnel/Program.cs
===================================================================
--- trunk/Mogre/Samples/Fresnel/Program.cs	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Samples/Fresnel/Program.cs	2006-10-05 03:32:20 UTC (rev 53)
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Mogre;
 
 namespace Demo.Fresnel
 {
@@ -13,10 +14,13 @@
                 Fresnel app = new Fresnel();
                 app.Go();
             }
-            catch (Exception e)
+            catch
             {
-                ExampleApplication.Example.CheckForOgreException(e);
-                throw;
+                // Check if it's an Ogre Exception
+                if (OgreException.IsThrown)
+                    ExampleApplication.Example.ShowOgreException();
+                else
+                    throw;
             }
         }
     }

Added: trunk/Mogre/Samples/Gui/Demo.Gui.csproj
===================================================================
--- trunk/Mogre/Samples/Gui/Demo.Gui.csproj	                        (rev 0)
+++ trunk/Mogre/Samples/Gui/Demo.Gui.csproj	2006-10-05 03:32:20 UTC (rev 53)
@@ -0,0 +1,78 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0951FEC6-3EF9-4337-A5A8-2C8433BA9ABF}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Demo.Gui</RootNamespace>
+    <AssemblyName>Mogre.Demo.Gui</AssemblyName>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>
+    </DocumentationFile>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CodeAnalysisRules>
+    </CodeAnalysisRules>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="CeguiDotNet, Version=1.0.2468.4000, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\ogrenew\Samples\Common\bin\Debug\CeguiDotNet.dll</HintPath>
+    </Reference>
+    <Reference Include="Mogre, Version=0.1.7.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\ogrenew\Samples\Common\bin\Debug\Mogre.dll</HintPath>
+    </Reference>
+    <Reference Include="Mogre.Cegui, Version=1.0.2468.33255, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\ogrenew\Samples\Common\bin\Debug\Mogre.Cegui.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Gui.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ExampleApplication\Demo.ExampleApplication.csproj">
+      <Project>{3828AAEC-FCB1-4BD1-BBCC-E94ED8221D98}</Project>
+      <Name>Demo.ExampleApplication</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+    <PostBuildEvent>copy  "$(TargetPath)" "$(SolutionDir)ogrenew\Samples\Common\bin\$(ConfigurationName)"</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

Added: trunk/Mogre/Samples/Gui/Gui.cs
===================================================================
--- trunk/Mogre/Samples/Gui/Gui.cs	                        (rev 0)
+++ trunk/Mogre/Samples/Gui/Gui.cs	2006-10-05 03:32:20 UTC (rev 53)
@@ -0,0 +1,542 @@
+using System;
+using System.Collections.Generic;
+using Mogre;
+using Mogre.Cegui;
+using CeguiDotNet;
+
+namespace Demo.Gui
+{
+    class Gui : Demo.ExampleApplication.Example
+    {
+        bool leftMouseButPressed = false;
+        bool rightMouseButPressed = false;
+
+
+        OgreCEGUIRenderer mGUIRenderer = null;
+        GuiSystem mGUISystem = null;
+        Window mEditorGuiSheet = null;
+        Scrollbar mRed = null;
+        Scrollbar mGreen = null;
+        Scrollbar mBlue = null;
+        StaticImage mPreview = null;
+        Window mTip = null;
+        Listbox mList = null;
+        Window mEditBox = null;
+        Dictionary<string, string> mDescriptionMap = new Dictionary<string, string>();
+
+        //Workarounds for SWIG quirks
+
+        //Keep references so that they doesn't get disposed
+        List<ListboxTextItem> mItems = new List<ListboxTextItem>();
+        //Keep references so that the handlers will work and not throw exception
+        List<Window> mWindows = new List<Window>();
+        List<Window> mLoadedLayoutWins = new List<Window>();
+
+
+        public Gui()
+        {
+            mDescriptionMap["Demo8"] =
+                "The main containing panel";
+            mDescriptionMap["Demo8/Window1"] =
+                "A test window";
+            mDescriptionMap["Demo8/Window1/Listbox"] =
+                "A list box";
+            mDescriptionMap["Demo8/Window1/Controls/Red"] =
+                "A colour slider";
+            mDescriptionMap["Demo8/Window1/Controls/Green"] =
+                "A colour slider";
+            mDescriptionMap["Demo8/Window1/Controls/Blue"] =
+                "A colour slider";
+            mDescriptionMap["Demo8/Window1/Controls/ColourSample"] =
+                "The colour that will be used for the selection when added to the list";
+            mDescriptionMap["Demo8/Window1/Controls/Editbox"] =
+                "An edit box; this text will be added to the list";
+            mDescriptionMap["Demo8/Window1/Controls/Add"] =
+                "Adds the text to the list";
+            mDescriptionMap["Demo8/Window1/Controls/ins1"] =
+                "Some static text";
+        }
+
+
+        public override void CreateInput()
+        {
+            base.CreateInput();
+
+            input.UseKeyboardEvents = true;
+            input.KeyDown += new Axiom.KeyboardEventHandler(input_KeyDown);
+            input.KeyUp += new Axiom.KeyboardEventHandler(input_KeyUp);
+        }
+
+        void input_KeyUp(object sender, Axiom.KeyEventArgs e)
+        {
+            mGUISystem.injectKeyUp((uint)e.Key);
+
+            if (e.Key == Axiom.Input.KeyCodes.PrintScreen)
+                TakeScreenshot();
+        }
+
+        void input_KeyDown(object sender, Axiom.KeyEventArgs e)
+        {
+            mGUISystem.injectKeyDown((uint)e.Key);
+            mGUISystem.injectChar((uint)e.KeyChar);
+        }
+
+        protected override void HandleInput(FrameEvent evt)
+        {
+            input.Capture();
+
+            //Check mouse buttons
+            if (!leftMouseButPressed && input.IsMousePressed(Axiom.Input.MouseButtons.Button0))
+            {
+                leftMouseButPressed = true;
+                mGUISystem.InjectMouseButtonDown(MouseButton.Left);
+            }
+
+            if (leftMouseButPressed && !input.IsMousePressed(Axiom.Input.MouseButtons.Button0))
+            {
+                leftMouseButPressed = false;
+                mGUISystem.InjectMouseButtonUp(MouseButton.Left);
+            }
+
+            if (!rightMouseButPressed && input.IsMousePressed(Axiom.Input.MouseButtons.Button1))
+            {
+                rightMouseButPressed = true;
+                mGUISystem.InjectMouseButtonDown(MouseButton.Right);
+            }
+
+            if (rightMouseButPressed && !input.IsMousePressed(Axiom.Input.MouseButtons.Button1))
+            {
+                rightMouseButPressed = false;
+                mGUISystem.InjectMouseButtonUp(MouseButton.Right);
+            }
+
+            //Mouse motion
+            if (input.RelativeMouseX != 0 || input.RelativeMouseY != 0)
+            {
+                mGUISystem.InjectMouseMove(input.RelativeMouseX, input.RelativeMouseY);
+            }
+
+            // update performance stats once per second
+            if (statDelay < 0.0f && showDebugOverlay)
+            {
+                UpdateStats();
+                statDelay = 1.0f;
+            }
+            else
+            {
+                statDelay -= evt.timeSinceLastFrame;
+            }
+        }
+
+        public override void CreateScene()
+        {
+            // Set ambient light
+            sceneMgr.AmbientLight = new ColourValue(0.5f, 0.5f, 0.5f);
+
+            // Create a skydome
+            sceneMgr.SetSkyDome(true, "Examples/CloudySky", 5, 8);
+
+            // Create a light
+            Light l = sceneMgr.CreateLight("MainLight");
+            // Accept default settings: point light, white diffuse, just set position
+            // NB I could attach the light to a SceneNode if I wanted it to move automatically with
+            //  other objects, but I don't
+            l.SetPosition(20, 80, 50);
+
+            mGUIRenderer = new OgreCEGUIRenderer(base.window,
+                    (byte)RenderQueueGroupID.RENDER_QUEUE_OVERLAY, false, 3000, sceneMgr);
+            mGUIRenderer.Initialise();
+            mGUISystem = new GuiSystem(mGUIRenderer);
+
+
+            Entity ogreHead = sceneMgr.CreateEntity("Head", "ogrehead.mesh");
+
+            SceneNode headNode = sceneMgr.RootSceneNode.CreateChildSceneNode();
+            headNode.AttachObject(ogreHead);
+
+
+            // Setup Render To Texture for preview window
+            RenderTexture rttTex = root.RenderSystem.CreateRenderTexture("RttTex", 512, 512, TextureType.TEX_TYPE_2D, PixelFormat.PF_R8G8B8);
+            {
+                Camera rttCam = sceneMgr.CreateCamera("RttCam");
+                SceneNode camNode =
+                    sceneMgr.RootSceneNode.CreateChildSceneNode("rttCamNode");
+                camNode.AttachObject(rttCam);
+                rttCam.SetPosition(0, 0, 200);
+                //rttCam.setVisible(true);
+
+                Viewport v = rttTex.AddViewport(rttCam);
+                v.OverlaysEnabled = false;
+                v.SetClearEveryFrame(true);
+                v.BackgroundColour = ColourValue.Black;
+            }
+
+            // Retrieve CEGUI texture for the RTT
+            CeguiDotNet.Texture rttTexture = mGUIRenderer.createTexture(new CeguiDotNet.String("RttTex"));
+
+            CeguiDotNet.Imageset rttImageSet =
+                CeguiDotNet.ImagesetManager.Instance.createImageset(
+                        "RttImageset", rttTexture);
+
+            rttImageSet.defineImage("RttImage",
+                    new CEGUIVector2(0.0f, 0.0f),
+                    new CeguiDotNet.Size(rttTexture.getWidth(), rttTexture.getHeight()),
+                    new CEGUIVector2(0.0f, 0.0f));
+
+            // load scheme and set up defaults
+            CeguiDotNet.SchemeManager.Instance.LoadScheme(
+                    "TaharezLookSkin.scheme");
+            mGUISystem.SetDefaultMouseCursor(
+                    "TaharezLook", "MouseArrow");
+            mGUISystem.setDefaultFont("BlueHighway-12");
+
+            CeguiDotNet.Window sheet =
+                CeguiDotNet.WindowManager.Instance.LoadWindowLayout(
+                    "ogregui.layout");
+            mGUISystem.setGUISheet(sheet);
+
+            CeguiDotNet.Combobox objectComboBox = ComboboxFrom(WindowManager.Instance.getWindow("OgreGuiDemo/TabCtrl/Page2/ObjectTypeList"));
+
+            ListboxTextItem item;
+            item = new CeguiDotNet.ListboxTextItem("FrameWindow", 0);
+            //the SWIG's finalizer will delete it
+            item.setAutoDeleted(false);
+            //keep a reference so that the SWIG finalizer doesn't delete it
+            mItems.Add(item);
+            objectComboBox.addItem(item);
+            item = new CeguiDotNet.ListboxTextItem("Horizontal Scrollbar", 1);
+            item.setAutoDeleted(false);
+            mItems.Add(item);
+            objectComboBox.addItem(item);
+            item = new CeguiDotNet.ListboxTextItem("Vertical Scrollbar", 2);
+            item.setAutoDeleted(false);
+            mItems.Add(item);
+            objectComboBox.addItem(item);
+            item = new CeguiDotNet.ListboxTextItem("StaticText", 3);
+            item.setAutoDeleted(false);
+            mItems.Add(item);
+            objectComboBox.addItem(item);
+            item = new CeguiDotNet.ListboxTextItem("StaticImage", 4);
+            item.setAutoDeleted(false);
+            mItems.Add(item);
+            objectComboBox.addItem(item);
+            item = new CeguiDotNet.ListboxTextItem("Render to Texture", 5);
+            item.setAutoDeleted(false);
+            mItems.Add(item);
+            objectComboBox.addItem(item);
+
+            setupEventHandlers();
+
+
+        }
+
+        void setupEventHandlers()
+        {
+            WindowManager wmgr = WindowManager.Instance;
+            Window win;
+            PushButton button;
+
+            win = wmgr.getWindow("OgreGuiDemo/TabCtrl/Page1/QuitButton");
+            button = PushButtonFrom(win);
+            button.SubscribeEvents();
+            button.Clicked += new WindowEventDelegate(handleQuit);
+            mWindows.Add(button);
+
+            win = wmgr.getWindow("OgreGuiDemo/TabCtrl/Page1/NewButton");
+            button = PushButtonFrom(win);
+            button.SubscribeEvents();
+            button.Clicked += new WindowEventDelegate(handleNew);
+            mWindows.Add(button);
+
+            win = wmgr.getWindow("OgreGuiDemo/TabCtrl/Page1/LoadButton");
+            button = PushButtonFrom(win);
+            button.SubscribeEvents();
+            button.Clicked += new WindowEventDelegate(handleLoad);
+            mWindows.Add(button);
+
+            win = wmgr.getWindow("OgreGuiDemo/TabCtrl/Page2/ObjectTypeList");
+            Combobox box = ComboboxFrom(win);
+            box.SubscribeEvents();
+            box.ListSelectionAccepted += new WindowEventDelegate(handleObjectSelection);
+            mWindows.Add(box);
+        }
+
+
+        // Helper functions for casting Window to its subclasses
+        PushButton PushButtonFrom(Window win)
+        {
+            return new PushButton(Window.getCPtr(win).Handle, false);
+        }
+
+        Combobox ComboboxFrom(Window win)
+        {
+            return new Combobox(Window.getCPtr(win).Handle, false);
+        }
+
+        Scrollbar ScrollbarFrom(Window win)
+        {
+            return new Scrollbar(Window.getCPtr(win).Handle, false);
+        }
+
+        StaticImage StaticImageFrom(Window win)
+        {
+            return new StaticImage(Window.getCPtr(win).Handle, false);
+        }
+
+        Listbox ListboxFrom(Window win)
+        {
+            return new Listbox(Window.getCPtr(win).Handle, false);
+        }
+
+
+        int rttCounter = 0;
+        Window createRttGuiObject()
+        {
+            string guiObjectName = "NewRttImage" + rttCounter;
+
+            Imageset rttImageSet =
+                ImagesetManager.Instance.getImageset(
+                    "RttImageset");
+            StaticImage si = StaticImageFrom(WindowManager.Instance.CreateWindow("TaharezLook/StaticImage", guiObjectName));
+            si.SetSize(new Size(0.5f, 0.4f));
+            si.setImage(rttImageSet.getImage("RttImage"));
+
+            rttCounter++;
+
+            return si;
+        }
+
+        int siCounter = 0;
+        Window createStaticImageObject()
+        {
+            string guiObjectName = "NewStaticImage" + siCounter;
+
+            Imageset imageSet =
+                ImagesetManager.Instance.getImageset(
+                    "TaharezLook");
+
+            StaticImage si = StaticImageFrom(WindowManager.Instance.CreateWindow("TaharezLook/StaticImage", guiObjectName));
+            si.SetSize(new Size(0.2f, 0.2f));
+            si.setImage(imageSet.getImage("ClientBrush"));
+
+            siCounter++;
+
+            return si;
+        }
+
+
+        void setupLoadedLayoutHandlers()
+        {
+            mLoadedLayoutWins.Clear();
+
+            WindowManager wmgr = WindowManager.Instance;
+            mRed = ScrollbarFrom(wmgr.getWindow("Demo8/Window1/Controls/Red"));
+            mGreen = ScrollbarFrom(wmgr.getWindow("Demo8/Window1/Controls/Green"));
+            mBlue = ScrollbarFrom(wmgr.getWindow("Demo8/Window1/Controls/Blue"));
+            mPreview = StaticImageFrom(wmgr.getWindow("Demo8/Window1/Controls/ColourSample"));
+            mList = ListboxFrom(wmgr.getWindow("Demo8/Window1/Listbox"));
+            mEditBox = wmgr.getWindow("Demo8/Window1/Controls/Editbox");
+            mTip = wmgr.getWindow("Demo8/Window2/Tips");
+
+            mRed.SubscribeEvents();
+            mRed.ScrollPositionChanged += new WindowEventDelegate(handleColourChanged);
+            mGreen.SubscribeEvents();
+            mGreen.ScrollPositionChanged += new WindowEventDelegate(handleColourChanged);
+            mBlue.SubscribeEvents();
+            mBlue.ScrollPositionChanged += new WindowEventDelegate(handleColourChanged);
+
+            PushButton button = PushButtonFrom(wmgr.getWindow("Demo8/Window1/Controls/Add"));
+            button.SubscribeEvents();
+            button.Clicked += new WindowEventDelegate(handleAdd);
+            mLoadedLayoutWins.Add(button);
+
+            Window root = wmgr.getWindow("Demo8");
+            setupEnterExitEvents(root);
+        }
+
+
+        void setupEnterExitEvents(Window win)
+        {
+            win.SubscribeEvents();
+            win.MouseEnters += new MouseEventDelegate(handleMouseEnters);
+            win.MouseLeaves += new MouseEventDelegate(handleMouseLeaves);
+
+            for (uint i = 0; i < win.getChildCount(); ++i)
+            {
+                Window child = win.getChildAtIdx(i);
+                setupEnterExitEvents(child);
+            }
+
+            //keep a reference or else expect exceptions..
+            mLoadedLayoutWins.Add(win);
+        }
+
+
+        bool handleQuit(WindowEventArgs e)
+        {
+            shutDown = true;
+            return true;
+        }
+
+
+        bool handleNew(WindowEventArgs e)
+        {
+            if (mEditorGuiSheet != null)
+                WindowManager.Instance.destroyWindow(mEditorGuiSheet);
+
+            mEditorGuiSheet = WindowManager.Instance.CreateWindow("DefaultGUISheet", "NewLayout");
+
+            Window editorWindow = WindowManager.Instance.getWindow("OgreGuiDemo2/MainWindow");
+            editorWindow.AddChildWindow(mEditorGuiSheet);
+
+            return true;
+        }
+
+        bool handleLoad(WindowEventArgs e)
+        {
+            if (mEditorGuiSheet != null)
+                WindowManager.Instance.destroyWindow(mEditorGuiSheet);
+
+            mEditorGuiSheet =
+                WindowManager.Instance.LoadWindowLayout(
+                    "cegui8.layout");
+            setupLoadedLayoutHandlers();
+
+            Window editorWindow = WindowManager.Instance.getWindow("OgreGuiDemo2/MainWindow");
+            editorWindow.AddChildWindow(mEditorGuiSheet);
+
+            return true;
+        }
+
+        bool handleMouseEnters(WindowEventArgs e)
+        {
+            string val = null;
+            if (mDescriptionMap.TryGetValue(e.window.getName(), out val) == true)
+            {
+                mTip.setText(val);
+            }
+            else
+            {
+                mTip.setText("");
+            }
+
+            return true;
+        }
+        bool handleMouseLeaves(WindowEventArgs e)
+        {
+            mTip.setText("");
+            return true;
+        }
+
+
+        int windowNumber = 0;
+        int vertScrollNumber = 0;
+        int horizScrollNumber = 0;
+        int textScrollNumber = 0;
+
+        bool handleObjectSelection(WindowEventArgs e)
+        {
+            string guiObjectName;
+            Window window = null;
+
+            // Set a random position to place this object.
+            float posX = Mogre.Math.RangeRandom(0.0f, 0.7f);
+            float posY = Mogre.Math.RangeRandom(0.1f, 0.7f);
+
+            ListboxItem item = ComboboxFrom(e.window).getSelectedItem();
+
+            Window editorWindow = WindowManager.Instance.getWindow("OgreGuiDemo2/MainWindow");
+
+            switch (item.getID())
+            {
+                case 0:
+                    guiObjectName = "NewWindow" + windowNumber;
+                    window = WindowManager.Instance.CreateWindow("TaharezLook/FrameWindow", guiObjectName);
+                    window.SetSize(new Size(0.3f, 0.3f));
+                    window.setText("New Window");
+                    windowNumber++;
+                    break;
+                case 1:
+                    guiObjectName = "NewHorizScroll" + horizScrollNumber;
+                    window = WindowManager.Instance.CreateWindow("TaharezLook/HorizontalScrollbar", guiObjectName);
+                    window.SetSize(new Size(0.75f, 0.03f));
+                    horizScrollNumber++;
+                    break;
+                case 2:
+                    guiObjectName = "NewVertScroll" + vertScrollNumber;
+                    window = WindowManager.Instance.CreateWindow("TaharezLook/VerticalScrollbar", guiObjectName);
+                    window.SetSize(new Size(0.03f, 0.75f));
+                    vertScrollNumber++;
+                    break;
+                case 3:
+                    guiObjectName = "NewStaticText" + textScrollNumber;
+                    window = WindowManager.Instance.CreateWindow("TaharezLook/StaticText", guiObjectName);
+                    window.SetSize(new Size(0.25f, 0.1f));
+                    window.setText("Example static text");
+                    textScrollNumber++;
+                    break;
+                case 4:
+                    window = createStaticImageObject();
+                    break;
+                case 5:
+                    window = createRttGuiObject();
+                    break;
+            };
+
+            editorWindow.AddChildWindow(window);
+            window.SetPosition(new CEGUIVector2(posX, posY));
+
+            return true;
+        }
+
+
+        bool handleColourChanged(WindowEventArgs e)
+        {
+            mPreview.setImageColours(new colour(
+                mRed.getScrollPosition() / 255.0f,
+                mGreen.getScrollPosition() / 255.0f,
+                mBlue.getScrollPosition() / 255.0f));
+
+            return true;
+
+        }
+
+        bool handleAdd(WindowEventArgs e)
+        {
+            ListboxTextItem listboxitem =
+                new ListboxTextItem(mEditBox.getText());
+            listboxitem.setSelectionBrushImage("TaharezLook", "ListboxSelectionBrush");
+            listboxitem.setSelected(mList.getItemCount() == 0);
+            listboxitem.setSelectionColours(mPreview.getImageColours());
+            listboxitem.setAutoDeleted(false);
+            mItems.Add(listboxitem);
+            mList.addItem(listboxitem);
+            return true;
+        }
+
+
+        public override void DestroyScene()
+        {
+            mItems.Clear();
+            mWindows.Clear();
+            mLoadedLayoutWins.Clear();
+
+            if (mEditorGuiSheet != null)
+            {
+                WindowManager.Instance.destroyWindow(mEditorGuiSheet);
+            }
+            if (mGUISystem != null)
+            {
+                mGUISystem.Dispose();
+                mGUISystem = null;
+            }
+            if (mGUIRenderer != null)
+            {
+                mGUIRenderer.Dispose();
+                mGUIRenderer = null;
+            }
+
+            base.DestroyScene();
+        }
+    }
+}
\ No newline at end of file

Added: trunk/Mogre/Samples/Gui/Program.cs
===================================================================
--- trunk/Mogre/Samples/Gui/Program.cs	                        (rev 0)
+++ trunk/Mogre/Samples/Gui/Program.cs	2006-10-05 03:32:20 UTC (rev 53)
@@ -0,0 +1,27 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Mogre;
+
+namespace Demo.Gui
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            try
+            {
+                Gui app = new Gui();
+                app.Go();
+            }
+            catch
+            {
+                // Check if it's an Ogre Exception
+                if (OgreException.IsThrown)
+                    ExampleApplication.Example.ShowOgreException();
+                else
+                    throw;
+            }
+        }
+    }
+}

Added: trunk/Mogre/Samples/Gui/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Mogre/Samples/Gui/Properties/AssemblyInfo.cs	                        (rev 0)
+++ trunk/Mogre/Samples/Gui/Properties/AssemblyInfo.cs	2006-10-05 03:32:20 UTC (rev 53)
@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("SkeletalAnimation")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Unicef")]
+[assembly: AssemblyProduct("SkeletalAnimation")]
+[assembly: AssemblyCopyright("Copyright © Unicef 2006")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("0e5106ef-cbfe-496f-afa0-82a5ab45f527")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Modified: trunk/Mogre/Samples/SkeletalAnimation/Program.cs
===================================================================
--- trunk/Mogre/Samples/SkeletalAnimation/Program.cs	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/Samples/SkeletalAnimation/Program.cs	2006-10-05 03:32:20 UTC (rev 53)
@@ -14,10 +14,13 @@
                 Skeletal app = new Skeletal();
                 app.Go();
             }
-            catch (Exception e)
+            catch
             {
-                ExampleApplication.Example.CheckForOgreException(e);
-                throw;
+                // Check if it's an Ogre Exception
+                if (OgreException.IsThrown)
+                    ExampleApplication.Example.ShowOgreException();
+                else
+                    throw;
             }
         }
     }

Modified: trunk/Mogre/ogrenew/OgreMain/include/OgreException.h
===================================================================
--- trunk/Mogre/ogrenew/OgreMain/include/OgreException.h	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/ogrenew/OgreMain/include/OgreException.h	2006-10-05 03:32:20 UTC (rev 53)
@@ -113,6 +113,9 @@
         ushort stackDepth;
         static Exception* last;
 
+		//Addition for Mogre
+		static bool isThrown;
+
         static String msFunctionStack[ OGRE_CALL_STACK_DEPTH ];
         static ushort   msStackDepth;
     public:
@@ -148,6 +151,12 @@
         */
         Exception(const Exception& rhs);
 
+		//Addition for Mogre
+		~Exception()
+		{
+			isThrown = false;
+		}
+
         /** Assignment operator.
         */
         void operator = (const Exception& rhs);
@@ -190,6 +199,9 @@
         */
         static Exception* getLastException(void) throw();
 
+		//Addition for Mogre
+		static bool getIsThrown(void) { return isThrown; }
+
         /** Pushes a function on the stack.
         */
         static void _pushFunction( const String& strFuncName ) throw();

Modified: trunk/Mogre/ogrenew/OgreMain/src/OgreException.cpp
===================================================================
--- trunk/Mogre/ogrenew/OgreMain/src/OgreException.cpp	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/Mogre/ogrenew/OgreMain/src/OgreException.cpp	2006-10-05 03:32:20 UTC (rev 53)
@@ -36,6 +36,9 @@
 
     Exception* Exception::last = NULL;
 
+	//Addition for Mogre
+	bool Exception::isThrown = false;
+
     String Exception::msFunctionStack[ OGRE_CALL_STACK_DEPTH ];
     ushort   Exception::msStackDepth = 0;
 
@@ -51,6 +54,8 @@
 
         // Set last
         last = this;
+		//Addition for Mogre
+		isThrown = true;
     }
 
     Exception::Exception(int num, const String& desc, const String& src, const char* fil, long lin) :
@@ -68,6 +73,8 @@
 
         // Set last
         last = this;
+		//Addition for Mogre
+		isThrown = true;
     }
 
     Exception::Exception(const Exception& rhs)

Added: trunk/Mogre/ogrenew/Samples/Common/bin/Debug/CeGuiDotNet.Mogre.dll
===================================================================
(Binary files differ)


Property changes on: trunk/Mogre/ogrenew/Samples/Common/bin/Debug/CeGuiDotNet.Mogre.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/Mogre/ogrenew/Samples/Common/bin/Debug/CeguiBindings.dll
===================================================================
(Binary files differ)


Property changes on: trunk/Mogre/ogrenew/Samples/Common/bin/Debug/CeguiBindings.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/Mogre/ogrenew/Samples/Common/bin/Debug/CeguiDotNet.dll
===================================================================
(Binary files differ)


Property changes on: trunk/Mogre/ogrenew/Samples/Common/bin/Debug/CeguiDotNet.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/Mogre/ogrenew/Samples/Common/bin/Debug/OgreBindings_Cegui.dll
===================================================================
(Binary files differ)


Property changes on: trunk/Mogre/ogrenew/Samples/Common/bin/Debug/OgreBindings_Cegui.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/Mogre/ogrenew/Samples/Common/bin/Release/CeGuiDotNet.Mogre.dll
===================================================================
(Binary files differ)


Property changes on: trunk/Mogre/ogrenew/Samples/Common/bin/Release/CeGuiDotNet.Mogre.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/Mogre/ogrenew/Samples/Common/bin/Release/CeguiBindings.dll
===================================================================
(Binary files differ)


Property changes on: trunk/Mogre/ogrenew/Samples/Common/bin/Release/CeguiBindings.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/Mogre/ogrenew/Samples/Common/bin/Release/CeguiDotNet.dll
===================================================================
(Binary files differ)


Property changes on: trunk/Mogre/ogrenew/Samples/Common/bin/Release/CeguiDotNet.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/Mogre/ogrenew/Samples/Common/bin/Release/OgreBindings_Cegui.dll
===================================================================
(Binary files differ)


Property changes on: trunk/Mogre/ogrenew/Samples/Common/bin/Release/OgreBindings_Cegui.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/MogreNewt/Samples/Basics/Basics.cs
===================================================================
--- trunk/MogreNewt/Samples/Basics/Basics.cs	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/MogreNewt/Samples/Basics/Basics.cs	2006-10-05 03:32:20 UTC (rev 53)
@@ -127,7 +127,7 @@
             floornode.AttachObject(floor);
             floor.SetMaterialName("Simple/BeachStones");
 
-            floor.SetCastShadows(false);
+            floor.CastShadows = false;
 
             //-------------------------------------------------------------
             // add some other objects.
@@ -137,7 +137,7 @@
             floornode2 = floornode.CreateChildSceneNode("FloorNode2");
             floornode2.AttachObject(floor2);
             floor2.SetMaterialName("Simple/BeachStones");
-            floor2.SetCastShadows(false);
+            floor2.CastShadows = false;
             floornode2.SetPosition(80.0f, 0.0f, 0.0f);
 
             Entity floor3;
@@ -146,7 +146,7 @@
             floornode3 = floornode.CreateChildSceneNode("FloorNode3");
             floornode3.AttachObject(floor3);
             floor3.SetMaterialName("Simple/BeachStones");
-            floor3.SetCastShadows(false);
+            floor3.CastShadows = false;
             floornode3.SetPosition(-80.0f, -5.0f, 0.0f);
             floornode3.Orientation = new Quaternion(new Degree(15.0f), Vector3.UNIT_Z);
             //-------------------------------------------------------------

Modified: trunk/MogreNewt/Samples/Basics/Demo.Basics.csproj
===================================================================
--- trunk/MogreNewt/Samples/Basics/Demo.Basics.csproj	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/MogreNewt/Samples/Basics/Demo.Basics.csproj	2006-10-05 03:32:20 UTC (rev 53)
@@ -35,7 +35,7 @@
     </Reference>
     <Reference Include="Mogre.Demo.ExampleApplication, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Mogre\Samples\ExampleApplication\bin\Release\Mogre.Demo.ExampleApplication.dll</HintPath>
+      <HintPath>..\..\..\Mogre\ogrenew\Samples\Common\bin\Debug\Mogre.Demo.ExampleApplication.dll</HintPath>
     </Reference>
     <Reference Include="MogreNewt, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>

Modified: trunk/MogreNewt/Samples/Basics/Program.cs
===================================================================
--- trunk/MogreNewt/Samples/Basics/Program.cs	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/MogreNewt/Samples/Basics/Program.cs	2006-10-05 03:32:20 UTC (rev 53)
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Mogre;
 
 namespace Demo.Basics
 {
@@ -13,10 +14,13 @@
                 Basics app = new Basics();
                 app.Go();
             }
-            catch (Exception e)
+            catch
             {
-                ExampleApplication.Example.CheckForOgreException(e);
-                throw;
+                // Check if it's an Ogre Exception
+                if (OgreException.IsThrown)
+                    ExampleApplication.Example.ShowOgreException();
+                else
+                    throw;
             }
         }
     }

Modified: trunk/MogreNewt/Samples/SimpleVehicle/Demo.SimpleVehicle.csproj
===================================================================
--- trunk/MogreNewt/Samples/SimpleVehicle/Demo.SimpleVehicle.csproj	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/MogreNewt/Samples/SimpleVehicle/Demo.SimpleVehicle.csproj	2006-10-05 03:32:20 UTC (rev 53)
@@ -35,7 +35,7 @@
     </Reference>
     <Reference Include="Mogre.Demo.ExampleApplication, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Mogre\Samples\ExampleApplication\bin\Release\Mogre.Demo.ExampleApplication.dll</HintPath>
+      <HintPath>..\..\..\Mogre\ogrenew\Samples\Common\bin\Debug\Mogre.Demo.ExampleApplication.dll</HintPath>
     </Reference>
     <Reference Include="MogreNewt, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>

Modified: trunk/MogreNewt/Samples/SimpleVehicle/Program.cs
===================================================================
--- trunk/MogreNewt/Samples/SimpleVehicle/Program.cs	2006-10-02 16:30:34 UTC (rev 52)
+++ trunk/MogreNewt/Samples/SimpleVehicle/Program.cs	2006-10-05 03:32:20 UTC (rev 53)
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Mogre;
 
 namespace Demo.SimpleVehicle
 {
@@ -13,10 +14,13 @@
                 SimpleVehicleApp app = new SimpleVehicleApp();
                 app.Go();
             }
-            catch (Exception e)
+            catch
             {
-                ExampleApplication.Example.CheckForOgreException(e);
-                throw;
+                // Check if it's an Ogre Exception
+                if (OgreException.IsThrown)
+                    ExampleApplication.Example.ShowOgreException();
+                else
+                    throw;
             }
         }
     }

Modified: trunk/MogreNewt/Samples/SimpleVehicle/SimpleVehicleApp.cs
=============================...
 
[truncated message content]

[Mogre-svnmail] test

[<mog...@li...>]

test

[Mogre-svnmail] SF.net SVN: mogre: [40] trunk/Mogre

[<mog...@li...>]

Revision: 40
          http://svn.sourceforge.net/mogre/?rev=40&view=rev
Author:   bekas
Date:     2006-09-26 17:48:38 -0700 (Tue, 26 Sep 2006)

Log Message:
-----------
--Added Box, PixelBox, PixelUtil
--Removed ManagedDataStreamPtr and added ManagedDataStream.
	To get the equal of ManagedDataStreamPtr use "new DataStreamPtr( new ManagedDataStream(stream) )". If you don't wrap
	ManagedDataStream with a DataStreamPtr, call Dispose to clean it up.
--DataStream and MemoryDataStream do not have a finalizer now. If you don't wrap them with a DataStreamPtr/MemoryDataStreamPtr,
	you have to call Dispose to clean them up.

Modified Paths:
--------------
    trunk/Mogre/ChangeLog.txt
    trunk/Mogre/Mogre/Mogre.vcproj
    trunk/Mogre/Mogre/include/Custom/MogreRect.h
    trunk/Mogre/Mogre/include/PortedClasses.h
    trunk/Mogre/Mogre/include/auto/MakePublicDeclarations.h
    trunk/Mogre/Mogre/include/auto/MogreAnimable.h
    trunk/Mogre/Mogre/include/auto/MogreArchive.h
    trunk/Mogre/Mogre/include/auto/MogreCodec.h
    trunk/Mogre/Mogre/include/auto/MogreCompositor.h
    trunk/Mogre/Mogre/include/auto/MogreConfigOptionMap.h
    trunk/Mogre/Mogre/include/auto/MogreDataStream.h
    trunk/Mogre/Mogre/include/auto/MogreFont.h
    trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h
    trunk/Mogre/Mogre/include/auto/MogreHardwareIndexBuffer.h
    trunk/Mogre/Mogre/include/auto/MogreHardwarePixelBuffer.h
    trunk/Mogre/Mogre/include/auto/MogreHardwareVertexBuffer.h
    trunk/Mogre/Mogre/include/auto/MogreHighLevelGpuProgram.h
    trunk/Mogre/Mogre/include/auto/MogreImage.h
    trunk/Mogre/Mogre/include/auto/MogreMaterial.h
    trunk/Mogre/Mogre/include/auto/MogreMesh.h
    trunk/Mogre/Mogre/include/auto/MogrePatchMesh.h
    trunk/Mogre/Mogre/include/auto/MogrePixelFormat.h
    trunk/Mogre/Mogre/include/auto/MogreResource.h
    trunk/Mogre/Mogre/include/auto/MogreSkeleton.h
    trunk/Mogre/Mogre/include/auto/MogreStringVector.h
    trunk/Mogre/Mogre/include/auto/MogreTexture.h
    trunk/Mogre/Mogre/include/auto/MogreVertexBoneAssignment.h
    trunk/Mogre/Mogre/include/auto/PreDeclarations.h
    trunk/Mogre/Mogre/src/auto/MogreHardwarePixelBuffer.cpp
    trunk/Mogre/Mogre/src/auto/MogreImage.cpp
    trunk/Mogre/ogrenew/OgreMain/include/CLRConfig.h

Added Paths:
-----------
    trunk/Mogre/Mogre/include/Custom/ManagedDataStream.h
    trunk/Mogre/Mogre/include/Custom/MogreBox.h
    trunk/Mogre/Mogre/src/Custom/ManagedDataStream.cpp
    trunk/Mogre/Mogre/src/Custom/MogreBox.cpp
    trunk/Mogre/Mogre/src/auto/MogrePixelFormat.cpp

Removed Paths:
-------------
    trunk/Mogre/Mogre/include/Custom/ManagedDataStreamPtr.h
    trunk/Mogre/Mogre/src/Custom/ManagedDataStreamPtr.cpp

Modified: trunk/Mogre/ChangeLog.txt
===================================================================
--- trunk/Mogre/ChangeLog.txt	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/ChangeLog.txt	2006-09-27 00:48:38 UTC (rev 40)
@@ -18,3 +18,9 @@
 --Added StringConverter, StringInterface/IStringInterface classes
 --Added ParamCommand class, ParameterDef_NativePtr and ParamDictionary_NativePtr structs
 	(for Ogre's ParameterDef and ParamDictionary)
+--Added Box, PixelBox, PixelUtil
+--Removed ManagedDataStreamPtr and added ManagedDataStream.
+	To get the equal of ManagedDataStreamPtr use "new DataStreamPtr( new ManagedDataStream(stream) )". If you don't wrap
+	ManagedDataStream with a DataStreamPtr, call Dispose to clean it up.
+--DataStream and MemoryDataStream do not have a finalizer now. If you don't wrap them with a DataStreamPtr/MemoryDataStreamPtr,
+	you have to call Dispose to clean them up.

Modified: trunk/Mogre/Mogre/Mogre.vcproj
===================================================================
--- trunk/Mogre/Mogre/Mogre.vcproj	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/Mogre.vcproj	2006-09-27 00:48:38 UTC (rev 40)
@@ -220,7 +220,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\src\Custom\ManagedDataStreamPtr.cpp"
+				RelativePath=".\src\Custom\ManagedDataStream.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -308,6 +308,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\src\Custom\MogreBox.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\src\auto\MogreCamera.cpp"
 				>
 			</File>
@@ -648,15 +652,18 @@
 				>
 			</File>
 			<File
-				RelativePath=".\src\auto\MogrePlane.cpp"
+				RelativePath=".\src\auto\MogrePixelFormat.cpp"
 				>
+			</File>
+			<File
+				RelativePath=".\src\Custom\MogrePlane.cpp"
+				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						UsePrecompiledHeader="0"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -664,20 +671,20 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						UsePrecompiledHeader="2"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\Custom\MogrePlane.cpp"
+				RelativePath=".\src\auto\MogrePlane.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -685,7 +692,8 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -1012,7 +1020,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\include\Custom\ManagedDataStreamPtr.h"
+				RelativePath=".\include\Custom\ManagedDataStream.h"
 				>
 			</File>
 			<File
@@ -1072,6 +1080,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\include\Custom\MogreBox.h"
+				>
+			</File>
+			<File
 				RelativePath=".\include\auto\MogreCamera.h"
 				>
 			</File>
@@ -1364,11 +1376,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\include\auto\MogrePlane.h"
+				RelativePath=".\include\Custom\MogrePlane.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\Custom\MogrePlane.h"
+				RelativePath=".\include\auto\MogrePlane.h"
 				>
 			</File>
 			<File

Added: trunk/Mogre/Mogre/include/Custom/ManagedDataStream.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/ManagedDataStream.h	                        (rev 0)
+++ trunk/Mogre/Mogre/include/Custom/ManagedDataStream.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -0,0 +1,69 @@
+#pragma once
+
+#include <gcroot.h>
+#include "OgreDataStream.h"
+#include "MogreDataStream.h"
+
+namespace Mogre
+{
+	public ref class ManagedDataStream : DataStream
+	{
+		Ogre::DataStream* _createNative(System::IO::Stream^ stream);
+
+	internal:
+		System::IO::Stream^ _stream;
+		
+	public:
+		ManagedDataStream(System::IO::Stream^ stream) : DataStream( _createNative(stream) )
+		{
+			_createdByCLR = true;
+		}
+
+		property System::IO::Stream^ Stream
+		{
+			System::IO::Stream^ get()
+			{
+				return _stream;
+			}
+		}
+
+	};
+
+	class DataStream_Proxy : public Ogre::DataStream
+	{
+		gcroot<ManagedDataStream^> _managed;
+		long _initPos;
+
+	public:
+		DataStream_Proxy( ManagedDataStream^ managed ) : _managed(managed)
+		{
+			_initPos = managed->_stream->Position;
+			mSize = managed->_stream->Length - _initPos;
+		}
+
+		~DataStream_Proxy()
+		{
+			_managed->_native = 0;
+		}
+
+		virtual size_t read(void* buf, size_t count);
+
+		/** Skip a defined number of bytes. This can also be a negative value, in which case
+		the file pointer rewinds a defined number of bytes. */
+		virtual void skip(long count) ;
+	
+		/** Repositions the read point to a specified byte.
+	    */
+	    virtual void seek( size_t pos );
+		
+		/** Returns the current byte offset from beginning */
+	    virtual size_t tell(void) const;
+
+		/** Returns true if the stream has reached the end.
+	    */
+	    virtual bool eof(void) const;
+
+        /** Close the stream; this makes further operations invalid. */
+        virtual void close(void);
+	};
+}
\ No newline at end of file

Deleted: trunk/Mogre/Mogre/include/Custom/ManagedDataStreamPtr.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/ManagedDataStreamPtr.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/Custom/ManagedDataStreamPtr.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -1,75 +0,0 @@
-#pragma once
-
-#include <gcroot.h>
-#include "OgreDataStream.h"
-#include "MogreDataStream.h"
-
-namespace Mogre
-{
-	public ref class ManagedDataStreamPtr
-	{
-		Ogre::DataStreamPtr* _native;
-
-	internal:
-		System::IO::Stream^ _stream;
-		
-	public:
-		static operator DataStreamPtr^ ( ManagedDataStreamPtr^ stream )
-		{
-			return gcnew DataStreamPtr( *stream->_native );
-		}
-
-		ManagedDataStreamPtr( System::IO::Stream^ stream);
-
-		~ManagedDataStreamPtr()
-		{
-			if (_native)
-			{
-				delete _native;
-				_native = 0;
-			}
-		}
-
-		property System::IO::Stream^ Stream
-		{
-			System::IO::Stream^ get()
-			{
-				return _stream;
-			}
-		}
-
-	};
-
-	class ManagedDataStream_Proxy : public Ogre::DataStream
-	{
-		gcroot<ManagedDataStreamPtr^> _managed;
-		long _initPos;
-
-	public:
-		ManagedDataStream_Proxy( ManagedDataStreamPtr^ managed ) : _managed(managed)
-		{
-			_initPos = managed->_stream->Position;
-			mSize = managed->_stream->Length - _initPos;
-		}
-
-		virtual size_t read(void* buf, size_t count);
-
-		/** Skip a defined number of bytes. This can also be a negative value, in which case
-		the file pointer rewinds a defined number of bytes. */
-		virtual void skip(long count) ;
-	
-		/** Repositions the read point to a specified byte.
-	    */
-	    virtual void seek( size_t pos );
-		
-		/** Returns the current byte offset from beginning */
-	    virtual size_t tell(void) const;
-
-		/** Returns true if the stream has reached the end.
-	    */
-	    virtual bool eof(void) const;
-
-        /** Close the stream; this makes further operations invalid. */
-        virtual void close(void);
-	};
-}
\ No newline at end of file

Added: trunk/Mogre/Mogre/include/Custom/MogreBox.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreBox.h	                        (rev 0)
+++ trunk/Mogre/Mogre/include/Custom/MogreBox.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -0,0 +1,214 @@
+#pragma once
+
+#include "OgreCommon.h"
+
+
+namespace Mogre
+{
+	value class Box;
+	value class PixelBox;
+}
+
+#include "MogrePixelFormat.h"
+
+namespace Mogre
+{
+    /** Structure used to define a box in a 3-D integer space.
+     	Note that the left, top, and front edges are included but the right, 
+     	bottom and top ones are not.
+     */
+    public value class Box
+    {
+	public:
+		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_VALUECLASS( Box )
+
+		size_t left, top, right, bottom, front, back;
+        /** Define a box from left, top, right and bottom coordinates
+        	This box will have depth one (front=0 and back=1).
+        	@param	l	x value of left edge
+        	@param	t	y value of top edge
+        	@param	r	x value of right edge
+        	@param	b	y value of bottom edge
+        	@note Note that the left, top, and front edges are included 
+	           	but the right, bottom and top ones are not.
+        */
+        Box( size_t l, size_t t, size_t r, size_t b ):
+            left(l),
+            top(t),   
+            right(r),
+            bottom(b),
+            front(0),
+            back(1)
+        {
+      		assert(right >= left && bottom >= top && back >= front);
+        }
+        /** Define a box from left, top, front, right, bottom and back
+        	coordinates.
+        	@param	l	x value of left edge
+        	@param	t	y value of top edge
+        	@param  ff  z value of front edge
+        	@param	r	x value of right edge
+        	@param	b	y value of bottom edge
+        	@param  bb  z value of back edge
+        	@note Note that the left, top, and front edges are included 
+	           	but the right, bottom and top ones are not.
+        */
+        Box( size_t l, size_t t, size_t ff, size_t r, size_t b, size_t bb ):
+            left(l),
+            top(t),   
+            right(r),
+            bottom(b),
+            front(ff),
+            back(bb)
+        {
+      		assert(right >= left && bottom >= top && back >= front);
+        }
+        
+        /// Return true if the other box is a part of this one
+        bool Contains(Box def)
+        {
+        	return (def.left >= left && def.top >= top && def.front >= front &&
+				def.right <= right && def.bottom <= bottom && def.back <= back);
+        }
+        
+        /// Get the width of this box
+		property size_t Width
+		{
+			size_t get() { return right-left; }
+		}
+
+        /// Get the height of this box
+		property size_t Height
+		{
+			size_t get() { return bottom-top; }
+		}
+
+        /// Get the depth of this box
+		property size_t Depth
+		{
+			size_t get() { return back-front; }
+		}
+    };
+
+
+	/** A primitive describing a volume (3D), image (2D) or line (1D) of pixels in memory.
+     	In case of a rectangle, depth must be 1. 
+     	Pixels are stored as a succession of "depth" slices, each containing "height" rows of 
+     	"width" pixels.
+    */
+    public value class PixelBox
+	{
+    public:
+		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_VALUECLASS( PixelBox )
+		
+		Box box;
+
+		/** Constructor providing extents in the form of a Box object. This constructor
+    		assumes the pixel data is laid out consecutively in memory. (this
+    		means row after row, slice after slice, with no space in between)
+    		@param extents	    Extents of the region defined by data
+    		@param pixelFormat	Format of this buffer
+    		@param pixelData	Pointer to the actual data
+    	*/
+		PixelBox(Box extents, PixelFormat pixelFormat, IntPtr pixelData):
+			box(extents), data(pixelData), format(pixelFormat)
+		{
+			setConsecutive();
+		}
+
+		PixelBox(Box extents, PixelFormat pixelFormat):
+			box(extents), data(0), format(pixelFormat)
+		{
+			setConsecutive();
+		}
+    	/** Constructor providing width, height and depth. This constructor
+    		assumes the pixel data is laid out consecutively in memory. (this
+    		means row after row, slice after slice, with no space in between)
+    		@param width	    Width of the region
+    		@param height	    Height of the region
+    		@param depth	    Depth of the region
+    		@param pixelFormat	Format of this buffer
+    		@param pixelData    Pointer to the actual data
+    	*/
+    	PixelBox(size_t width, size_t height, size_t depth, PixelFormat pixelFormat, IntPtr pixelData):
+    		box( Box(0, 0, 0, width, height, depth) ),
+    		data(pixelData), format(pixelFormat)
+    	{
+    		setConsecutive();
+    	}
+    	
+    	PixelBox(size_t width, size_t height, size_t depth, PixelFormat pixelFormat):
+    		box( Box(0, 0, 0, width, height, depth) ),
+    		data(0), format(pixelFormat)
+    	{
+    		setConsecutive();
+    	}
+
+		/// The data pointer 
+        IntPtr data;
+        /// The pixel format 
+        PixelFormat format;
+        /** Number of elements between the leftmost pixel of one row and the left
+         	pixel of the next. This value must always be equal to getWidth() (consecutive) 
+			for compressed formats.
+        */
+        size_t rowPitch;
+        /** Number of elements between the top left pixel of one (depth) slice and 
+         	the top left pixel of the next. This can be a negative value. Must be a multiple of
+         	rowPitch. This value must always be equal to getWidth()*getHeight() (consecutive) 
+			for compressed formats.
+        */
+        size_t slicePitch;
+        
+        /** Set the rowPitch and slicePitch so that the buffer is laid out consecutive 
+         	in memory.
+        */        
+        void setConsecutive()
+        {
+            rowPitch = box.Width;
+            slicePitch = box.Width*box.Height;
+        }
+        /**	Get the number of elements between one past the rightmost pixel of 
+         	one row and the leftmost pixel of the next row. (IE this is zero if rows
+         	are consecutive).
+        */
+		property size_t RowSkip
+		{
+			size_t get() { return rowPitch - box.Width; }
+		}
+
+        /** Get the number of elements between one past the right bottom pixel of
+         	one slice and the left top pixel of the next slice. (IE this is zero if slices
+         	are consecutive).
+        */
+		property size_t SliceSkip
+		{
+			size_t get() { return slicePitch - (box.Height * rowPitch); }
+		}
+
+        /** Return whether this buffer is laid out consecutive in memory (ie the pitches
+         	are equal to the dimensions)
+        */
+		property bool IsConsecutive
+		{
+			bool get()
+			{ 
+				return rowPitch == box.Width && slicePitch == box.Width*box.Height; 
+			}
+		}
+        /** Return the size (in bytes) this image would take if it was
+        	laid out consecutive in memory
+      	*/
+      	size_t GetConsecutiveSize();
+
+		/** Return a subvolume of this PixelBox.
+      		@param def	Defines the bounds of the subregion to return
+      		@returns	A pixel box describing the region and the data in it
+      		@remarks	This function does not copy any data, it just returns
+      			a PixelBox object with a data pointer pointing somewhere inside 
+      			the data of object.
+      		@throws	Exception(ERR_INVALIDPARAMS) if def is not fully contained
+      	*/
+      	PixelBox GetSubVolume(Box def);
+    };
+}
\ No newline at end of file

Modified: trunk/Mogre/Mogre/include/Custom/MogreRect.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreRect.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/Custom/MogreRect.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "OgreCommon.h"
 
 namespace Mogre
@@ -28,4 +30,35 @@
 			  }
 		  }
 	};
+
+
+	public value class Rect
+	{
+	public:
+		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_VALUECLASS( Rect )
+
+          long left, top, right, bottom;
+
+          Rect( long l, long t, long r, long b )
+            : left( l ), top( t ), right( r ), bottom( b )
+          {
+          }
+		  property long Width
+		  {
+			  long get()
+			  {
+				return right - left;
+			  }
+		  }
+		  property long Height
+		  {
+			  long get()
+			  {
+				return bottom - top;
+			  }
+		  }
+	};
+
+
+
 }
\ No newline at end of file

Modified: trunk/Mogre/Mogre/include/PortedClasses.h
===================================================================
--- trunk/Mogre/Mogre/include/PortedClasses.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/PortedClasses.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -14,5 +14,8 @@
 #include "Custom\MogreVector4.h"
 #include "Custom\MogreParamCommand.h"
 
+//Keep it last
+#include "Custom\MogreBox.h"
+
 //VertexElement is "injected" using MogreVertexElement.i
 //#include "MogreVertexElement.h"

Modified: trunk/Mogre/Mogre/include/auto/MakePublicDeclarations.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MakePublicDeclarations.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MakePublicDeclarations.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -75,6 +75,7 @@
 #include "OgreHardwareBufferManager.h"
 #include "OgreHardwareOcclusionQuery.h"
 #include "OgreHardwarePixelBuffer.h"
+#include "OgrePixelFormat.h"
 #include "OgreRenderTexture.h"
 #include "OgreHighLevelGpuProgram.h"
 #include "OgreHighLevelGpuProgramManager.h"
@@ -239,6 +240,7 @@
 #pragma make_public( Ogre::HardwareIndexBuffer )
 #pragma make_public( Ogre::HardwareOcclusionQuery )
 #pragma make_public( Ogre::HardwarePixelBuffer )
+#pragma make_public( Ogre::PixelBox )
 #pragma make_public( Ogre::HardwarePixelBufferSharedPtr )
 #pragma make_public( Ogre::RenderTexture )
 #pragma make_public( Ogre::VertexElement )
@@ -291,6 +293,7 @@
 #pragma make_public( Ogre::TextureUnitState )
 #pragma make_public( Ogre::PatchMesh )
 #pragma make_public( Ogre::PatchSurface )
+#pragma make_public( Ogre::PixelUtil )
 #pragma make_public( Ogre::ProgressiveMesh )
 #pragma make_public( Ogre::Rectangle2D )
 #pragma make_public( Ogre::RenderQueueGroup )

Modified: trunk/Mogre/Mogre/include/auto/MogreAnimable.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreAnimable.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreAnimable.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -226,9 +226,9 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( AnimableValuePtr )
 	
-		AnimableValuePtr(AnimableValue^ clrObject) : AnimableValue( clrObject->_native )
+		AnimableValuePtr(AnimableValue^ obj) : AnimableValue( obj->_native )
 		{
-			_sharedPtr = new Ogre::AnimableValuePtr( static_cast<Ogre::AnimableValue*>(clrObject->_native) );
+			_sharedPtr = new Ogre::AnimableValuePtr( static_cast<Ogre::AnimableValue*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override

Modified: trunk/Mogre/Mogre/include/auto/MogreArchive.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreArchive.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreArchive.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -140,9 +140,9 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( FileInfoListPtr )
 	
-		FileInfoListPtr(FileInfoList^ clrObject) : FileInfoList( clrObject->_native )
+		FileInfoListPtr(FileInfoList^ obj) : FileInfoList( obj->_native )
 		{
-			_sharedPtr = new Ogre::FileInfoListPtr( static_cast<Ogre::FileInfoList*>(clrObject->_native) );
+			_sharedPtr = new Ogre::FileInfoListPtr( static_cast<Ogre::FileInfoList*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override

Modified: trunk/Mogre/Mogre/include/auto/MogreCodec.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreCodec.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreCodec.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -78,9 +78,9 @@
 		public:
 			DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( Codec::CodecDataPtr )
 	
-			CodecDataPtr(CodecData^ clrObject) : CodecData( clrObject->_native )
+			CodecDataPtr(CodecData^ obj) : CodecData( obj->_native )
 			{
-				_sharedPtr = new Ogre::Codec::CodecDataPtr( static_cast<Ogre::Codec::CodecData*>(clrObject->_native) );
+				_sharedPtr = new Ogre::Codec::CodecDataPtr( static_cast<Ogre::Codec::CodecData*>(obj->_native) );
 			}
 	
 			virtual bool Equals(Object^ obj) override

Modified: trunk/Mogre/Mogre/include/auto/MogreCompositor.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreCompositor.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreCompositor.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -105,9 +105,9 @@
 			return gcnew CompositorPtr( (Ogre::CompositorPtr) *(ptr->_sharedPtr) );
 		}
 	
-		CompositorPtr(Compositor^ clrObject) : Compositor( clrObject->_native )
+		CompositorPtr(Compositor^ obj) : Compositor( obj->_native )
 		{
-			_sharedPtr = new Ogre::CompositorPtr( static_cast<Ogre::Compositor*>(clrObject->_native) );
+			_sharedPtr = new Ogre::CompositorPtr( static_cast<Ogre::Compositor*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override

Modified: trunk/Mogre/Mogre/include/auto/MogreConfigOptionMap.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreConfigOptionMap.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreConfigOptionMap.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -99,6 +99,8 @@
 	
 	};
 	
+	typedef Mogre::ConfigOption_NativePtr ConfigOption_NativePtr;
+	
 	#define STLDECL_MANAGEDKEY String^
 	#define STLDECL_MANAGEDVALUE Mogre::ConfigOption_NativePtr
 	#define STLDECL_NATIVEKEY Ogre::String

Modified: trunk/Mogre/Mogre/include/auto/MogreDataStream.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreDataStream.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreDataStream.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -28,10 +28,6 @@
 	
 		~DataStream()
 		{
-			this->!DataStream();
-		}
-		!DataStream()
-		{
 			if (_createdByCLR &&_native)
 			{
 				delete _native;
@@ -186,9 +182,9 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( DataStreamPtr )
 	
-		DataStreamPtr(DataStream^ clrObject) : DataStream( clrObject->_native )
+		DataStreamPtr(DataStream^ obj) : DataStream( obj->_native )
 		{
-			_sharedPtr = new Ogre::DataStreamPtr( static_cast<Ogre::DataStream*>(clrObject->_native) );
+			_sharedPtr = new Ogre::DataStreamPtr( static_cast<Ogre::DataStream*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override
@@ -300,9 +296,9 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( DataStreamListPtr )
 	
-		DataStreamListPtr(DataStreamList^ clrObject) : DataStreamList( clrObject->_native )
+		DataStreamListPtr(DataStreamList^ obj) : DataStreamList( obj->_native )
 		{
-			_sharedPtr = new Ogre::DataStreamListPtr( static_cast<Ogre::DataStreamList*>(clrObject->_native) );
+			_sharedPtr = new Ogre::DataStreamListPtr( static_cast<Ogre::DataStreamList*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override
@@ -408,9 +404,9 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( MemoryDataStreamPtr )
 	
-		MemoryDataStreamPtr(MemoryDataStream^ clrObject) : MemoryDataStream( clrObject->_native )
+		MemoryDataStreamPtr(MemoryDataStream^ obj) : MemoryDataStream( obj->_native )
 		{
-			_sharedPtr = new Ogre::MemoryDataStreamPtr( static_cast<Ogre::MemoryDataStream*>(clrObject->_native) );
+			_sharedPtr = new Ogre::MemoryDataStreamPtr( static_cast<Ogre::MemoryDataStream*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override

Modified: trunk/Mogre/Mogre/include/auto/MogreFont.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreFont.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreFont.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -142,9 +142,9 @@
 			return gcnew FontPtr( (Ogre::FontPtr) *(ptr->_sharedPtr) );
 		}
 	
-		FontPtr(Font^ clrObject) : Font( clrObject->_native )
+		FontPtr(Font^ obj) : Font( obj->_native )
 		{
-			_sharedPtr = new Ogre::FontPtr( static_cast<Ogre::Font*>(clrObject->_native) );
+			_sharedPtr = new Ogre::FontPtr( static_cast<Ogre::Font*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override

Modified: trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -958,9 +958,9 @@
 			return gcnew GpuProgramPtr( (Ogre::GpuProgramPtr) *(ptr->_sharedPtr) );
 		}
 	
-		GpuProgramPtr(GpuProgram^ clrObject) : GpuProgram( clrObject->_native )
+		GpuProgramPtr(GpuProgram^ obj) : GpuProgram( obj->_native )
 		{
-			_sharedPtr = new Ogre::GpuProgramPtr( static_cast<Ogre::GpuProgram*>(clrObject->_native) );
+			_sharedPtr = new Ogre::GpuProgramPtr( static_cast<Ogre::GpuProgram*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override
@@ -1066,9 +1066,9 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( GpuProgramParametersSharedPtr )
 	
-		GpuProgramParametersSharedPtr(GpuProgramParameters^ clrObject) : GpuProgramParameters( clrObject->_native )
+		GpuProgramParametersSharedPtr(GpuProgramParameters^ obj) : GpuProgramParameters( obj->_native )
 		{
-			_sharedPtr = new Ogre::GpuProgramParametersSharedPtr( static_cast<Ogre::GpuProgramParameters*>(clrObject->_native) );
+			_sharedPtr = new Ogre::GpuProgramParametersSharedPtr( static_cast<Ogre::GpuProgramParameters*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override

Modified: trunk/Mogre/Mogre/include/auto/MogreHardwareIndexBuffer.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreHardwareIndexBuffer.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreHardwareIndexBuffer.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -89,9 +89,9 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( HardwareIndexBufferSharedPtr )
 	
-		HardwareIndexBufferSharedPtr(HardwareIndexBuffer^ clrObject) : HardwareIndexBuffer( clrObject->_native )
+		HardwareIndexBufferSharedPtr(HardwareIndexBuffer^ obj) : HardwareIndexBuffer( obj->_native )
 		{
-			_sharedPtr = new Ogre::HardwareIndexBufferSharedPtr( static_cast<Ogre::HardwareIndexBuffer*>(clrObject->_native) );
+			_sharedPtr = new Ogre::HardwareIndexBufferSharedPtr( static_cast<Ogre::HardwareIndexBuffer*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override

Modified: trunk/Mogre/Mogre/include/auto/MogreHardwarePixelBuffer.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreHardwarePixelBuffer.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreHardwarePixelBuffer.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -6,6 +6,7 @@
 #include "OgreHardwarePixelBuffer.h"
 #include "MogreHardwareBuffer.h"
 #include "MogrePixelFormat.h"
+#include "MogreImage.h"
 
 namespace Mogre
 {
@@ -32,6 +33,12 @@
 	public:
 	
 	
+		property Mogre::PixelBox CurrentLock
+		{
+		public:
+			Mogre::PixelBox get();
+		}
+	
 		property size_t Depth
 		{
 		public:
@@ -56,6 +63,8 @@
 			size_t get();
 		}
 	
+		Mogre::PixelBox Lock( Mogre::Image::Box lockBox, Mogre::HardwareBuffer::LockOptions options );
+	
 		void* Lock( size_t offset, size_t length, Mogre::HardwareBuffer::LockOptions options );
 	
 		void ReadData( size_t offset, size_t length, void* pDest );
@@ -63,8 +72,18 @@
 		void WriteData( size_t offset, size_t length, const void* pSource, bool discardWholeBuffer );
 		void WriteData( size_t offset, size_t length, const void* pSource );
 	
+		void Blit( Mogre::HardwarePixelBufferSharedPtr^ src, Mogre::Image::Box srcBox, Mogre::Image::Box dstBox );
+	
 		void Blit( Mogre::HardwarePixelBufferSharedPtr^ src );
 	
+		void BlitFromMemory( Mogre::PixelBox src, Mogre::Image::Box dstBox );
+	
+		void BlitFromMemory( Mogre::PixelBox src );
+	
+		void BlitToMemory( Mogre::Image::Box srcBox, Mogre::PixelBox dst );
+	
+		void BlitToMemory( Mogre::PixelBox dst );
+	
 		Mogre::RenderTexture^ GetRenderTarget( size_t slice );
 		Mogre::RenderTexture^ GetRenderTarget( );
 	
@@ -102,9 +121,9 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( HardwarePixelBufferSharedPtr )
 	
-		HardwarePixelBufferSharedPtr(HardwarePixelBuffer^ clrObject) : HardwarePixelBuffer( clrObject->_native )
+		HardwarePixelBufferSharedPtr(HardwarePixelBuffer^ obj) : HardwarePixelBuffer( obj->_native )
 		{
-			_sharedPtr = new Ogre::HardwarePixelBufferSharedPtr( static_cast<Ogre::HardwarePixelBuffer*>(clrObject->_native) );
+			_sharedPtr = new Ogre::HardwarePixelBufferSharedPtr( static_cast<Ogre::HardwarePixelBuffer*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override

Modified: trunk/Mogre/Mogre/include/auto/MogreHardwareVertexBuffer.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreHardwareVertexBuffer.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreHardwareVertexBuffer.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -106,9 +106,9 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( HardwareVertexBufferSharedPtr )
 	
-		HardwareVertexBufferSharedPtr(HardwareVertexBuffer^ clrObject) : HardwareVertexBuffer( clrObject->_native )
+		HardwareVertexBufferSharedPtr(HardwareVertexBuffer^ obj) : HardwareVertexBuffer( obj->_native )
 		{
-			_sharedPtr = new Ogre::HardwareVertexBufferSharedPtr( static_cast<Ogre::HardwareVertexBuffer*>(clrObject->_native) );
+			_sharedPtr = new Ogre::HardwareVertexBufferSharedPtr( static_cast<Ogre::HardwareVertexBuffer*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override

Modified: trunk/Mogre/Mogre/include/auto/MogreHighLevelGpuProgram.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreHighLevelGpuProgram.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreHighLevelGpuProgram.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -69,9 +69,9 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( HighLevelGpuProgramPtr )
 	
-		HighLevelGpuProgramPtr(HighLevelGpuProgram^ clrObject) : HighLevelGpuProgram( clrObject->_native )
+		HighLevelGpuProgramPtr(HighLevelGpuProgram^ obj) : HighLevelGpuProgram( obj->_native )
 		{
-			_sharedPtr = new Ogre::HighLevelGpuProgramPtr( static_cast<Ogre::HighLevelGpuProgram*>(clrObject->_native) );
+			_sharedPtr = new Ogre::HighLevelGpuProgramPtr( static_cast<Ogre::HighLevelGpuProgram*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override

Modified: trunk/Mogre/Mogre/include/auto/MogreImage.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreImage.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreImage.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -34,6 +34,10 @@
 			FILTER_BICUBIC = Ogre::Image::FILTER_BICUBIC
 		};
 	
+		public: typedef Mogre::Box Box;
+	
+		public: typedef Mogre::Rect Rect;
+	
 		//Private Declarations
 	private protected:
 	
@@ -166,11 +170,18 @@
 	
 		Mogre::ColourValue GetColourAt( int x, int y, int z );
 	
+		Mogre::PixelBox GetPixelBox( size_t face, size_t mipmap );
+		Mogre::PixelBox GetPixelBox( size_t face );
+		Mogre::PixelBox GetPixelBox( );
+	
 		void Resize( Mogre::ushort width, Mogre::ushort height, Mogre::Image::Filter filter );
 		void Resize( Mogre::ushort width, Mogre::ushort height );
 	
 		static void ApplyGamma( [Out] Mogre::uchar% buffer, Mogre::Real gamma, size_t size, Mogre::uchar bpp );
 	
+		static void Scale( Mogre::PixelBox src, Mogre::PixelBox dst, Mogre::Image::Filter filter );
+		static void Scale( Mogre::PixelBox src, Mogre::PixelBox dst );
+	
 		static size_t CalculateSize( size_t mipmaps, size_t faces, size_t width, size_t height, size_t depth, Mogre::PixelFormat format );
 	
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_CLRHANDLE( Image )

Modified: trunk/Mogre/Mogre/include/auto/MogreMaterial.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreMaterial.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreMaterial.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -229,9 +229,9 @@
 			return gcnew MaterialPtr( (Ogre::MaterialPtr) *(ptr->_sharedPtr) );
 		}
 	
-		MaterialPtr(Material^ clrObject) : Material( clrObject->_native )
+		MaterialPtr(Material^ obj) : Material( obj->_native )
 		{
-			_sharedPtr = new Ogre::MaterialPtr( static_cast<Ogre::Material*>(clrObject->_native) );
+			_sharedPtr = new Ogre::MaterialPtr( static_cast<Ogre::Material*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override

Modified: trunk/Mogre/Mogre/include/auto/MogreMesh.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreMesh.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreMesh.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -385,9 +385,9 @@
 			return gcnew MeshPtr( (Ogre::MeshPtr) *(ptr->_sharedPtr) );
 		}
 	
-		MeshPtr(Mesh^ clrObject) : Mesh( clrObject->_native )
+		MeshPtr(Mesh^ obj) : Mesh( obj->_native )
 		{
-			_sharedPtr = new Ogre::MeshPtr( static_cast<Ogre::Mesh*>(clrObject->_native) );
+			_sharedPtr = new Ogre::MeshPtr( static_cast<Ogre::Mesh*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override

Modified: trunk/Mogre/Mogre/include/auto/MogrePatchMesh.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogrePatchMesh.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogrePatchMesh.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -79,9 +79,9 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( PatchMeshPtr )
 	
-		PatchMeshPtr(PatchMesh^ clrObject) : PatchMesh( clrObject->_native )
+		PatchMeshPtr(PatchMesh^ obj) : PatchMesh( obj->_native )
 		{
-			_sharedPtr = new Ogre::PatchMeshPtr( static_cast<Ogre::PatchMesh*>(clrObject->_native) );
+			_sharedPtr = new Ogre::PatchMeshPtr( static_cast<Ogre::PatchMesh*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override

Modified: trunk/Mogre/Mogre/include/auto/MogrePixelFormat.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogrePixelFormat.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogrePixelFormat.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -4,6 +4,8 @@
 #pragma once
 
 #include "OgrePixelFormat.h"
+#include "MogrePrerequisites.h"
+#include "MogrePlatform.h"
 
 namespace Mogre
 {
@@ -72,5 +74,108 @@
 		PF_COUNT = Ogre::PF_COUNT
 	};
 	
+	//################################################################
+	//PixelUtil
+	//################################################################
+	
+	public ref class PixelUtil
+	{
+		//Nested Types
+	
+		//Private Declarations
+	private protected:
+	
+	
+		//Internal Declarations
+	internal:
+		PixelUtil( Ogre::PixelUtil* obj ) : _native(obj), _createdByCLR(false)
+		{
+		}
+	
+		~PixelUtil()
+		{
+			this->!PixelUtil();
+		}
+		!PixelUtil()
+		{
+			if (_createdByCLR &&_native)
+			{
+				delete _native;
+				_native = 0;
+			}
+		}
+	
+		Ogre::PixelUtil* _native;
+		bool _createdByCLR;
+	
+	
+		//Public Declarations
+	public:
+		PixelUtil();
+	
+	
+		static size_t GetNumElemBytes( Mogre::PixelFormat format );
+	
+		static size_t GetNumElemBits( Mogre::PixelFormat format );
+	
+		static size_t GetMemorySize( size_t width, size_t height, size_t depth, Mogre::PixelFormat format );
+	
+		static unsigned int GetFlags( Mogre::PixelFormat format );
+	
+		static bool HasAlpha( Mogre::PixelFormat format );
+	
+		static bool IsFloatingPoint( Mogre::PixelFormat format );
+	
+		static bool IsCompressed( Mogre::PixelFormat format );
+	
+		static bool IsDepth( Mogre::PixelFormat format );
+	
+		static bool IsNativeEndian( Mogre::PixelFormat format );
+	
+		static bool IsLuminance( Mogre::PixelFormat format );
+	
+		static bool IsValidExtent( size_t width, size_t height, size_t depth, Mogre::PixelFormat format );
+	
+		
+				      static void GetBitDepths( Mogre::PixelFormat format, [Out] array<int>^% rgba );
+		        
+	
+	
+		
+		          static void GetBitMasks( Mogre::PixelFormat format, [Out] array<uint32>^% rgba );
+		        
+	
+	
+		static String^ GetFormatName( Mogre::PixelFormat srcformat );
+	
+		static bool IsAccessible( Mogre::PixelFormat srcformat );
+	
+		static Mogre::PixelComponentType GetComponentType( Mogre::PixelFormat fmt );
+	
+		static size_t GetComponentCount( Mogre::PixelFormat fmt );
+	
+		static void PackColour( Mogre::ColourValue colour, Mogre::PixelFormat pf, const void* dest );
+	
+		static void PackColour( Mogre::uint8 r, Mogre::uint8 g, Mogre::uint8 b, Mogre::uint8 a, Mogre::PixelFormat pf, const void* dest );
+	
+		static void PackColour( float r, float g, float b, float a, Mogre::PixelFormat pf, const void* dest );
+	
+		static void UnpackColour( Mogre::ColourValue* colour, Mogre::PixelFormat pf, const void* src );
+	
+		static void UnpackColour( [Out] Mogre::uint8% r, [Out] Mogre::uint8% g, [Out] Mogre::uint8% b, [Out] Mogre::uint8% a, Mogre::PixelFormat pf, const void* src );
+	
+		static void UnpackColour( [Out] float% r, [Out] float% g, [Out] float% b, [Out] float% a, Mogre::PixelFormat pf, const void* src );
+	
+		static void BulkPixelConversion( void* src, Mogre::PixelFormat srcFormat, void* dest, Mogre::PixelFormat dstFormat, unsigned int count );
+	
+		static void BulkPixelConversion( Mogre::PixelBox src, Mogre::PixelBox dst );
+	
+		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_PLAINWRAPPER( PixelUtil )
+	
+		//Protected Declarations
+	protected public:
+	
+	};
+	
 
 }

Modified: trunk/Mogre/Mogre/include/auto/MogreResource.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreResource.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreResource.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -232,9 +232,9 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( ResourcePtr )
 	
-		ResourcePtr(Resource^ clrObject) : Resource( clrObject->_native )
+		ResourcePtr(Resource^ obj) : Resource( obj->_native )
 		{
-			_sharedPtr = new Ogre::ResourcePtr( static_cast<Ogre::Resource*>(clrObject->_native) );
+			_sharedPtr = new Ogre::ResourcePtr( static_cast<Ogre::Resource*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override

Modified: trunk/Mogre/Mogre/include/auto/MogreSkeleton.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreSkeleton.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreSkeleton.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -261,9 +261,9 @@
 			return gcnew SkeletonPtr( (Ogre::SkeletonPtr) *(ptr->_sharedPtr) );
 		}
 	
-		SkeletonPtr(Skeleton^ clrObject) : Skeleton( clrObject->_native )
+		SkeletonPtr(Skeleton^ obj) : Skeleton( obj->_native )
 		{
-			_sharedPtr = new Ogre::SkeletonPtr( static_cast<Ogre::Skeleton*>(clrObject->_native) );
+			_sharedPtr = new Ogre::SkeletonPtr( static_cast<Ogre::Skeleton*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override

Modified: trunk/Mogre/Mogre/include/auto/MogreStringVector.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreStringVector.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreStringVector.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -41,9 +41,9 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( StringVectorPtr )
 	
-		StringVectorPtr(StringVector^ clrObject) : StringVector( clrObject->_native )
+		StringVectorPtr(StringVector^ obj) : StringVector( obj->_native )
 		{
-			_sharedPtr = new Ogre::StringVectorPtr( static_cast<Ogre::StringVector*>(clrObject->_native) );
+			_sharedPtr = new Ogre::StringVectorPtr( static_cast<Ogre::StringVector*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override

Modified: trunk/Mogre/Mogre/include/auto/MogreTexture.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreTexture.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreTexture.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -215,9 +215,9 @@
 			return gcnew TexturePtr( (Ogre::TexturePtr) *(ptr->_sharedPtr) );
 		}
 	
-		TexturePtr(Texture^ clrObject) : Texture( clrObject->_native )
+		TexturePtr(Texture^ obj) : Texture( obj->_native )
 		{
-			_sharedPtr = new Ogre::TexturePtr( static_cast<Ogre::Texture*>(clrObject->_native) );
+			_sharedPtr = new Ogre::TexturePtr( static_cast<Ogre::Texture*>(obj->_native) );
 		}
 	
 		virtual bool Equals(Object^ obj) override

Modified: trunk/Mogre/Mogre/include/auto/MogreVertexBoneAssignment.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreVertexBoneAssignment.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/MogreVertexBoneAssignment.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -39,5 +39,7 @@
 	
 	};
 	
+	typedef Mogre::VertexBoneAssignment VertexBoneAssignment;
+	
 
 }

Modified: trunk/Mogre/Mogre/include/auto/PreDeclarations.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/PreDeclarations.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/include/auto/PreDeclarations.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -141,6 +141,7 @@
 ref class PatchMesh;
 ref class PatchMeshPtr;
 ref class PatchSurface;
+ref class PixelUtil;
 ref class PlaneList;
 ref class Const_PlaneList;
 ref class PlaneBoundedVolume;

Added: trunk/Mogre/Mogre/src/Custom/ManagedDataStream.cpp
===================================================================
--- trunk/Mogre/Mogre/src/Custom/ManagedDataStream.cpp	                        (rev 0)
+++ trunk/Mogre/Mogre/src/Custom/ManagedDataStream.cpp	2006-09-27 00:48:38 UTC (rev 40)
@@ -0,0 +1,54 @@
+#include "stdafx.h"
+
+#include "Custom\ManagedDataStream.h"
+
+namespace Mogre
+{
+	Ogre::DataStream* ManagedDataStream::_createNative(System::IO::Stream^ stream)
+	{
+		_stream = stream;
+		return new DataStream_Proxy( this );
+	}
+
+
+	size_t DataStream_Proxy::read(void* buf, size_t count)
+	{
+		array<System::Byte>^ managedBuf = gcnew array<System::Byte>(count);
+		int bytesRead = _managed->_stream->Read(managedBuf, 0, count);
+
+		pin_ptr<System::Byte> ptr = &managedBuf[0];
+		memcpy(buf, ptr, bytesRead);
+
+		return bytesRead;
+	}
+
+
+	void DataStream_Proxy::skip(long count)
+	{
+		_managed->_stream->Seek(count, System::IO::SeekOrigin::Current);
+	}
+
+
+	void DataStream_Proxy::seek( size_t pos )
+	{
+		_managed->_stream->Seek(_initPos + pos, System::IO::SeekOrigin::Begin);
+	}
+	
+
+	size_t DataStream_Proxy::tell(void) const
+	{
+		return _managed->_stream->Position - _initPos;
+	}
+
+
+	bool DataStream_Proxy::eof(void) const
+	{
+		return _managed->_stream->Position < _managed->Stream->Length;
+	}
+
+
+	void DataStream_Proxy::close(void)
+	{
+		_managed->_stream->Close();
+	}
+}
\ No newline at end of file

Deleted: trunk/Mogre/Mogre/src/Custom/ManagedDataStreamPtr.cpp
===================================================================
--- trunk/Mogre/Mogre/src/Custom/ManagedDataStreamPtr.cpp	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/src/Custom/ManagedDataStreamPtr.cpp	2006-09-27 00:48:38 UTC (rev 40)
@@ -1,55 +0,0 @@
-#include "stdafx.h"
-
-#include "Custom\ManagedDataStreamPtr.h"
-
-namespace Mogre
-{
-	ManagedDataStreamPtr::ManagedDataStreamPtr( System::IO::Stream^ stream)
-	{
-		_stream = stream;
-		ManagedDataStream_Proxy* proxy = new ManagedDataStream_Proxy( this );
-		_native = new Ogre::DataStreamPtr( proxy );
-	}
-
-
-	size_t ManagedDataStream_Proxy::read(void* buf, size_t count)
-	{
-		array<System::Byte>^ managedBuf = gcnew array<System::Byte>(count);
-		int bytesRead = _managed->_stream->Read(managedBuf, 0, count);
-
-		pin_ptr<System::Byte> ptr = &managedBuf[0];
-		memcpy(buf, ptr, bytesRead);
-
-		return bytesRead;
-	}
-
-
-	void ManagedDataStream_Proxy::skip(long count)
-	{
-		_managed->_stream->Seek(count, System::IO::SeekOrigin::Current);
-	}
-
-
-	void ManagedDataStream_Proxy::seek( size_t pos )
-	{
-		_managed->_stream->Seek(_initPos + pos, System::IO::SeekOrigin::Begin);
-	}
-	
-
-	size_t ManagedDataStream_Proxy::tell(void) const
-	{
-		return _managed->_stream->Position - _initPos;
-	}
-
-
-	bool ManagedDataStream_Proxy::eof(void) const
-	{
-		return _managed->_stream->Position < _managed->Stream->Length;
-	}
-
-
-	void ManagedDataStream_Proxy::close(void)
-	{
-		_managed->_stream->Close();
-	}
-}
\ No newline at end of file

Added: trunk/Mogre/Mogre/src/Custom/MogreBox.cpp
===================================================================
--- trunk/Mogre/Mogre/src/Custom/MogreBox.cpp	                        (rev 0)
+++ trunk/Mogre/Mogre/src/Custom/MogreBox.cpp	2006-09-27 00:48:38 UTC (rev 40)
@@ -0,0 +1,46 @@
+#include "Stdafx.h"
+
+namespace Mogre
+{
+	size_t PixelBox::GetConsecutiveSize()
+	{ 
+		return PixelUtil::GetMemorySize(box.Width, box.Height, box.Depth, format); 
+	}
+  	/** Return a subvolume of this PixelBox.
+  		@param def	Defines the bounds of the subregion to return
+  		@returns	A pixel box describing the region and the data in it
+  		@remarks	This function does not copy any data, it just returns
+  			a PixelBox object with a data pointer pointing somewhere inside 
+  			the data of object.
+  		@throws	Exception(ERR_INVALIDPARAMS) if def is not fully contained
+  	*/
+	Mogre::PixelBox PixelBox::GetSubVolume(Box def)
+	{
+		if(PixelUtil::IsCompressed(format))
+		{
+			if(def.left == box.left && def.top == box.top && def.front == box.front &&
+			   def.right == box.right && def.bottom == box.bottom && def.back == box.back)
+			{
+				// Entire buffer is being queried
+				return *this;
+			}
+			throw gcnew Exception("Cannot return subvolume of compressed PixelBuffer");
+		}
+		if(!box.Contains(def))
+			throw gcnew ArgumentException("Bounds out of range", "def");
+
+		const size_t elemSize = PixelUtil::GetNumElemBytes(format);
+		// Calculate new data origin
+		PixelBox rval(def, format, (IntPtr)(void*) ( ((uint8*)(void*)data) 
+			+ ((def.left-box.left)*elemSize)
+			+ ((def.top-box.top)*rowPitch*elemSize)
+			+ ((def.front-box.front)*slicePitch*elemSize) )
+		);		
+
+		rval.rowPitch = rowPitch;
+		rval.slicePitch = slicePitch;
+		rval.format = format;
+
+		return rval;
+	}
+}
\ No newline at end of file

Modified: trunk/Mogre/Mogre/src/auto/MogreHardwarePixelBuffer.cpp
===================================================================
--- trunk/Mogre/Mogre/src/auto/MogreHardwarePixelBuffer.cpp	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/src/auto/MogreHardwarePixelBuffer.cpp	2006-09-27 00:48:38 UTC (rev 40)
@@ -18,6 +18,11 @@
 	//Internal Declarations
 	
 	//Public Declarations
+	Mogre::PixelBox HardwarePixelBuffer::CurrentLock::get()
+	{
+		return static_cast<Ogre::HardwarePixelBuffer*>(_native)->getCurrentLock( );
+	}
+	
 	size_t HardwarePixelBuffer::Depth::get()
 	{
 		return static_cast<const Ogre::HardwarePixelBuffer*>(_native)->getDepth( );
@@ -38,6 +43,11 @@
 		return static_cast<const Ogre::HardwarePixelBuffer*>(_native)->getWidth( );
 	}
 	
+	Mogre::PixelBox HardwarePixelBuffer::Lock( Mogre::Image::Box lockBox, Mogre::HardwareBuffer::LockOptions options )
+	{
+		return static_cast<Ogre::HardwarePixelBuffer*>(_native)->lock( lockBox, (Ogre::HardwareBuffer::LockOptions)options );
+	}
+	
 	void* HardwarePixelBuffer::Lock( size_t offset, size_t length, Mogre::HardwareBuffer::LockOptions options )
 	{
 		return static_cast<Ogre::HardwarePixelBuffer*>(_native)->lock( offset, length, (Ogre::HardwareBuffer::LockOptions)options );
@@ -57,11 +67,36 @@
 		static_cast<Ogre::HardwarePixelBuffer*>(_native)->writeData( offset, length, pSource );
 	}
 	
+	void HardwarePixelBuffer::Blit( Mogre::HardwarePixelBufferSharedPtr^ src, Mogre::Image::Box srcBox, Mogre::Image::Box dstBox )
+	{
+		static_cast<Ogre::HardwarePixelBuffer*>(_native)->blit( (const Ogre::HardwarePixelBufferSharedPtr&)src, srcBox, dstBox );
+	}
+	
 	void HardwarePixelBuffer::Blit( Mogre::HardwarePixelBufferSharedPtr^ src )
 	{
 		static_cast<Ogre::HardwarePixelBuffer*>(_native)->blit( (const Ogre::HardwarePixelBufferSharedPtr&)src );
 	}
 	
+	void HardwarePixelBuffer::BlitFromMemory( Mogre::PixelBox src, Mogre::Image::Box dstBox )
+	{
+		static_cast<Ogre::HardwarePixelBuffer*>(_native)->blitFromMemory( src, dstBox );
+	}
+	
+	void HardwarePixelBuffer::BlitFromMemory( Mogre::PixelBox src )
+	{
+		static_cast<Ogre::HardwarePixelBuffer*>(_native)->blitFromMemory( src );
+	}
+	
+	void HardwarePixelBuffer::BlitToMemory( Mogre::Image::Box srcBox, Mogre::PixelBox dst )
+	{
+		static_cast<Ogre::HardwarePixelBuffer*>(_native)->blitToMemory( srcBox, dst );
+	}
+	
+	void HardwarePixelBuffer::BlitToMemory( Mogre::PixelBox dst )
+	{
+		static_cast<Ogre::HardwarePixelBuffer*>(_native)->blitToMemory( dst );
+	}
+	
 	Mogre::RenderTexture^ HardwarePixelBuffer::GetRenderTarget( size_t slice )
 	{
 		return static_cast<Ogre::HardwarePixelBuffer*>(_native)->getRenderTarget( slice );

Modified: trunk/Mogre/Mogre/src/auto/MogreImage.cpp
===================================================================
--- trunk/Mogre/Mogre/src/auto/MogreImage.cpp	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/Mogre/src/auto/MogreImage.cpp	2006-09-27 00:48:38 UTC (rev 40)
@@ -171,6 +171,19 @@
 		return static_cast<Ogre::Image*>(_native)->getColourAt( x, y, z );
 	}
 	
+	Mogre::PixelBox Image::GetPixelBox( size_t face, size_t mipmap )
+	{
+		return static_cast<const Ogre::Image*>(_native)->getPixelBox( face, mipmap );
+	}
+	Mogre::PixelBox Image::GetPixelBox( size_t face )
+	{
+		return static_cast<const Ogre::Image*>(_native)->getPixelBox( face );
+	}
+	Mogre::PixelBox Image::GetPixelBox( )
+	{
+		return static_cast<const Ogre::Image*>(_native)->getPixelBox( );
+	}
+	
 	void Image::Resize( Mogre::ushort width, Mogre::ushort height, Mogre::Image::Filter filter )
 	{
 		static_cast<Ogre::Image*>(_native)->resize( width, height, (Ogre::Image::Filter)filter );
@@ -187,6 +200,15 @@
 		Ogre::Image::applyGamma( p_buffer, gamma, size, bpp );
 	}
 	
+	void Image::Scale( Mogre::PixelBox src, Mogre::PixelBox dst, Mogre::Image::Filter filter )
+	{
+		Ogre::Image::scale( src, dst, (Ogre::Image::Filter)filter );
+	}
+	void Image::Scale( Mogre::PixelBox src, Mogre::PixelBox dst )
+	{
+		Ogre::Image::scale( src, dst );
+	}
+	
 	size_t Image::CalculateSize( size_t mipmaps, size_t faces, size_t width, size_t height, size_t depth, Mogre::PixelFormat format )
 	{
 		return Ogre::Image::calculateSize( mipmaps, faces, width, height, depth, (Ogre::PixelFormat)format );

Added: trunk/Mogre/Mogre/src/auto/MogrePixelFormat.cpp
===================================================================
--- trunk/Mogre/Mogre/src/auto/MogrePixelFormat.cpp	                        (rev 0)
+++ trunk/Mogre/Mogre/src/auto/MogrePixelFormat.cpp	2006-09-27 00:48:38 UTC (rev 40)
@@ -0,0 +1,178 @@
+/*  This file is produced by the C++/CLI AutoWrapper utility.
+        Copyright (c) 2006 by Argiris Kirtzidis  */
+
+#include "stdafx.h"
+
+#include "MogrePixelFormat.h"
+
+namespace Mogre
+{
+	//################################################################
+	//PixelUtil
+	//################################################################
+	
+	//Nested Types
+	//Private Declarations
+	
+	//Internal Declarations
+	
+	//Public Declarations
+	PixelUtil::PixelUtil()
+	{
+		_createdByCLR = true;
+		_native = new Ogre::PixelUtil();
+	}
+	
+	size_t PixelUtil::GetNumElemBytes( Mogre::PixelFormat format )
+	{
+		return Ogre::PixelUtil::getNumElemBytes( (Ogre::PixelFormat)format );
+	}
+	
+	size_t PixelUtil::GetNumElemBits( Mogre::PixelFormat format )
+	{
+		return Ogre::PixelUtil::getNumElemBits( (Ogre::PixelFormat)format );
+	}
+	
+	size_t PixelUtil::GetMemorySize( size_t width, size_t height, size_t depth, Mogre::PixelFormat format )
+	{
+		return Ogre::PixelUtil::getMemorySize( width, height, depth, (Ogre::PixelFormat)format );
+	}
+	
+	unsigned int PixelUtil::GetFlags( Mogre::PixelFormat format )
+	{
+		return Ogre::PixelUtil::getFlags( (Ogre::PixelFormat)format );
+	}
+	
+	bool PixelUtil::HasAlpha( Mogre::PixelFormat format )
+	{
+		return Ogre::PixelUtil::hasAlpha( (Ogre::PixelFormat)format );
+	}
+	
+	bool PixelUtil::IsFloatingPoint( Mogre::PixelFormat format )
+	{
+		return Ogre::PixelUtil::isFloatingPoint( (Ogre::PixelFormat)format );
+	}
+	
+	bool PixelUtil::IsCompressed( Mogre::PixelFormat format )
+	{
+		return Ogre::PixelUtil::isCompressed( (Ogre::PixelFormat)format );
+	}
+	
+	bool PixelUtil::IsDepth( Mogre::PixelFormat format )
+	{
+		return Ogre::PixelUtil::isDepth( (Ogre::PixelFormat)format );
+	}
+	
+	bool PixelUtil::IsNativeEndian( Mogre::PixelFormat format )
+	{
+		return Ogre::PixelUtil::isNativeEndian( (Ogre::PixelFormat)format );
+	}
+	
+	bool PixelUtil::IsLuminance( Mogre::PixelFormat format )
+	{
+		return Ogre::PixelUtil::isLuminance( (Ogre::PixelFormat)format );
+	}
+	
+	bool PixelUtil::IsValidExtent( size_t width, size_t height, size_t depth, Mogre::PixelFormat format )
+	{
+		return Ogre::PixelUtil::isValidExtent( width, height, depth, (Ogre::PixelFormat)format );
+	}
+	
+	
+		        void PixelUtil::GetBitDepths( Mogre::PixelFormat format, array<int>^% rgba )
+	          {
+	            rgba = gcnew array<int>(4);
+	            pin_ptr<int> ptr = &rgba[0];
+	            Ogre::PixelUtil::getBitDepths( (Ogre::PixelFormat)format, ptr );
+	          }
+	        
+	
+	
+	
+		        void PixelUtil::GetBitMasks( Mogre::PixelFormat format, array<uint32>^% rgba )
+	          {
+	            rgba = gcnew array<uint32>(4);
+	            pin_ptr<uint32> ptr = &rgba[0];
+	            Ogre::PixelUtil::getBitMasks( (Ogre::PixelFormat)format, ptr );
+	          }
+	        
+	
+	
+	String^ PixelUtil::GetFormatName( Mogre::PixelFormat srcformat )
+	{
+		return TO_CLR_STRING( Ogre::PixelUtil::getFormatName( (Ogre::PixelFormat)srcformat ) );
+	}
+	
+	bool PixelUtil::IsAccessible( Mogre::PixelFormat srcformat )
+	{
+		return Ogre::PixelUtil::isAccessible( (Ogre::PixelFormat)srcformat );
+	}
+	
+	Mogre::PixelComponentType PixelUtil::GetComponentType( Mogre::PixelFormat fmt )
+	{
+		return (Mogre::PixelComponentType)Ogre::PixelUtil::getComponentType( (Ogre::PixelFormat)fmt );
+	}
+	
+	size_t PixelUtil::GetComponentCount( Mogre::PixelFormat fmt )
+	{
+		return Ogre::PixelUtil::getComponentCount( (Ogre::PixelFormat)fmt );
+	}
+	
+	void PixelUtil::PackColour( Mogre::ColourValue colour, Mogre::PixelFormat pf, const void* dest )
+	{
+		Ogre::PixelUtil::packColour( colour, (Ogre::PixelFormat)pf, dest );
+	}
+	
+	void PixelUtil::PackColour( Mogre::uint8 r, Mogre::uint8 g, Mogre::uint8 b, Mogre::uint8 a, Mogre::PixelFormat pf, const void* dest )
+	{
+		Ogre::PixelUtil::packColour( r, g, b, a, (Ogre::PixelFormat)pf, dest );
+	}
+	
+	void PixelUtil::PackColour( float r, float g, float b, float a, Mogre::PixelFormat pf, const void* dest )
+	{
+		Ogre::PixelUtil::packColour( r, g, b, a, (Ogre::PixelFormat)pf, dest );
+	}
+	
+	void PixelUtil::UnpackColour( Mogre::ColourValue* colour, Mogre::PixelFormat pf, const void* src )
+	{
+		Ogre::ColourValue* o_colour = reinterpret_cast<Ogre::ColourValue*>(colour);
+	
+		Ogre::PixelUtil::unpackColour( o_colour, (Ogre::PixelFormat)pf, src );
+	}
+	
+	void PixelUtil::UnpackColour( [Out] Mogre::uint8% r, [Out] Mogre::uint8% g, [Out] Mogre::uint8% b, [Out] Mogre::uint8% a, Mogre::PixelFormat pf, const void* src )
+	{
+		pin_ptr<Mogre::uint8> p_r = &r;
+		pin_ptr<Mogre::uint8> p_g = &g;
+		pin_ptr<Mogre::uint8> p_b = &b;
+		pin_ptr<Mogre::uint8> p_a = &a;
+	
+		Ogre::PixelUtil::unpackColour( p_r, p_g, p_b, p_a, (Ogre::PixelFormat)pf, src );
+	}
+	
+	void PixelUtil::UnpackColour( [Out] float% r, [Out] float% g, [Out] float% b, [Out] float% a, Mogre::PixelFormat pf, const void* src )
+	{
+		pin_ptr<float> p_r = &r;
+		pin_ptr<float> p_g = &g;
+		pin_ptr<float> p_b = &b;
+		pin_ptr<float> p_a = &a;
+	
+		Ogre::PixelUtil::unpackColour( p_r, p_g, p_b, p_a, (Ogre::PixelFormat)pf, src );
+	}
+	
+	void PixelUtil::BulkPixelConversion( void* src, Mogre::PixelFormat srcFormat, void* dest, Mogre::PixelFormat dstFormat, unsigned int count )
+	{
+		Ogre::PixelUtil::bulkPixelConversion( src, (Ogre::PixelFormat)srcFormat, dest, (Ogre::PixelFormat)dstFormat, count );
+	}
+	
+	void PixelUtil::BulkPixelConversion( Mogre::PixelBox src, Mogre::PixelBox dst )
+	{
+		Ogre::PixelUtil::bulkPixelConversion( src, dst );
+	}
+	
+	
+	//Protected Declarations
+	
+	
+
+}

Modified: trunk/Mogre/ogrenew/OgreMain/include/CLRConfig.h
===================================================================
--- trunk/Mogre/ogrenew/OgreMain/include/CLRConfig.h	2006-09-26 03:30:42 UTC (rev 39)
+++ trunk/Mogre/ogrenew/OgreMain/include/CLRConfig.h	2006-09-27 00:48:38 UTC (rev 40)
@@ -3,4 +3,4 @@
 //When compiling OgreMain for the first time LINK_TO_MOGRE should be 0 (since Mogre.dll doesn't
 //exist yet). After compiling OgreMain and Mogre, build OgreMain with LINK_TO_MOGRE = 1 so
 //that OgreMain can link to Mogre to instantiate Mogre's classes.
-#define LINK_TO_MOGRE 0
+#define LINK_TO_MOGRE 1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mogre-svnmail] SF.net SVN: mogre: [39] trunk/Mogre

[<mog...@li...>]

Revision: 39
          http://svn.sourceforge.net/mogre/?rev=39&view=rev
Author:   bekas
Date:     2006-09-25 20:30:42 -0700 (Mon, 25 Sep 2006)

Log Message:
-----------
--All *Ptr classes (MaterialPtr etc.) are immutable value classes (like String). For example, two different MaterialPtr classes
	that point to the same Ogre:Material* pointer are considered equal and return the same value at GetHashCode, so that
	collection classes (like Dictionary) can treat them as equal.
--The 'freeOnClose' parameter in the constructor of the MemoryDataStream class is removed, because if you pass a value other than
	the default, it will lead either to access violation exception, or to a memory leak.
--Classes that implement interfaces (i.e Renderable for IRenderable) have been moved from 'Mogre.Subclassing' namespace to 'Mogre'
--Added Codec, ImageCodec classes
--Added ExternalTextureSource, ExternalTextureSourceManager classes
--Added ParticleSystemRenderer, BillboardParticleRenderer classes
--Added StringConverter, StringInterface/IStringInterface classes
--Added ParamCommand class, ParameterDef_NativePtr and ParamDictionary_NativePtr structs
	(for Ogre's ParameterDef and ParamDictionary)

Modified Paths:
--------------
    trunk/Mogre/ChangeLog.txt
    trunk/Mogre/Mogre/Mogre.vcproj
    trunk/Mogre/Mogre/include/PortedClasses.h
    trunk/Mogre/Mogre/include/auto/MakePublicDeclarations.h
    trunk/Mogre/Mogre/include/auto/MogreAnimable.h
    trunk/Mogre/Mogre/include/auto/MogreArchive.h
    trunk/Mogre/Mogre/include/auto/MogreCamera.h
    trunk/Mogre/Mogre/include/auto/MogreCompositor.h
    trunk/Mogre/Mogre/include/auto/MogreDataStream.h
    trunk/Mogre/Mogre/include/auto/MogreFont.h
    trunk/Mogre/Mogre/include/auto/MogreFrustum.h
    trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h
    trunk/Mogre/Mogre/include/auto/MogreHardwareIndexBuffer.h
    trunk/Mogre/Mogre/include/auto/MogreHardwarePixelBuffer.h
    trunk/Mogre/Mogre/include/auto/MogreHardwareVertexBuffer.h
    trunk/Mogre/Mogre/include/auto/MogreHighLevelGpuProgram.h
    trunk/Mogre/Mogre/include/auto/MogreMaterial.h
    trunk/Mogre/Mogre/include/auto/MogreMesh.h
    trunk/Mogre/Mogre/include/auto/MogreMovableObject.h
    trunk/Mogre/Mogre/include/auto/MogreNode.h
    trunk/Mogre/Mogre/include/auto/MogreOverlayElement.h
    trunk/Mogre/Mogre/include/auto/MogreParticleAffector.h
    trunk/Mogre/Mogre/include/auto/MogreParticleEmitter.h
    trunk/Mogre/Mogre/include/auto/MogreParticleSystem.h
    trunk/Mogre/Mogre/include/auto/MogreParticleSystemManager.h
    trunk/Mogre/Mogre/include/auto/MogrePatchMesh.h
    trunk/Mogre/Mogre/include/auto/MogreRenderQueueSortingGrouping.h
    trunk/Mogre/Mogre/include/auto/MogreRenderable.h
    trunk/Mogre/Mogre/include/auto/MogreResource.h
    trunk/Mogre/Mogre/include/auto/MogreResourceBackgroundQueue.h
    trunk/Mogre/Mogre/include/auto/MogreSceneQuery.h
    trunk/Mogre/Mogre/include/auto/MogreSkeleton.h
    trunk/Mogre/Mogre/include/auto/MogreStringVector.h
    trunk/Mogre/Mogre/include/auto/MogreTexture.h
    trunk/Mogre/Mogre/include/auto/PreDeclarations.h
    trunk/Mogre/Mogre/src/NestedClassesCreations.cpp
    trunk/Mogre/Mogre/src/auto/MogreAnimable.cpp
    trunk/Mogre/Mogre/src/auto/MogreDataStream.cpp
    trunk/Mogre/Mogre/src/auto/MogreFrustum.cpp
    trunk/Mogre/Mogre/src/auto/MogreNode.cpp
    trunk/Mogre/Mogre/src/auto/MogreOverlayElement.cpp
    trunk/Mogre/Mogre/src/auto/MogreParticleAffector.cpp
    trunk/Mogre/Mogre/src/auto/MogreParticleEmitter.cpp
    trunk/Mogre/Mogre/src/auto/MogreParticleSystem.cpp
    trunk/Mogre/Mogre/src/auto/MogreParticleSystemManager.cpp
    trunk/Mogre/Mogre/src/auto/MogreRenderQueueSortingGrouping.cpp
    trunk/Mogre/Mogre/src/auto/MogreRenderable.cpp
    trunk/Mogre/Mogre/src/auto/MogreResource.cpp
    trunk/Mogre/Mogre/src/auto/MogreResourceBackgroundQueue.cpp
    trunk/Mogre/Mogre/src/auto/MogreSceneQuery.cpp
    trunk/Mogre/ogrenew/OgreMain/include/CLRConfig.h
    trunk/Mogre/ogrenew/OgreMain/include/OgreBillboardParticleRenderer.h
    trunk/Mogre/ogrenew/OgreMain/include/OgreCodec.h
    trunk/Mogre/ogrenew/OgreMain/include/OgreExternalTextureSource.h
    trunk/Mogre/ogrenew/OgreMain/include/OgreImageCodec.h
    trunk/Mogre/ogrenew/OgreMain/include/OgreParticleSystemRenderer.h
    trunk/Mogre/ogrenew/OgreMain/include/clrobject.h
    trunk/Mogre/ogrenew/OgreMain/src/CLRObject.cpp
    trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_CollisionPrimitives.h
    trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_CollisionPrimitives.cpp

Added Paths:
-----------
    trunk/Mogre/Mogre/include/Custom/MogreParamCommand.h
    trunk/Mogre/Mogre/include/auto/MogreBillboardParticleRenderer.h
    trunk/Mogre/Mogre/include/auto/MogreCodec.h
    trunk/Mogre/Mogre/include/auto/MogreExternalTextureSource.h
    trunk/Mogre/Mogre/include/auto/MogreExternalTextureSourceManager.h
    trunk/Mogre/Mogre/include/auto/MogreImageCodec.h
    trunk/Mogre/Mogre/include/auto/MogreParticleSystemRenderer.h
    trunk/Mogre/Mogre/include/auto/MogreStringConverter.h
    trunk/Mogre/Mogre/include/auto/MogreStringInterface.h
    trunk/Mogre/Mogre/src/Custom/MogreParamCommand.cpp
    trunk/Mogre/Mogre/src/auto/MogreBillboardParticleRenderer.cpp
    trunk/Mogre/Mogre/src/auto/MogreCodec.cpp
    trunk/Mogre/Mogre/src/auto/MogreExternalTextureSource.cpp
    trunk/Mogre/Mogre/src/auto/MogreExternalTextureSourceManager.cpp
    trunk/Mogre/Mogre/src/auto/MogreImageCodec.cpp
    trunk/Mogre/Mogre/src/auto/MogreParticleSystemRenderer.cpp
    trunk/Mogre/Mogre/src/auto/MogreStringConverter.cpp
    trunk/Mogre/Mogre/src/auto/MogreStringInterface.cpp

Modified: trunk/Mogre/ChangeLog.txt
===================================================================
--- trunk/Mogre/ChangeLog.txt	2006-09-23 23:14:40 UTC (rev 38)
+++ trunk/Mogre/ChangeLog.txt	2006-09-26 03:30:42 UTC (rev 39)
@@ -4,5 +4,17 @@
 --Added additional overload methods of SceneManager.SetOption/GetOption for convenience
 	(unsafe context not needed for primitive values)
 --PlaneBoundedVolume gets cleaned up at finalization
---Classes with copy assignment operator get a CopyTo method that has the same functionality
---Added ParticleEmmiter, ParticleAffector, ParticleEmitterFactory, ParticleAffectorFactory, and ParticleSystemFactory classes
\ No newline at end of file
+--Classes with copy assignment operator get a 'CopyTo' method that has the same functionality
+--Added ParticleEmmiter, ParticleAffector, ParticleEmitterFactory, ParticleAffectorFactory, and ParticleSystemFactory classes
+--All *Ptr classes (MaterialPtr etc.) are immutable value classes (like String). For example, two different MaterialPtr classes
+	that point to the same Ogre:Material* pointer are considered equal and return the same value at GetHashCode, so that
+	collection classes (like Dictionary) can treat them as equal.
+--The 'freeOnClose' parameter in the constructor of the MemoryDataStream class is removed, because if you pass a value other than
+	the default, it will lead either to access violation exception, or to a memory leak.
+--Classes that implement interfaces (i.e Renderable for IRenderable) have been moved from 'Mogre.Subclassing' namespace to 'Mogre'
+--Added Codec, ImageCodec classes
+--Added ExternalTextureSource, ExternalTextureSourceManager classes
+--Added ParticleSystemRenderer, BillboardParticleRenderer classes
+--Added StringConverter, StringInterface/IStringInterface classes
+--Added ParamCommand class, ParameterDef_NativePtr and ParamDictionary_NativePtr structs
+	(for Ogre's ParameterDef and ParamDictionary)

Modified: trunk/Mogre/Mogre/Mogre.vcproj
===================================================================
--- trunk/Mogre/Mogre/Mogre.vcproj	2006-09-23 23:14:40 UTC (rev 38)
+++ trunk/Mogre/Mogre/Mogre.vcproj	2006-09-26 03:30:42 UTC (rev 39)
@@ -288,6 +288,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\src\auto\MogreBillboardParticleRenderer.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\src\auto\MogreBillboardSet.cpp"
 				>
 			</File>
@@ -308,6 +312,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\src\auto\MogreCodec.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\src\Custom\MogreColourValue.cpp"
 				>
 				<FileConfiguration
@@ -380,6 +388,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\src\auto\MogreExternalTextureSource.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\auto\MogreExternalTextureSourceManager.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\src\auto\MogreFont.cpp"
 				>
 			</File>
@@ -440,6 +456,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\src\auto\MogreImageCodec.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\src\auto\MogreKeyFrame.cpp"
 				>
 			</File>
@@ -576,6 +596,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\src\Custom\MogreParamCommand.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\src\auto\MogreParticle.cpp"
 				>
 			</File>
@@ -608,6 +632,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\src\auto\MogreParticleSystemRenderer.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\src\auto\MogrePass.cpp"
 				>
 			</File>
@@ -620,14 +648,15 @@
 				>
 			</File>
 			<File
-				RelativePath=".\src\Custom\MogrePlane.cpp"
+				RelativePath=".\src\auto\MogrePlane.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -635,20 +664,20 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\auto\MogrePlane.cpp"
+				RelativePath=".\src\Custom\MogrePlane.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						UsePrecompiledHeader="0"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -656,8 +685,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						UsePrecompiledHeader="2"
 					/>
 				</FileConfiguration>
 			</File>
@@ -826,6 +854,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\src\auto\MogreStringConverter.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\auto\MogreStringInterface.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\src\auto\MogreStringVector.cpp"
 				>
 			</File>
@@ -1016,6 +1052,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\include\auto\MogreBillboardParticleRenderer.h"
+				>
+			</File>
+			<File
 				RelativePath=".\include\auto\MogreBillboardSet.h"
 				>
 			</File>
@@ -1036,6 +1076,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\include\auto\MogreCodec.h"
+				>
+			</File>
+			<File
 				RelativePath=".\include\Custom\MogreColourValue.h"
 				>
 			</File>
@@ -1092,6 +1136,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\include\auto\MogreExternalTextureSource.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\auto\MogreExternalTextureSourceManager.h"
+				>
+			</File>
+			<File
 				RelativePath=".\include\auto\MogreFont.h"
 				>
 			</File>
@@ -1152,6 +1204,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\include\auto\MogreImageCodec.h"
+				>
+			</File>
+			<File
 				RelativePath=".\include\Custom\MogreIteratorWrapper.h"
 				>
 			</File>
@@ -1252,6 +1308,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\include\Custom\MogreParamCommand.h"
+				>
+			</File>
+			<File
 				RelativePath=".\include\auto\MogreParticle.h"
 				>
 			</File>
@@ -1284,6 +1344,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\include\auto\MogreParticleSystemRenderer.h"
+				>
+			</File>
+			<File
 				RelativePath=".\include\auto\MogrePass.h"
 				>
 			</File>
@@ -1300,11 +1364,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\include\Custom\MogrePlane.h"
+				RelativePath=".\include\auto\MogrePlane.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\auto\MogrePlane.h"
+				RelativePath=".\include\Custom\MogrePlane.h"
 				>
 			</File>
 			<File
@@ -1484,6 +1548,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\include\auto\MogreStringConverter.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\auto\MogreStringInterface.h"
+				>
+			</File>
+			<File
 				RelativePath=".\include\auto\MogreStringVector.h"
 				>
 			</File>

Added: trunk/Mogre/Mogre/include/Custom/MogreParamCommand.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreParamCommand.h	                        (rev 0)
+++ trunk/Mogre/Mogre/include/Custom/MogreParamCommand.h	2006-09-26 03:30:42 UTC (rev 39)
@@ -0,0 +1,48 @@
+#pragma once
+
+#include <gcroot.h>
+#include "OgreStringInterface.h"
+
+namespace Mogre
+{
+	ref class StringInterface;
+
+
+	public ref class ParamCommand abstract
+	{
+		Ogre::ParamCommand* _native;
+
+	public:
+		inline static operator Ogre::ParamCommand* ( ParamCommand^ obj )
+		{
+			return obj->_native;
+		}
+
+		ParamCommand();
+
+		~ParamCommand()
+		{
+			if (_native)
+			{
+				delete _native;
+				_native = 0;
+			}
+		}
+
+        virtual String^ DoGet(IStringInterface^ target) abstract;
+        virtual void DoSet(IStringInterface^ target, String^ val) abstract;
+	};
+
+	class ParamCommand_Proxy : public Ogre::ParamCommand
+	{
+		gcroot<Mogre::ParamCommand^> _managed;
+
+	public:
+		ParamCommand_Proxy( Mogre::ParamCommand^ managed ) : _managed(managed)
+		{
+		}
+
+		virtual Ogre::String doGet(const void* target) const;
+		virtual void doSet(void* target, const Ogre::String& val);
+	};
+}
\ No newline at end of file

Modified: trunk/Mogre/Mogre/include/PortedClasses.h
===================================================================
--- trunk/Mogre/Mogre/include/PortedClasses.h	2006-09-23 23:14:40 UTC (rev 38)
+++ trunk/Mogre/Mogre/include/PortedClasses.h	2006-09-26 03:30:42 UTC (rev 39)
@@ -12,6 +12,7 @@
 #include "Custom\MogreVector2.h"
 #include "Custom\MogreVector3.h"
 #include "Custom\MogreVector4.h"
+#include "Custom\MogreParamCommand.h"
 
 //VertexElement is "injected" using MogreVertexElement.i
 //#include "MogreVertexElement.h"

Modified: trunk/Mogre/Mogre/include/auto/MakePublicDeclarations.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MakePublicDeclarations.h	2006-09-23 23:14:40 UTC (rev 38)
+++ trunk/Mogre/Mogre/include/auto/MakePublicDeclarations.h	2006-09-26 03:30:42 UTC (rev 39)
@@ -28,6 +28,7 @@
 #include "OgreTechnique.h"
 #include "OgreGpuProgram.h"
 #include "OgreMovableObject.h"
+#include "OgreBillboardParticleRenderer.h"
 #include "OgreBlendMode.h"
 #include "OgreBone.h"
 #include "OgreBorderPanelOverlayElement.h"
@@ -38,6 +39,7 @@
 #include "OgreViewport.h"
 #include "OgreRay.h"
 #include "OgreSphere.h"
+#include "OgreCodec.h"
 #include "OgreLight.h"
 #include "OgreCompositionPass.h"
 #include "OgreCompositionTargetPass.h"
@@ -59,6 +61,9 @@
 #include "OgreSubEntity.h"
 #include "OgreTagPoint.h"
 #include "OgreHardwareIndexBuffer.h"
+#include "OgreExternalTextureSource.h"
+#include "OgreStringInterface.h"
+#include "OgreExternalTextureSourceManager.h"
 #include "OgreFont.h"
 #include "OgreRenderWindow.h"
 #include "OgreResource.h"
@@ -74,6 +79,7 @@
 #include "OgreHighLevelGpuProgram.h"
 #include "OgreHighLevelGpuProgramManager.h"
 #include "OgreImage.h"
+#include "OgreImageCodec.h"
 #include "OgrePlaneBoundedVolume.h"
 #include "OgreLogManager.h"
 #include "OgreManualObject.h"
@@ -98,6 +104,7 @@
 #include "OgreParticleEmitter.h"
 #include "OgreParticleEmitterFactory.h"
 #include "OgreParticleIterator.h"
+#include "OgreParticleSystemRenderer.h"
 #include "OgreParticleSystemManager.h"
 #include "OgrePass.h"
 #include "OgreTextureUnitState.h"
@@ -127,6 +134,7 @@
 #include "OgreSimpleSpline.h"
 #include "OgreSkeletonManager.h"
 #include "OgreSkeletonSerializer.h"
+#include "OgreStringConverter.h"
 #include "OgreTextAreaOverlayElement.h"
 #include "OgreTextureManager.h"
 #include "OgreVertexBoneAssignment.h"
@@ -169,6 +177,7 @@
 #pragma make_public( Ogre::GpuProgramParameters )
 #pragma make_public( Ogre::BillboardChainFactory )
 #pragma make_public( Ogre::MovableObject )
+#pragma make_public( Ogre::BillboardParticleRenderer )
 #pragma make_public( Ogre::BillboardSetFactory )
 #pragma make_public( Ogre::LayerBlendModeEx )
 #pragma make_public( Ogre::Bone )
@@ -181,6 +190,7 @@
 #pragma make_public( Ogre::Viewport )
 #pragma make_public( Ogre::Ray )
 #pragma make_public( Ogre::Sphere )
+#pragma make_public( Ogre::Codec )
 #pragma make_public( Ogre::Light )
 #pragma make_public( Ogre::CompositionPass )
 #pragma make_public( Ogre::CompositionTargetPass )
@@ -206,6 +216,10 @@
 #pragma make_public( Ogre::TagPoint )
 #pragma make_public( Ogre::HardwareIndexBufferSharedPtr )
 #pragma make_public( Ogre::EntityFactory )
+#pragma make_public( Ogre::ExternalTextureSource )
+#pragma make_public( Ogre::ParamDictionary )
+#pragma make_public( Ogre::StringInterface )
+#pragma make_public( Ogre::ExternalTextureSourceManager )
 #pragma make_public( Ogre::Font )
 #pragma make_public( Ogre::RenderWindow )
 #pragma make_public( Ogre::Resource )
@@ -232,6 +246,7 @@
 #pragma make_public( Ogre::HighLevelGpuProgramManager )
 #pragma make_public( Ogre::HighLevelGpuProgramPtr )
 #pragma make_public( Ogre::Image )
+#pragma make_public( Ogre::ImageCodec )
 #pragma make_public( Ogre::PlaneBoundedVolume )
 #pragma make_public( Ogre::LightFactory )
 #pragma make_public( Ogre::LogListener )
@@ -268,6 +283,7 @@
 #pragma make_public( Ogre::ParticleEmitter )
 #pragma make_public( Ogre::ParticleEmitterFactory )
 #pragma make_public( Ogre::ParticleIterator )
+#pragma make_public( Ogre::ParticleSystemRenderer )
 #pragma make_public( Ogre::ParticleSystemManager )
 #pragma make_public( Ogre::ParticleSystemFactory )
 #pragma make_public( Ogre::IlluminationPass )
@@ -335,6 +351,10 @@
 #pragma make_public( Ogre::LinkedSkeletonAnimationSource )
 #pragma make_public( Ogre::SkeletonManager )
 #pragma make_public( Ogre::SkeletonSerializer )
+#pragma make_public( Ogre::StringConverter )
+#pragma make_public( Ogre::Degree )
+#pragma make_public( Ogre::ParameterDef )
+#pragma make_public( Ogre::ParamCommand )
 #pragma make_public( Ogre::TextAreaOverlayElement )
 #pragma make_public( Ogre::TextureManager )
 #pragma make_public( Ogre::VertexBoneAssignment_s )

Modified: trunk/Mogre/Mogre/include/auto/MogreAnimable.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreAnimable.h	2006-09-23 23:14:40 UTC (rev 38)
+++ trunk/Mogre/Mogre/include/auto/MogreAnimable.h	2006-09-26 03:30:42 UTC (rev 39)
@@ -12,7 +12,7 @@
 	class AnimableObject_ProtectedTypesProxy : public Ogre::AnimableObject
 	{
 	public:
-		friend ref class Mogre::Subclassing::AnimableObject;
+		friend ref class Mogre::AnimableObject;
 		typedef Ogre::AnimableObject::AnimableDictionaryMap AnimableDictionaryMap;
 	};
 	
@@ -123,84 +123,82 @@
 	
 	};
 	
-	namespace Subclassing
+	//################################################################
+	//IAnimableObject
+	//################################################################
+	
+	public ref class AnimableObject : public Wrapper, public IAnimableObject
 	{
-		//################################################################
-		//IAnimableObject
-		//################################################################
+		//Nested Types
+		protected public: ref class AnimableDictionaryMap;
 	
-		public ref class AnimableObject : public Wrapper, public IAnimableObject
-		{
-			//Nested Types
-			protected public: ref class AnimableDictionaryMap;
+		#define STLDECL_MANAGEDKEY String^
+		#define STLDECL_MANAGEDVALUE Mogre::StringVector^
+		#define STLDECL_NATIVEKEY Ogre::String
+		#define STLDECL_NATIVEVALUE Ogre::StringVector
+		protected public: INC_DECLARE_STLMAP( AnimableDictionaryMap, STLDECL_MANAGEDKEY, STLDECL_MANAGEDVALUE, STLDECL_NATIVEKEY, STLDECL_NATIVEVALUE, protected public: , private: )
+		#undef STLDECL_MANAGEDKEY
+		#undef STLDECL_MANAGEDVALUE
+		#undef STLDECL_NATIVEKEY
+		#undef STLDECL_NATIVEVALUE
 	
-			#define STLDECL_MANAGEDKEY String^
-			#define STLDECL_MANAGEDVALUE Mogre::StringVector^
-			#define STLDECL_NATIVEKEY Ogre::String
-			#define STLDECL_NATIVEVALUE Ogre::StringVector
-			protected public: INC_DECLARE_STLMAP( AnimableDictionaryMap, STLDECL_MANAGEDKEY, STLDECL_MANAGEDVALUE, STLDECL_NATIVEKEY, STLDECL_NATIVEVALUE, protected public: , private: )
-			#undef STLDECL_MANAGEDKEY
-			#undef STLDECL_MANAGEDVALUE
-			#undef STLDECL_NATIVEKEY
-			#undef STLDECL_NATIVEVALUE
+		//Private Declarations
+	private protected:
+		static AnimableObject();
 	
-			//Private Declarations
-		private protected:
-			//Cached fields
-			static Mogre::Subclassing::AnimableObject::AnimableDictionaryMap^ _msAnimableDictionary = Mogre::AnimableObject_ProtectedTypesProxy::msAnimableDictionary;
+		//Cached fields
+		static Mogre::AnimableObject::AnimableDictionaryMap^ _msAnimableDictionary;
 	
-			Ogre::AnimableObject* _IAnimableObject_native;
+		Ogre::AnimableObject* _IAnimableObject_native;
 	
-			//Internal Declarations
-		internal:
-			virtual Ogre::AnimableObject* _IAnimableObject_GetNativePtr() = IAnimableObject::_GetNativePtr
-			{
-				return _IAnimableObject_native;
-			}
+		//Internal Declarations
+	internal:
+		virtual Ogre::AnimableObject* _IAnimableObject_GetNativePtr() = IAnimableObject::_GetNativePtr
+		{
+			return _IAnimableObject_native;
+		}
 	
 	
-			//Public Declarations
+		//Public Declarations
 	
-			~AnimableObject();
+		~AnimableObject();
 	
-		public:
-			AnimableObject( );
+	public:
+		AnimableObject( );
 	
 	
-			property String^ AnimableDictionaryName
-			{
-			protected public:
-				[Implementation::MethodIndex( 1 )]
-				virtual String^ get();
-			}
+		property String^ AnimableDictionaryName
+		{
+		protected public:
+			[Implementation::MethodIndex( 1 )]
+			virtual String^ get();
+		}
 	
-			Mogre::Const_StringVector^ GetAnimableValueNames( );
+		Mogre::Const_StringVector^ GetAnimableValueNames( );
 	
-			[Implementation::MethodIndex( 0 )]
-			virtual Mogre::AnimableValuePtr^ CreateAnimableValue( String^ valueName );
+		[Implementation::MethodIndex( 0 )]
+		virtual Mogre::AnimableValuePtr^ CreateAnimableValue( String^ valueName );
 	
 	
-			//Protected Declarations
+		//Protected Declarations
+	protected public:
+		static property Mogre::AnimableObject::AnimableDictionaryMap^ msAnimableDictionary
+		{
 		protected public:
-			static property Mogre::Subclassing::AnimableObject::AnimableDictionaryMap^ msAnimableDictionary
-			{
-			protected public:
-				Mogre::Subclassing::AnimableObject::AnimableDictionaryMap^ get();
-			}
+			Mogre::AnimableObject::AnimableDictionaryMap^ get();
+		}
 	
-			void CreateAnimableDictionary( );
+		void CreateAnimableDictionary( );
 	
-			Mogre::StringVector^ _getAnimableValueNames( );
+		Mogre::StringVector^ _getAnimableValueNames( );
 	
-			[Implementation::MethodIndex( 2 )]
-			virtual void InitialiseAnimableDictionary( Mogre::StringVector^ vec );
+		[Implementation::MethodIndex( 2 )]
+		virtual void InitialiseAnimableDictionary( Mogre::StringVector^ vec );
 	
 	
-		};
+	};
 	
-	}
 	
-	
 	public ref class AnimableValuePtr : public AnimableValue
 	{
 	internal:
@@ -228,21 +226,36 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( AnimableValuePtr )
 	
-		AnimableValuePtr() : AnimableValue( (Ogre::AnimableValue*) 0 )
-		{
-			_sharedPtr = new Ogre::AnimableValuePtr();
-		}
-	
 		AnimableValuePtr(AnimableValue^ clrObject) : AnimableValue( clrObject->_native )
 		{
 			_sharedPtr = new Ogre::AnimableValuePtr( static_cast<Ogre::AnimableValue*>(clrObject->_native) );
 		}
 	
-		void Bind(AnimableValue^ clrObject)
+		virtual bool Equals(Object^ obj) override
 		{
-			(*_sharedPtr).bind( static_cast<Ogre::AnimableValue*>(clrObject->_native) );
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
+	
+			AnimableValuePtr^ clr = dynamic_cast<AnimableValuePtr^>(obj);
+			if (clr == CLR_NULL)
+			{
+				return false;
+			}
+	
+			return (_native == clr->_native);
 		}
+		bool Equals(AnimableValuePtr^ obj)
+		{
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
 	
+			return (_native == obj->_native);
+		}
+	
 		static bool operator == (AnimableValuePtr^ val1, AnimableValuePtr^ val2)
 		{
 			if ((Object^)val1 == (Object^)val2) return true;
@@ -255,6 +268,11 @@
 			return !(val1 == val2);
 		}
 	
+		virtual int GetHashCode() override
+		{
+			return reinterpret_cast<int>( _native );
+		}
+	
 		property bool Unique
 		{
 			bool get()
@@ -271,12 +289,6 @@
 			}
 		}
 	
-		void SetNull()
-		{
-			(*_sharedPtr).setNull();
-			_native = 0;
-		}
-	
 		property bool IsNull
 		{
 			bool get()
@@ -298,8 +310,8 @@
 	class AnimableObject_ProtectedStaticsProxy : public Ogre::AnimableObject
 	{
 	public:
-		friend ref class Mogre::Subclassing::AnimableObject;
-		friend ref class Mogre::Subclassing::AnimableObject::msAnimableDictionary;
+		friend ref class Mogre::AnimableObject;
+		friend ref class Mogre::AnimableObject::msAnimableDictionary;
 	};
 	
 	//################################################################
@@ -309,16 +321,16 @@
 	class AnimableObject_Proxy : public Ogre::AnimableObject, public CLRObject
 	{
 	public:
-		friend ref class Mogre::Subclassing::AnimableObject;
-		friend ref class Mogre::Subclassing::AnimableObject::AnimableDictionaryName;
+		friend ref class Mogre::AnimableObject;
+		friend ref class Mogre::AnimableObject::AnimableDictionaryName;
 	
 		bool* _overriden;
 	
-		gcroot<Mogre::Subclassing::AnimableObject^> _managed;
+		gcroot<Mogre::AnimableObject^> _managed;
 	
 		virtual void _Init_CLRObject() override { *static_cast<CLRObject*>(this) = _managed; }
 	
-		AnimableObject_Proxy( Mogre::Subclassing::AnimableObject^ managedObj ) :
+		AnimableObject_Proxy( Mogre::AnimableObject^ managedObj ) :
 			Ogre::AnimableObject( ),
 			_managed(managedObj)
 		{

Modified: trunk/Mogre/Mogre/include/auto/MogreArchive.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreArchive.h	2006-09-23 23:14:40 UTC (rev 38)
+++ trunk/Mogre/Mogre/include/auto/MogreArchive.h	2006-09-26 03:30:42 UTC (rev 39)
@@ -140,21 +140,36 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( FileInfoListPtr )
 	
-		FileInfoListPtr() : FileInfoList( (Ogre::FileInfoList*) 0 )
-		{
-			_sharedPtr = new Ogre::FileInfoListPtr();
-		}
-	
 		FileInfoListPtr(FileInfoList^ clrObject) : FileInfoList( clrObject->_native )
 		{
 			_sharedPtr = new Ogre::FileInfoListPtr( static_cast<Ogre::FileInfoList*>(clrObject->_native) );
 		}
 	
-		void Bind(FileInfoList^ clrObject)
+		virtual bool Equals(Object^ obj) override
 		{
-			(*_sharedPtr).bind( static_cast<Ogre::FileInfoList*>(clrObject->_native) );
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
+	
+			FileInfoListPtr^ clr = dynamic_cast<FileInfoListPtr^>(obj);
+			if (clr == CLR_NULL)
+			{
+				return false;
+			}
+	
+			return (_native == clr->_native);
 		}
+		bool Equals(FileInfoListPtr^ obj)
+		{
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
 	
+			return (_native == obj->_native);
+		}
+	
 		static bool operator == (FileInfoListPtr^ val1, FileInfoListPtr^ val2)
 		{
 			if ((Object^)val1 == (Object^)val2) return true;
@@ -167,6 +182,11 @@
 			return !(val1 == val2);
 		}
 	
+		virtual int GetHashCode() override
+		{
+			return reinterpret_cast<int>( _native );
+		}
+	
 		property bool Unique
 		{
 			bool get()
@@ -183,12 +203,6 @@
 			}
 		}
 	
-		void SetNull()
-		{
-			(*_sharedPtr).setNull();
-			_native = 0;
-		}
-	
 		property bool IsNull
 		{
 			bool get()

Added: trunk/Mogre/Mogre/include/auto/MogreBillboardParticleRenderer.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreBillboardParticleRenderer.h	                        (rev 0)
+++ trunk/Mogre/Mogre/include/auto/MogreBillboardParticleRenderer.h	2006-09-26 03:30:42 UTC (rev 39)
@@ -0,0 +1,135 @@
+/*  This file is produced by the C++/CLI AutoWrapper utility.
+        Copyright (c) 2006 by Argiris Kirtzidis  */
+
+#pragma once
+
+#include "OgreBillboardParticleRenderer.h"
+#include "MogreParticleSystemRenderer.h"
+#include "MogreBillboardSet.h"
+#include "MogrePrerequisites.h"
+#include "MogrePlatform.h"
+#include "MogreCommon.h"
+
+namespace Mogre
+{
+	//################################################################
+	//BillboardParticleRenderer
+	//################################################################
+	
+	public ref class BillboardParticleRenderer : public ParticleSystemRenderer
+	{
+		//Nested Types
+	
+		//Private Declarations
+	private protected:
+	
+	
+		//Internal Declarations
+	internal:
+		BillboardParticleRenderer( CLRObject* obj ) : ParticleSystemRenderer(obj)
+		{
+		}
+	
+	
+		//Public Declarations
+	public:
+	
+	
+		property Mogre::BillboardOrigin BillboardOrigin
+		{
+		public:
+			Mogre::BillboardOrigin get();
+		public:
+			void set(Mogre::BillboardOrigin origin);
+		}
+	
+		property Mogre::BillboardRotationType BillboardRotationType
+		{
+		public:
+			Mogre::BillboardRotationType get();
+		public:
+			void set(Mogre::BillboardRotationType rotationType);
+		}
+	
+		property Mogre::BillboardSet^ BillboardSet
+		{
+		public:
+			Mogre::BillboardSet^ get();
+		}
+	
+		property Mogre::BillboardType BillboardType
+		{
+		public:
+			Mogre::BillboardType get();
+		public:
+			void set(Mogre::BillboardType bbt);
+		}
+	
+		property Mogre::Vector3 CommonDirection
+		{
+		public:
+			Mogre::Vector3 get();
+		public:
+			void set(Mogre::Vector3 vec);
+		}
+	
+		property Mogre::Vector3 CommonUpVector
+		{
+		public:
+			Mogre::Vector3 get();
+		public:
+			void set(Mogre::Vector3 vec);
+		}
+	
+		property bool IsPointRenderingEnabled
+		{
+		public:
+			bool get();
+		}
+	
+		property String^ Type
+		{
+		public:
+			String^ get();
+		}
+	
+		property bool UseAccurateFacing
+		{
+		public:
+			bool get();
+		public:
+			void set(bool acc);
+		}
+	
+		void SetPointRenderingEnabled( bool enabled );
+	
+		void _setMaterial( Mogre::MaterialPtr^ mat );
+	
+		void _notifyCurrentCamera( Mogre::Camera^ cam );
+	
+		void _notifyParticleRotated( );
+	
+		void _notifyParticleResized( );
+	
+		void _notifyParticleQuota( size_t quota );
+	
+		void _notifyAttached( Mogre::Node^ parent, bool isTagPoint );
+		void _notifyAttached( Mogre::Node^ parent );
+	
+		void _notifyDefaultDimensions( Mogre::Real width, Mogre::Real height );
+	
+		void SetRenderQueueGroup( Mogre::uint8 queueID );
+	
+		void SetKeepParticlesInLocalSpace( bool keepLocal );
+	
+		Mogre::SortMode _getSortMode( );
+	
+		DEFINE_MANAGED_NATIVE_CONVERSIONS( BillboardParticleRenderer )
+	
+		//Protected Declarations
+	protected public:
+	
+	};
+	
+
+}

Modified: trunk/Mogre/Mogre/include/auto/MogreCamera.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreCamera.h	2006-09-23 23:14:40 UTC (rev 38)
+++ trunk/Mogre/Mogre/include/auto/MogreCamera.h	2006-09-26 03:30:42 UTC (rev 39)
@@ -10,6 +10,12 @@
 
 namespace Mogre
 {
+	class Camera_ProtectedTypesProxy : public Ogre::Camera
+	{
+	public:
+		friend ref class Mogre::Camera;
+	};
+	
 	//################################################################
 	//Camera
 	//################################################################

Added: trunk/Mogre/Mogre/include/auto/MogreCodec.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreCodec.h	                        (rev 0)
+++ trunk/Mogre/Mogre/include/auto/MogreCodec.h	2006-09-26 03:30:42 UTC (rev 39)
@@ -0,0 +1,215 @@
+/*  This file is produced by the C++/CLI AutoWrapper utility.
+        Copyright (c) 2006 by Argiris Kirtzidis  */
+
+#pragma once
+
+#include "OgreCodec.h"
+#include "MogrePrerequisites.h"
+#include "MogreStringVector.h"
+
+namespace Mogre
+{
+	//################################################################
+	//Codec
+	//################################################################
+	
+	public ref class Codec : public Wrapper
+	{
+		//Nested Types
+		public: ref class DecodeResult;
+		public: ref class CodecData;
+	
+		//################################################################
+		//CodecData
+		//################################################################
+	
+		public: ref class CodecData : public Wrapper
+		{
+			//Nested Types
+	
+			//Private Declarations
+		private protected:
+	
+	
+			//Internal Declarations
+		internal:
+			CodecData( CLRObject* obj ) : Wrapper(obj)
+			{
+			}
+	
+	
+			//Public Declarations
+		public:
+	
+	
+			String^ DataType( );
+	
+			DEFINE_MANAGED_NATIVE_CONVERSIONS( Codec::CodecData )
+	
+			//Protected Declarations
+		protected public:
+	
+		};
+	
+		public: ref class CodecDataPtr : public CodecData
+		{
+		internal:
+				Ogre::Codec::CodecDataPtr* _sharedPtr;
+	
+			CodecDataPtr(Ogre::Codec::CodecDataPtr& sharedPtr) : CodecData( sharedPtr.getPointer() )
+			{
+				_sharedPtr = new Ogre::Codec::CodecDataPtr(sharedPtr);
+			}
+	
+			!CodecDataPtr()
+			{
+				if (_sharedPtr != 0)
+				{
+					delete _sharedPtr;
+					_sharedPtr = 0;
+				}
+			}
+	
+			~CodecDataPtr()
+			{
+				this->!CodecDataPtr();
+			}
+	
+		public:
+			DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( Codec::CodecDataPtr )
+	
+			CodecDataPtr(CodecData^ clrObject) : CodecData( clrObject->_native )
+			{
+				_sharedPtr = new Ogre::Codec::CodecDataPtr( static_cast<Ogre::Codec::CodecData*>(clrObject->_native) );
+			}
+	
+			virtual bool Equals(Object^ obj) override
+			{
+				if (obj == CLR_NULL)
+				{
+					return false;
+				}
+	
+				CodecDataPtr^ clr = dynamic_cast<CodecDataPtr^>(obj);
+				if (clr == CLR_NULL)
+				{
+					return false;
+				}
+	
+				return (_native == clr->_native);
+			}
+			bool Equals(CodecDataPtr^ obj)
+			{
+				if (obj == CLR_NULL)
+				{
+					return false;
+				}
+	
+				return (_native == obj->_native);
+			}
+	
+			static bool operator == (CodecDataPtr^ val1, CodecDataPtr^ val2)
+			{
+				if ((Object^)val1 == (Object^)val2) return true;
+				if ((Object^)val1 == nullptr || (Object^)val2 == nullptr) return false;
+				return (val1->_native == val2->_native);
+			}
+	
+			static bool operator != (CodecDataPtr^ val1, CodecDataPtr^ val2)
+			{
+				return !(val1 == val2);
+			}
+	
+			virtual int GetHashCode() override
+			{
+				return reinterpret_cast<int>( _native );
+			}
+	
+			property bool Unique
+			{
+				bool get()
+				{
+					return (*_sharedPtr).unique();
+				}
+			}
+	
+			property int UseCount
+			{
+				int get()
+				{
+					return (*_sharedPtr).useCount();
+				}
+			}
+	
+			property bool IsNull
+			{
+				bool get()
+				{
+					return (*_sharedPtr).isNull();
+				}
+			}
+	
+			property CodecData^ Target
+			{
+				CodecData^ get()
+				{
+					return static_cast<Ogre::Codec::CodecData*>(_native);
+				}
+			}
+		};
+		
+	
+		public: INC_DECLARE_MAP_ITERATOR_NOCONSTRUCTOR( CodecIterator, Ogre::Codec::CodecIterator, Mogre::Codec::CodecList, Mogre::Codec^, Ogre::Codec*, String^, Ogre::String )
+	
+		//Private Declarations
+	private protected:
+	
+	
+		//Internal Declarations
+	internal:
+		Codec( CLRObject* obj ) : Wrapper(obj)
+		{
+		}
+	
+	
+		//Public Declarations
+	public:
+	
+	
+		property String^ DataType
+		{
+		public:
+			String^ get();
+		}
+	
+		property String^ Type
+		{
+		public:
+			String^ get();
+		}
+	
+		Mogre::DataStreamPtr^ Code( Mogre::MemoryDataStreamPtr^ input, Mogre::Codec::CodecDataPtr^ pData );
+	
+		void CodeToFile( Mogre::MemoryDataStreamPtr^ input, String^ outFileName, Mogre::Codec::CodecDataPtr^ pData );
+	
+		Pair<Mogre::MemoryDataStreamPtr^, Mogre::Codec::CodecDataPtr^> Decode( Mogre::DataStreamPtr^ input );
+	
+		static void RegisterCodec( Mogre::Codec^ pCodec );
+	
+		static void UnRegisterCodec( Mogre::Codec^ pCodec );
+	
+		static Mogre::Codec::CodecIterator^ GetCodecIterator( );
+	
+		static Mogre::StringVector^ GetExtensions( );
+	
+		static Mogre::Codec^ GetCodec( String^ extension );
+	
+		DEFINE_MANAGED_NATIVE_CONVERSIONS( Codec )
+	
+		//Protected Declarations
+	protected public:
+	
+	};
+	
+
+}

Modified: trunk/Mogre/Mogre/include/auto/MogreCompositor.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreCompositor.h	2006-09-23 23:14:40 UTC (rev 38)
+++ trunk/Mogre/Mogre/include/auto/MogreCompositor.h	2006-09-26 03:30:42 UTC (rev 39)
@@ -105,21 +105,36 @@
 			return gcnew CompositorPtr( (Ogre::CompositorPtr) *(ptr->_sharedPtr) );
 		}
 	
-		CompositorPtr() : Compositor( (Ogre::Compositor*) 0 )
-		{
-			_sharedPtr = new Ogre::CompositorPtr();
-		}
-	
 		CompositorPtr(Compositor^ clrObject) : Compositor( clrObject->_native )
 		{
 			_sharedPtr = new Ogre::CompositorPtr( static_cast<Ogre::Compositor*>(clrObject->_native) );
 		}
 	
-		void Bind(Compositor^ clrObject)
+		virtual bool Equals(Object^ obj) override
 		{
-			(*_sharedPtr).bind( static_cast<Ogre::Compositor*>(clrObject->_native) );
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
+	
+			CompositorPtr^ clr = dynamic_cast<CompositorPtr^>(obj);
+			if (clr == CLR_NULL)
+			{
+				return false;
+			}
+	
+			return (_native == clr->_native);
 		}
+		bool Equals(CompositorPtr^ obj)
+		{
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
 	
+			return (_native == obj->_native);
+		}
+	
 		static bool operator == (CompositorPtr^ val1, CompositorPtr^ val2)
 		{
 			if ((Object^)val1 == (Object^)val2) return true;
@@ -132,6 +147,11 @@
 			return !(val1 == val2);
 		}
 	
+		virtual int GetHashCode() override
+		{
+			return reinterpret_cast<int>( _native );
+		}
+	
 		property bool Unique
 		{
 			bool get()
@@ -148,12 +168,6 @@
 			}
 		}
 	
-		void SetNull()
-		{
-			(*_sharedPtr).setNull();
-			_native = 0;
-		}
-	
 		property bool IsNull
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreDataStream.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreDataStream.h	2006-09-23 23:14:40 UTC (rev 38)
+++ trunk/Mogre/Mogre/include/auto/MogreDataStream.h	2006-09-26 03:30:42 UTC (rev 39)
@@ -110,14 +110,14 @@
 	
 		//Public Declarations
 	public:
-		MemoryDataStream( void* pMem, size_t size, bool freeOnClose );
-		MemoryDataStream( String^ name, void* pMem, size_t size, bool freeOnClose );
-		MemoryDataStream( Mogre::DataStream^ sourceStream, bool freeOnClose );
-		MemoryDataStream( Mogre::DataStreamPtr^ sourceStream, bool freeOnClose );
-		MemoryDataStream( String^ name, Mogre::DataStream^ sourceStream, bool freeOnClose );
-		MemoryDataStream( String^ name, Mogre::DataStreamPtr^ sourceStream, bool freeOnClose );
-		MemoryDataStream( size_t size, bool freeOnClose );
-		MemoryDataStream( String^ name, size_t size, bool freeOnClose );
+		MemoryDataStream( void* pMem, size_t size );
+		MemoryDataStream( String^ name, void* pMem, size_t size );
+		MemoryDataStream( Mogre::DataStream^ sourceStream );
+		MemoryDataStream( Mogre::DataStreamPtr^ sourceStream );
+		MemoryDataStream( String^ name, Mogre::DataStream^ sourceStream );
+		MemoryDataStream( String^ name, Mogre::DataStreamPtr^ sourceStream );
+		MemoryDataStream( size_t size );
+		MemoryDataStream( String^ name, size_t size );
 	
 	
 		property Mogre::uchar* CurrentPtr
@@ -186,21 +186,36 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( DataStreamPtr )
 	
-		DataStreamPtr() : DataStream( (Ogre::DataStream*) 0 )
-		{
-			_sharedPtr = new Ogre::DataStreamPtr();
-		}
-	
 		DataStreamPtr(DataStream^ clrObject) : DataStream( clrObject->_native )
 		{
 			_sharedPtr = new Ogre::DataStreamPtr( static_cast<Ogre::DataStream*>(clrObject->_native) );
 		}
 	
-		void Bind(DataStream^ clrObject)
+		virtual bool Equals(Object^ obj) override
 		{
-			(*_sharedPtr).bind( static_cast<Ogre::DataStream*>(clrObject->_native) );
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
+	
+			DataStreamPtr^ clr = dynamic_cast<DataStreamPtr^>(obj);
+			if (clr == CLR_NULL)
+			{
+				return false;
+			}
+	
+			return (_native == clr->_native);
 		}
+		bool Equals(DataStreamPtr^ obj)
+		{
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
 	
+			return (_native == obj->_native);
+		}
+	
 		static bool operator == (DataStreamPtr^ val1, DataStreamPtr^ val2)
 		{
 			if ((Object^)val1 == (Object^)val2) return true;
@@ -213,6 +228,11 @@
 			return !(val1 == val2);
 		}
 	
+		virtual int GetHashCode() override
+		{
+			return reinterpret_cast<int>( _native );
+		}
+	
 		property bool Unique
 		{
 			bool get()
@@ -229,12 +249,6 @@
 			}
 		}
 	
-		void SetNull()
-		{
-			(*_sharedPtr).setNull();
-			_native = 0;
-		}
-	
 		property bool IsNull
 		{
 			bool get()
@@ -286,21 +300,36 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( DataStreamListPtr )
 	
-		DataStreamListPtr() : DataStreamList( (Ogre::DataStreamList*) 0 )
-		{
-			_sharedPtr = new Ogre::DataStreamListPtr();
-		}
-	
 		DataStreamListPtr(DataStreamList^ clrObject) : DataStreamList( clrObject->_native )
 		{
 			_sharedPtr = new Ogre::DataStreamListPtr( static_cast<Ogre::DataStreamList*>(clrObject->_native) );
 		}
 	
-		void Bind(DataStreamList^ clrObject)
+		virtual bool Equals(Object^ obj) override
 		{
-			(*_sharedPtr).bind( static_cast<Ogre::DataStreamList*>(clrObject->_native) );
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
+	
+			DataStreamListPtr^ clr = dynamic_cast<DataStreamListPtr^>(obj);
+			if (clr == CLR_NULL)
+			{
+				return false;
+			}
+	
+			return (_native == clr->_native);
 		}
+		bool Equals(DataStreamListPtr^ obj)
+		{
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
 	
+			return (_native == obj->_native);
+		}
+	
 		static bool operator == (DataStreamListPtr^ val1, DataStreamListPtr^ val2)
 		{
 			if ((Object^)val1 == (Object^)val2) return true;
@@ -313,6 +342,11 @@
 			return !(val1 == val2);
 		}
 	
+		virtual int GetHashCode() override
+		{
+			return reinterpret_cast<int>( _native );
+		}
+	
 		property bool Unique
 		{
 			bool get()
@@ -329,12 +363,6 @@
 			}
 		}
 	
-		void SetNull()
-		{
-			(*_sharedPtr).setNull();
-			_native = 0;
-		}
-	
 		property bool IsNull
 		{
 			bool get()
@@ -380,21 +408,36 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( MemoryDataStreamPtr )
 	
-		MemoryDataStreamPtr() : MemoryDataStream( (Ogre::MemoryDataStream*) 0 )
-		{
-			_sharedPtr = new Ogre::MemoryDataStreamPtr();
-		}
-	
 		MemoryDataStreamPtr(MemoryDataStream^ clrObject) : MemoryDataStream( clrObject->_native )
 		{
 			_sharedPtr = new Ogre::MemoryDataStreamPtr( static_cast<Ogre::MemoryDataStream*>(clrObject->_native) );
 		}
 	
-		void Bind(MemoryDataStream^ clrObject)
+		virtual bool Equals(Object^ obj) override
 		{
-			(*_sharedPtr).bind( static_cast<Ogre::MemoryDataStream*>(clrObject->_native) );
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
+	
+			MemoryDataStreamPtr^ clr = dynamic_cast<MemoryDataStreamPtr^>(obj);
+			if (clr == CLR_NULL)
+			{
+				return false;
+			}
+	
+			return (_native == clr->_native);
 		}
+		bool Equals(MemoryDataStreamPtr^ obj)
+		{
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
 	
+			return (_native == obj->_native);
+		}
+	
 		static bool operator == (MemoryDataStreamPtr^ val1, MemoryDataStreamPtr^ val2)
 		{
 			if ((Object^)val1 == (Object^)val2) return true;
@@ -407,6 +450,11 @@
 			return !(val1 == val2);
 		}
 	
+		virtual int GetHashCode() override
+		{
+			return reinterpret_cast<int>( _native );
+		}
+	
 		property bool Unique
 		{
 			bool get()
@@ -423,12 +471,6 @@
 			}
 		}
 	
-		void SetNull()
-		{
-			(*_sharedPtr).setNull();
-			_native = 0;
-		}
-	
 		property bool IsNull
 		{
 			bool get()

Added: trunk/Mogre/Mogre/include/auto/MogreExternalTextureSource.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreExternalTextureSource.h	                        (rev 0)
+++ trunk/Mogre/Mogre/include/auto/MogreExternalTextureSource.h	2006-09-26 03:30:42 UTC (rev 39)
@@ -0,0 +1,135 @@
+/*  This file is produced by the C++/CLI AutoWrapper utility.
+        Copyright (c) 2006 by Argiris Kirtzidis  */
+
+#pragma once
+
+#include "OgreExternalTextureSource.h"
+#include "MogreStringInterface.h"
+#include "MogrePrerequisites.h"
+#include "MogreCommon.h"
+
+namespace Mogre
+{
+	public enum class eTexturePlayMode
+	{
+		TextureEffectPause = Ogre::TextureEffectPause,
+		TextureEffectPlay_ASAP = Ogre::TextureEffectPlay_ASAP,
+		TextureEffectPlay_Looping = Ogre::TextureEffectPlay_Looping
+	};
+	
+	//################################################################
+	//ExternalTextureSource
+	//################################################################
+	
+	public ref class ExternalTextureSource : public Wrapper, public IStringInterface
+	{
+		//Nested Types
+	
+		//Private Declarations
+	private protected:
+	
+		Ogre::StringInterface* _IStringInterface_native;
+	
+		//Internal Declarations
+	internal:
+		ExternalTextureSource( CLRObject* obj ) : Wrapper(obj)
+		{
+			_IStringInterface_native = static_cast<Ogre::StringInterface*>( static_cast<Ogre::ExternalTextureSource*>(_native) );
+		}
+	
+		virtual Ogre::StringInterface* _IStringInterface_GetNativePtr() = IStringInterface::_GetNativePtr
+		{
+			return _IStringInterface_native;
+		}
+	
+	
+		//Public Declarations
+	public:
+	
+	
+		property String^ DictionaryStringName
+		{
+		public:
+			String^ get();
+		}
+	
+		property int FPS
+		{
+		public:
+			int get();
+		}
+	
+		property String^ InputName
+		{
+		public:
+			String^ get();
+		public:
+			void set(String^ sIN);
+		}
+	
+		property Mogre::eTexturePlayMode PlayMode
+		{
+		public:
+			Mogre::eTexturePlayMode get();
+		public:
+			void set(Mogre::eTexturePlayMode eMode);
+		}
+	
+		property String^ PlugInStringName
+		{
+		public:
+			String^ get();
+		}
+	
+		void SetFPS( int iFPS );
+	
+		void SetTextureTecPassStateLevel( int t, int p, int s );
+	
+		void GetTextureTecPassStateLevel( [Out] int% t, [Out] int% p, [Out] int% s );
+	
+		void AddBaseParams( );
+	
+		bool Initialise( );
+	
+		void ShutDown( );
+	
+		void CreateDefinedTexture( String^ sMaterialName, String^ groupName );
+		void CreateDefinedTexture( String^ sMaterialName );
+	
+		void DestroyAdvancedTexture( String^ sTextureName, String^ groupName );
+		void DestroyAdvancedTexture( String^ sTextureName );
+	
+		//------------------------------------------------------------
+		// Implementation for IStringInterface
+		//------------------------------------------------------------
+	
+		property Mogre::ParamDictionary_NativePtr ParamDictionary
+		{
+		public:
+			Mogre::ParamDictionary_NativePtr get();
+		}
+	
+	public:
+		Mogre::Const_ParameterList^ GetParameters( );
+	
+	public:
+		virtual bool SetParameter( String^ name, String^ value );
+	
+	public:
+		virtual void SetParameterList( Mogre::Const_NameValuePairList^ paramList );
+	
+	public:
+		virtual String^ GetParameter( String^ name );
+	
+	public:
+		virtual void CopyParametersTo( Mogre::IStringInterface^ dest );
+	
+		DEFINE_MANAGED_NATIVE_CONVERSIONS( ExternalTextureSource )
+	
+		//Protected Declarations
+	protected public:
+	
+	};
+	
+
+}

Added: trunk/Mogre/Mogre/include/auto/MogreExternalTextureSourceManager.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreExternalTextureSourceManager.h	                        (rev 0)
+++ trunk/Mogre/Mogre/include/auto/MogreExternalTextureSourceManager.h	2006-09-26 03:30:42 UTC (rev 39)
@@ -0,0 +1,70 @@
+/*  This file is produced by the C++/CLI AutoWrapper utility.
+        Copyright (c) 2006 by Argiris Kirtzidis  */
+
+#pragma once
+
+#include "OgreExternalTextureSourceManager.h"
+#include "MogrePrerequisites.h"
+
+namespace Mogre
+{
+	//################################################################
+	//ExternalTextureSourceManager
+	//################################################################
+	
+	public ref class ExternalTextureSourceManager
+	{
+		//Nested Types
+	
+		//Private Declarations
+	private protected:
+	
+		static ExternalTextureSourceManager^ _singleton;
+		Ogre::ExternalTextureSourceManager* _native;
+	
+		//Internal Declarations
+	internal:
+		ExternalTextureSourceManager( Ogre::ExternalTextureSourceManager* obj ) : _native(obj)
+		{
+		}
+	
+	
+		//Public Declarations
+	public:
+	
+		static property ExternalTextureSourceManager^ Singleton
+		{
+			ExternalTextureSourceManager^ get()
+			{
+				if (_singleton == CLR_NULL)
+				{
+					Ogre::ExternalTextureSourceManager* ptr = Ogre::ExternalTextureSourceManager::getSingletonPtr();
+					if ( ptr ) _singleton = gcnew ExternalTextureSourceManager( ptr );
+				}
+				return _singleton;
+			}
+		}
+	
+		property Mogre::ExternalTextureSource^ CurrentPlugIn
+		{
+		public:
+			Mogre::ExternalTextureSource^ get();
+		}
+	
+		void SetCurrentPlugIn( String^ sTexturePlugInType );
+	
+		void DestroyAdvancedTexture( String^ sTextureName, String^ groupName );
+		void DestroyAdvancedTexture( String^ sTextureName );
+	
+		Mogre::ExternalTextureSource^ GetExternalTextureSource( String^ sTexturePlugInType );
+	
+		void SetExternalTextureSource( String^ sTexturePlugInType, Mogre::ExternalTextureSource^ pTextureSystem );
+	
+	
+		//Protected Declarations
+	protected public:
+	
+	};
+	
+
+}

Modified: trunk/Mogre/Mogre/include/auto/MogreFont.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreFont.h	2006-09-23 23:14:40 UTC (rev 38)
+++ trunk/Mogre/Mogre/include/auto/MogreFont.h	2006-09-26 03:30:42 UTC (rev 39)
@@ -142,21 +142,36 @@
 			return gcnew FontPtr( (Ogre::FontPtr) *(ptr->_sharedPtr) );
 		}
 	
-		FontPtr() : Font( (Ogre::Font*) 0 )
-		{
-			_sharedPtr = new Ogre::FontPtr();
-		}
-	
 		FontPtr(Font^ clrObject) : Font( clrObject->_native )
 		{
 			_sharedPtr = new Ogre::FontPtr( static_cast<Ogre::Font*>(clrObject->_native) );
 		}
 	
-		void Bind(Font^ clrObject)
+		virtual bool Equals(Object^ obj) override
 		{
-			(*_sharedPtr).bind( static_cast<Ogre::Font*>(clrObject->_native) );
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
+	
+			FontPtr^ clr = dynamic_cast<FontPtr^>(obj);
+			if (clr == CLR_NULL)
+			{
+				return false;
+			}
+	
+			return (_native == clr->_native);
 		}
+		bool Equals(FontPtr^ obj)
+		{
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
 	
+			return (_native == obj->_native);
+		}
+	
 		static bool operator == (FontPtr^ val1, FontPtr^ val2)
 		{
 			if ((Object^)val1 == (Object^)val2) return true;
@@ -169,6 +184,11 @@
 			return !(val1 == val2);
 		}
 	
+		virtual int GetHashCode() override
+		{
+			return reinterpret_cast<int>( _native );
+		}
+	
 		property bool Unique
 		{
 			bool get()
@@ -185,12 +205,6 @@
 			}
 		}
 	
-		void SetNull()
-		{
-			(*_sharedPtr).setNull();
-			_native = 0;
-		}
-	
 		property bool IsNull
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreFrustum.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreFrustum.h	2006-09-23 23:14:40 UTC (rev 38)
+++ trunk/Mogre/Mogre/include/auto/MogreFrustum.h	2006-09-26 03:30:42 UTC (rev 39)
@@ -13,6 +13,12 @@
 
 namespace Mogre
 {
+	class Frustum_ProtectedTypesProxy : public Ogre::Frustum
+	{
+	public:
+		friend ref class Mogre::Frustum;
+	};
+	
 	public enum class FrustumPlane
 	{
 		FRUSTUM_PLANE_NEAR = Ogre::FRUSTUM_PLANE_NEAR,
@@ -40,7 +46,7 @@
 		//Private Declarations
 	private protected:
 		//Cached fields
-		Mogre::Subclassing::Renderable::CustomParameterMap^ _mCustomParameters;
+		Mogre::Renderable::CustomParameterMap^ _mCustomParameters;
 	
 		Ogre::Renderable* _IRenderable_native;
 	
@@ -334,10 +340,10 @@
 	public:
 		virtual void _updateCustomGpuParameter( Mogre::GpuProgramParameters::AutoConstantEntry_NativePtr constantEntry, Mogre::GpuProgramParameters^ params );
 	
-		property Mogre::Subclassing::Renderable::CustomParameterMap^ mCustomParameters
+		property Mogre::Renderable::CustomParameterMap^ mCustomParameters
 		{
 		protected public:
-			Mogre::Subclassing::Renderable::CustomParameterMap^ get();
+			Mogre::Renderable::CustomParameterMap^ get();
 		}
 	
 		property bool mPolygonModeOverrideable

Modified: trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h	2006-09-23 23:14:40 UTC (rev 38)
+++ trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h	2006-09-26 03:30:42 UTC (rev 39)
@@ -958,21 +958,36 @@
 			return gcnew GpuProgramPtr( (Ogre::GpuProgramPtr) *(ptr->_sharedPtr) );
 		}
 	
-		GpuProgramPtr() : GpuProgram( (Ogre::GpuProgram*) 0 )
-		{
-			_sharedPtr = new Ogre::GpuProgramPtr();
-		}
-	
 		GpuProgramPtr(GpuProgram^ clrObject) : GpuProgram( clrObject->_native )
 		{
 			_sharedPtr = new Ogre::GpuProgramPtr( static_cast<Ogre::GpuProgram*>(clrObject->_native) );
 		}
 	
-		void Bind(GpuProgram^ clrObject)
+		virtual bool Equals(Object^ obj) override
 		{
-			(*_sharedPtr).bind( static_cast<Ogre::GpuProgram*>(clrObject->_native) );
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
+	
+			GpuProgramPtr^ clr = dynamic_cast<GpuProgramPtr^>(obj);
+			if (clr == CLR_NULL)
+			{
+				return false;
+			}
+	
+			return (_native == clr->_native);
 		}
+		bool Equals(GpuProgramPtr^ obj)
+		{
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
 	
+			return (_native == obj->_native);
+		}
+	
 		static bool operator == (GpuProgramPtr^ val1, GpuProgramPtr^ val2)
 		{
 			if ((Object^)val1 == (Object^)val2) return true;
@@ -985,6 +1000,11 @@
 			return !(val1 == val2);
 		}
 	
+		virtual int GetHashCode() override
+		{
+			return reinterpret_cast<int>( _native );
+		}
+	
 		property bool Unique
 		{
 			bool get()
@@ -1001,12 +1021,6 @@
 			}
 		}
 	
-		void SetNull()
-		{
-			(*_sharedPtr).setNull();
-			_native = 0;
-		}
-	
 		property bool IsNull
 		{
 			bool get()
@@ -1052,21 +1066,36 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( GpuProgramParametersSharedPtr )
 	
-		GpuProgramParametersSharedPtr() : GpuProgramParameters( (Ogre::GpuProgramParameters*) 0 )
-		{
-			_sharedPtr = new Ogre::GpuProgramParametersSharedPtr();
-		}
-	
 		GpuProgramParametersSharedPtr(GpuProgramParameters^ clrObject) : GpuProgramParameters( clrObject->_native )
 		{
 			_sharedPtr = new Ogre::GpuProgramParametersSharedPtr( static_cast<Ogre::GpuProgramParameters*>(clrObject->_native) );
 		}
 	
-		void Bind(GpuProgramParameters^ clrObject)
+		virtual bool Equals(Object^ obj) override
 		{
-			(*_sharedPtr).bind( static_cast<Ogre::GpuProgramParameters*>(clrObject->_native) );
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
+	
+			GpuProgramParametersSharedPtr^ clr = dynamic_cast<GpuProgramParametersSharedPtr^>(obj);
+			if (clr == CLR_NULL)
+			{
+				return false;
+			}
+	
+			return (_native == clr->_native);
 		}
+		bool Equals(GpuProgramParametersSharedPtr^ obj)
+		{
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
 	
+			return (_native == obj->_native);
+		}
+	
 		static bool operator == (GpuProgramParametersSharedPtr^ val1, GpuProgramParametersSharedPtr^ val2)
 		{
 			if ((Object^)val1 == (Object^)val2) return true;
@@ -1079,6 +1108,11 @@
 			return !(val1 == val2);
 		}
 	
+		virtual int GetHashCode() override
+		{
+			return reinterpret_cast<int>( _native );
+		}
+	
 		property bool Unique
 		{
 			bool get()
@@ -1095,12 +1129,6 @@
 			}
 		}
 	
-		void SetNull()
-		{
-			(*_sharedPtr).setNull();
-			_native = 0;
-		}
-	
 		property bool IsNull
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreHardwareIndexBuffer.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreHardwareIndexBuffer.h	2006-09-23 23:14:40 UTC (rev 38)
+++ trunk/Mogre/Mogre/include/auto/MogreHardwareIndexBuffer.h	2006-09-26 03:30:42 UTC (rev 39)
@@ -89,21 +89,36 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( HardwareIndexBufferSharedPtr )
 	
-		HardwareIndexBufferSharedPtr() : HardwareIndexBuffer( (Ogre::HardwareIndexBuffer*) 0 )
-		{
-			_sharedPtr = new Ogre::HardwareIndexBufferSharedPtr();
-		}
-	
 		HardwareIndexBufferSharedPtr(HardwareIndexBuffer^ clrObject) : HardwareIndexBuffer( clrObject->_native )
 		{
 			_sharedPtr = new Ogre::HardwareIndexBufferSharedPtr( static_cast<Ogre::HardwareIndexBuffer*>(clrObject->_native) );
 		}
 	
-		void Bind(HardwareIndexBuffer^ clrObject)
+		virtual bool Equals(Object^ obj) override
 		{
-			(*_sharedPtr).bind( static_cast<Ogre::HardwareIndexBuffer*>(clrObject->_native) );
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
+	
+			HardwareIndexBufferSharedPtr^ clr = dynamic_cast<HardwareIndexBufferSharedPtr^>(obj);
+			if (clr == CLR_NULL)
+			{
+				return false;
+			}
+	
+			return (_native == clr->_native);
 		}
+		bool Equals(HardwareIndexBufferSharedPtr^ obj)
+		{
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
 	
+			return (_native == obj->_native);
+		}
+	
 		static bool operator == (HardwareIndexBufferSharedPtr^ val1, HardwareIndexBufferSharedPtr^ val2)
 		{
 			if ((Object^)val1 == (Object^)val2) return true;
@@ -116,6 +131,11 @@
 			return !(val1 == val2);
 		}
 	
+		virtual int GetHashCode() override
+		{
+			return reinterpret_cast<int>( _native );
+		}
+	
 		property bool Unique
 		{
 			bool get()
@@ -132,12 +152,6 @@
 			}
 		}
 	
-		void SetNull()
-		{
-			(*_sharedPtr).setNull();
-			_native = 0;
-		}
-	
 		property bool IsNull
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreHardwarePixelBuffer.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreHardwarePixelBuffer.h	2006-09-23 23:14:40 UTC (rev 38)
+++ trunk/Mogre/Mogre/include/auto/MogreHardwarePixelBuffer.h	2006-09-26 03:30:42 UTC (rev 39)
@@ -102,21 +102,36 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( HardwarePixelBufferSharedPtr )
 	
-		HardwarePixelBufferSharedPtr() : HardwarePixelBuffer( (Ogre::HardwarePixelBuffer*) 0 )
-		{
-			_sharedPtr = new Ogre::HardwarePixelBufferSharedPtr();
-		}
-	
 		HardwarePixelBufferSharedPtr(HardwarePixelBuffer^ clrObject) : HardwarePixelBuffer( clrObject->_native )
 		{
 			_sharedPtr = new Ogre::HardwarePixelBufferSharedPtr( static_cast<Ogre::HardwarePixelBuffer*>(clrObject->_native) );
 		}
 	
-		void Bind(HardwarePixelBuffer^ clrObject)
+		virtual bool Equals(Object^ obj) override
 		{
-			(*_sharedPtr).bind( static_cast<Ogre::HardwarePixelBuffer*>(clrObject->_native) );
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
+	
+			HardwarePixelBufferSharedPtr^ clr = dynamic_cast<HardwarePixelBufferSharedPtr^>(obj);
+			if (clr == CLR_NULL)
+			{
+				return false;
+			}
+	
+			return (_native == clr->_native);
 		}
+		bool Equals(HardwarePixelBufferSharedPtr^ obj)
+		{
+			if (obj == CLR_NULL)
+			{
+				return false;
+			}
 	
+			return (_native == obj->_native);
+		}
+	
 		static bool operator == (HardwarePixelBufferSharedPtr^ val1, HardwarePixelBufferSharedPtr^ val2)
 		{
 			if ((Object^)val1 == (Object^)val2) return true;
@@ -129,6 +144,11 @@
 			return !(val1 == val2);
 		}
 	
+		virtual int GetHashCode() override
+		{
+			return reinterpret_cast<int>( _native );
+		}
+	
 		property bool Unique
 		{
 			bool get()
@@ -145,12 +165,6 @@
 			}
 		}
 	
-		void SetNull()
-		{
-			(*_sharedPtr).setNull();
-			_native = 0;
-		}
-	
 		property bool IsNull
 		{
 			bool get()

Modified: trunk/Mogre/Mogre/include/auto/MogreHardwareVertexBuffer.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MogreHardwareVertexBuffer.h	2006-09-23 23:14:40 UTC (rev 38)
+++ trunk/Mogre/Mogre/include/auto/MogreHardwareVertexBuffer.h	2006-09-26 03:30:42 UTC (rev 39)
@@ -106,21 +106,36 @@
 	public:
 		DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_SHAREDPTR( HardwareVertexBufferSharedPtr )
 	
-		HardwareVertexBufferSharedPtr() : HardwareVertexBuffer( (Ogre::HardwareVertexBuffer*) 0 )
-		{
-			_sharedPtr = new Ogre::HardwareVertexBufferSharedPtr();
-		}
-	
 		Hard...
 
[truncated message content]