ruby-ogre 0.0.3-x86-linux → 0.0.4-x86-linux

data/deps/include/OGRE/OgreAny.h

@@ -214,7 +214,29 @@ namespace Ogre
 			}
 		}
 
-		
+		template <typename ValueType>
+		ValueType get(void) const
+		{
+			if (!mContent) 
+			{
+				OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS,
+					"Bad cast from uninitialised Any", 
+					"Any::operator()");
+			}
+			else if(getType() == typeid(ValueType))
+			{
+             	return static_cast<Any::holder<ValueType> *>(mContent)->held;
+			}
+			else
+			{
+				StringUtil::StrStreamType str;
+				str << "Bad cast from type '" << getType().name() << "' "
+					<< "to '" << typeid(ValueType).name() << "'";
+				OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS,
+					 str.str(), 
+					"Any::operator()");
+			}
+		}
 
     };
 

data/deps/include/OGRE/OgreBillboardChain.h

@@ -259,7 +259,6 @@ namespace Ogre {
 
 
 		// Overridden members follow
-		void _notifyCurrentCamera(Camera* cam);
 		Real getSquaredViewDepth(const Camera* cam) const;
 		Real getBoundingRadius(void) const;
 		const AxisAlignedBox& getBoundingBox(void) const;
@@ -267,6 +266,7 @@ namespace Ogre {
 		const String& getMovableType(void) const;
 		void _updateRenderQueue(RenderQueue *);
 		void getRenderOperation(RenderOperation &);
+		virtual bool preRender(SceneManager* sm, RenderSystem* rsys);
 		void getWorldTransforms(Matrix4 *) const;
 		const LightList& getLights(void) const;
 		/// @copydoc MovableObject::visitRenderables
@@ -299,6 +299,8 @@ namespace Ogre {
 		mutable bool mBoundsDirty;
 		/// Is the index buffer dirty?
 		bool mIndexContentDirty;
+        /// Is the vertex buffer dirty?
+        bool mVertexContentDirty;
 		/// AABB
 		mutable AxisAlignedBox mAABB;
 		/// Bounding radius
@@ -310,6 +312,8 @@ namespace Ogre {
 		TexCoordDirection mTexCoordDir;
 		/// Other texture coord range
 		Real mOtherTexCoordRange[2];
+        /// Camera last used to build the vertex buffer
+        Camera *mVertexCameraUsed;
 		/// When true, the billboards always face the camera
 		bool mFaceCamera;
 		/// Used when mFaceCamera == false; determines the billboard's "normal". i.e.

data/deps/include/OGRE/OgreBillboardParticleRenderer.h

@@ -221,6 +221,8 @@ namespace Ogre {
         void _notifyDefaultDimensions(Real width, Real height);
 		/// @copydoc ParticleSystemRenderer::setRenderQueueGroup
 		void setRenderQueueGroup(uint8 queueID);
+		/// @copydoc MovableObject::setRenderQueueGroupAndPriority
+		void setRenderQueueGroupAndPriority(uint8 queueID, ushort priority);
 		/// @copydoc ParticleSystemRenderer::setKeepParticlesInLocalSpace
 		void setKeepParticlesInLocalSpace(bool keepLocal);
         /// @copydoc ParticleSystemRenderer::_getSortMode

data/deps/include/OGRE/OgreConfigDialog.h

@@ -48,8 +48,6 @@ THE SOFTWARE.
 # include "OSX/OgreConfigDialogImp.h"
 #elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
 # include "iOS/OgreConfigDialogImp.h"
-#elif OGRE_PLATFORM == OGRE_PLATFORM_SYMBIAN
-# include "Symbian/OgreConfigDialogImp.h"
 #elif OGRE_PLATFORM == OGRE_PLATFORM_ANDROID
 # include "Android/OgreConfigDialogImp.h"
 #endif

data/deps/include/OGRE/OgreDynLib.h

@@ -39,7 +39,7 @@ THE SOFTWARE.
 struct HINSTANCE__;
 typedef struct HINSTANCE__* hInstance;
 
-#elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX || OGRE_PLATFORM == OGRE_PLATFORM_ANDROID
+#elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX || OGRE_PLATFORM == OGRE_PLATFORM_ANDROID || OGRE_PLATFORM == OGRE_PLATFORM_NACL
 #    define DYNLIB_HANDLE void*
 #    define DYNLIB_LOAD( a ) dlopen( a, RTLD_LAZY | RTLD_GLOBAL)
 #    define DYNLIB_GETSYM( a, b ) dlsym( a, b )
@@ -51,12 +51,6 @@ typedef struct HINSTANCE__* hInstance;
 #    define DYNLIB_GETSYM( a, b ) dlsym( a, b )
 #    define DYNLIB_UNLOAD( a ) dlclose( a )
 
-#elif OGRE_PLATFORM == OGRE_PLATFORM_SYMBIAN || OGRE_PLATFORM == OGRE_PLATFORM_NACL
-#    define DYNLIB_HANDLE void*
-#    define DYNLIB_LOAD( a ) 0
-#    define DYNLIB_GETSYM( a, b ) 0
-#    define DYNLIB_UNLOAD( a ) 0
-
 #endif
 
 namespace Ogre {

data/deps/include/OGRE/OgreErrorDialog.h

@@ -48,8 +48,6 @@ THE SOFTWARE.
 # include "OSX/OgreErrorDialogImp.h"
 #elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
 # include "iOS/OgreErrorDialogImp.h"
-#elif OGRE_PLATFORM == OGRE_PLATFORM_SYMBIAN
-# include "Symbian/OgreErrorDialogImp.h"
 #elif OGRE_PLATFORM == OGRE_PLATFORM_ANDROID
 # include "Android/OgreErrorDialogImp.h"
 #endif

data/deps/include/OGRE/OgreHeaderSuffix.h

@@ -23,8 +23,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE
 -------------------------------------------------------------------------*/
-#ifndef __OgreHeaderPrefix_H__
-#define __OgreHeaderPrefix_H__
+#ifndef __OgreHeaderSuffix_H__
+#define __OgreHeaderSuffix_H__
 
 #include "OgrePrerequisites.h"
 
@@ -39,6 +39,6 @@ THE SOFTWARE
 
 #endif
 // allow inclusion of prefix again now (this is scoped)
-#undef __OgreHeaderPrefix_H__
+#undef __OgreHeaderSuffix_H__
 
 

data/deps/include/OGRE/OgreInstanceBatch.h

@@ -338,6 +338,10 @@ namespace Ogre
 
 		virtual void _updateRenderQueue(RenderQueue* queue);
 		void visitRenderables( Renderable::Visitor* visitor, bool debugRenderables = false );
+
+        // resolve ambiguity of get/setUserAny due to inheriting from Renderable and MovableObject
+        using Renderable::getUserAny;
+        using Renderable::setUserAny;
 	};
 }
 

data/deps/include/OGRE/OgreInstanceManager.h

@@ -144,6 +144,11 @@ namespace Ogre
 		*/
 		void applySettingToBatches( BatchSettingId id, bool value, const InstanceBatchVec &container );
 
+		/** Called when we you use a mesh which has shared vertices, the function creates separate
+			vertex/index buffers and also recreates the bone assignments.
+		*/
+		void unshareVertices(const Ogre::MeshPtr &mesh);
+
 	public:
 		InstanceManager( const String &customName, SceneManager *sceneManager,
 						 const String &meshName, const String &groupName,

data/deps/include/OGRE/OgreIteratorRange.h

@@ -29,9 +29,20 @@ THE SOFTWARE.
 #define __Ogre_Iterator_Range_H__
 
 
-//#define OGRE_USE_BOOST 1 - picked up by CMake
 #if OGRE_USE_BOOST
-#include <boost/range.hpp>
+#   if OGRE_COMPILER == OGRE_COMPILER_CLANG || OGRE_COMPILER == OGRE_COMPILER_GCC
+#       pragma GCC diagnostic push
+#       pragma GCC diagnostic ignored "-Wshadow"
+#       pragma GCC diagnostic ignored "-Wpadded"
+#       pragma GCC diagnostic ignored "-Wweak-vtables"
+#       pragma GCC diagnostic ignored "-Wall"
+#   endif
+
+#   include <boost/range.hpp>
+
+#   if OGRE_COMPILER == OGRE_COMPILER_CLANG || OGRE_COMPILER == OGRE_COMPILER_GCC
+#       pragma GCC diagnostic pop
+#   endif
 #endif
 
 namespace Ogre {

data/deps/include/OGRE/OgreParticleSystem.h

@@ -548,6 +548,8 @@ namespace Ogre {
 
 		/** @copydoc MovableObject::setRenderQueueGroup */
 		void setRenderQueueGroup(uint8 queueID);
+		/** @copydoc MovableObject::setRenderQueueGroupAndPriority */
+		void setRenderQueueGroupAndPriority(uint8 queueID, ushort priority);
 
 		/** Set whether or not particles are sorted according to the camera.
 		@remarks

data/deps/include/OGRE/OgreParticleSystemRenderer.h

@@ -108,6 +108,10 @@ namespace Ogre {
 			output.
 		*/
 		virtual void setRenderQueueGroup(uint8 queueID) = 0;
+		/** Sets which render queue group and priority this renderer should target with it's
+			output.
+		*/
+		virtual void setRenderQueueGroupAndPriority(uint8 queueID, ushort priority) = 0;
 
 		/** Setting carried over from ParticleSystem.
 		*/

data/deps/include/OGRE/OgrePlatform.h

@@ -36,10 +36,9 @@ namespace Ogre {
 #define OGRE_PLATFORM_WIN32 1
 #define OGRE_PLATFORM_LINUX 2
 #define OGRE_PLATFORM_APPLE 3
-#define OGRE_PLATFORM_SYMBIAN 4
-#define OGRE_PLATFORM_APPLE_IOS 5
-#define OGRE_PLATFORM_ANDROID 6
-#define OGRE_PLATFORM_NACL 7
+#define OGRE_PLATFORM_APPLE_IOS 4
+#define OGRE_PLATFORM_ANDROID 5
+#define OGRE_PLATFORM_NACL 6
 
 #define OGRE_COMPILER_MSVC 1
 #define OGRE_COMPILER_GNUC 2
@@ -100,9 +99,7 @@ namespace Ogre {
 
 /* Finds the current platform */
 
-#if defined( __SYMBIAN32__ ) 
-#   define OGRE_PLATFORM OGRE_PLATFORM_SYMBIAN
-#elif defined( __WIN32__ ) || defined( _WIN32 )
+#if defined( __WIN32__ ) || defined( _WIN32 )
 #   define OGRE_PLATFORM OGRE_PLATFORM_WIN32
 #elif defined( __APPLE_CC__)
     // Device                                                     Simulator
@@ -201,26 +198,6 @@ namespace Ogre {
 
 #endif // OGRE_PLATFORM == OGRE_PLATFORM_WIN32
 
-//----------------------------------------------------------------------------
-// Symbian Settings
-#if OGRE_PLATFORM == OGRE_PLATFORM_SYMBIAN
-#   define _OgreExport 
-#	define OGRE_UNICODE_SUPPORT 1
-#   define OGRE_DEBUG_MODE 0
-#   define _OgrePrivate
-#	  define CLOCKS_PER_SEC  1000
-//  pragma def were found here: http://www.inf.pucrs.br/~eduardob/disciplinas/SistEmbarcados/Mobile/Nokia/Tools/Carbide_vs/WINSCW/Help/PDF/C_Compilers_Reference_3.2.pdf
-#	  pragma warn_unusedarg off
-#	  pragma warn_emptydecl off
-#	  pragma warn_possunwant off
-// A quick define to overcome different names for the same function
-#   define stricmp strcasecmp
-#   ifdef DEBUG
-#       define OGRE_DEBUG_MODE 1
-#   else
-#       define OGRE_DEBUG_MODE 0
-#   endif
-#endif
 //----------------------------------------------------------------------------
 // Android Settings
 /*
@@ -244,7 +221,7 @@ namespace Ogre {
 #endif
 */
 //----------------------------------------------------------------------------
-// Linux/Apple/iOs/Android/Symbian/NaCl Settings
+// Linux/Apple/iOs/Android/NaCl Settings
 #if OGRE_PLATFORM == OGRE_PLATFORM_LINUX || OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS || \
     OGRE_PLATFORM == OGRE_PLATFORM_ANDROID || OGRE_PLATFORM == OGRE_PLATFORM_NACL
 

data/deps/include/OGRE/OgrePrerequisites.h

@@ -55,7 +55,7 @@ namespace Ogre {
     // Define ogre version
     #define OGRE_VERSION_MAJOR 1
     #define OGRE_VERSION_MINOR 8
-    #define OGRE_VERSION_PATCH 0
+    #define OGRE_VERSION_PATCH 1
 	#define OGRE_VERSION_SUFFIX ""
     #define OGRE_VERSION_NAME "Byatis"
 

data/deps/include/OGRE/OgreProfiler.h

@@ -53,6 +53,9 @@ Ogre-dependent is in the visualization/logging routines and the use of the Timer
 #	define OgreProfileGroup( a, g ) Ogre::Profile _OgreProfileInstance( (a), (g) )
 #	define OgreProfileBeginGroup( a, g ) Ogre::Profiler::getSingleton().beginProfile( (a), (g) )
 #	define OgreProfileEndGroup( a, g ) Ogre::Profiler::getSingleton().endProfile( (a), (g) )
+#	define OgreProfileBeginGPUEvent( g ) Ogre::Profiler::getSingleton().beginGPUEvent(g)
+#	define OgreProfileEndGPUEvent( g ) Ogre::Profiler::getSingleton().endGPUEvent(g)
+#	define OgreProfileMarkGPUEvent( e ) Ogre::Profiler::getSingleton().markGPUEvent(e)
 #else
 #   define OgreProfile( a )
 #   define OgreProfileBegin( a )
@@ -60,6 +63,9 @@ Ogre-dependent is in the visualization/logging routines and the use of the Timer
 #	define OgreProfileGroup( a, g ) 
 #	define OgreProfileBeginGroup( a, g ) 
 #	define OgreProfileEndGroup( a, g ) 
+#	define OgreProfileBeginGPUEvent( e )
+#	define OgreProfileEndGPUEvent( e )
+#	define OgreProfileMarkGPUEvent( e )
 #endif
 
 namespace Ogre {
@@ -96,7 +102,9 @@ namespace Ogre {
             outside of a scope (i.e. the main game loop).
         @author Amit Mathew (amitmathew (at) yahoo (dot) com)
     */
-	class _OgreExport Profile : public ProfilerAlloc {
+	class _OgreExport Profile : 
+		public ProfilerAlloc 
+	{
 
         public:
             Profile(const String& profileName, uint32 groupID = (uint32)OGREPROF_USER_DEFAULT);
@@ -123,8 +131,10 @@ namespace Ogre {
         @todo resolve artificial cap on number of profiles displayed
         @todo fix display ordering of profiles not called every frame
     */
-    class _OgreExport Profiler : public Singleton<Profiler>, public ProfilerAlloc {
-
+    class _OgreExport Profiler : 
+		public Singleton<Profiler>,
+		public ProfilerAlloc
+	{
         public:
             Profiler();
             ~Profiler();
@@ -166,6 +176,21 @@ namespace Ogre {
             */
             void endProfile(const String& profileName, uint32 groupID = (uint32)OGREPROF_USER_DEFAULT);
 
+            /** Mark the beginning of a GPU event group
+             @remarks Can be safely called in the middle of the profile.
+             */
+            void beginGPUEvent(const String& event);
+
+            /** Mark the end of a GPU event group
+             @remarks Can be safely called in the middle of the profile.
+             */
+            void endGPUEvent(const String& event);
+
+            /** Mark a specific, ungrouped, GPU event
+             @remarks Can be safely called in the middle of the profile.
+             */
+            void markGPUEvent(const String& event);
+
             /** Sets whether this profiler is enabled. Only takes effect after the
                 the frame has ended.
                 @remarks When this is called the first time with the parameter true,
@@ -177,14 +202,12 @@ namespace Ogre {
             bool getEnabled() const;
 
             /** Enables a previously disabled profile 
-            @remarks Only enables the profile if this function is not 
-            called during the profile it is trying to enable.
+            @remarks Can be safely called in the middle of the profile.
             */
             void enableProfile(const String& profileName);
 
             /** Disables a profile
-            @remarks Only disables the profile if this function is not called during
-            the profile it is trying to disable.
+            @remarks Can be safely called in the middle of the profile.
             */
             void disableProfile(const String& profileName);
 
@@ -291,16 +314,26 @@ namespace Ogre {
             */
             static Profiler* getSingletonPtr(void);
 
+			
+
         protected:
 
             /** Initializes the profiler's GUI elements */
             void initialize();
 
-            /** Prints the profiling results of each frame */
-            void displayResults();
+			class ProfileInstance;
+			friend class ProfileInstance;
+            typedef list<OverlayElement*>::type ProfileBarList;
 
-            /** Processes the profiler data after each frame */
-            void processFrameStats();
+			void displayResults(void);
+            /** Prints the profiling results of each frame 
+            @remarks Recursive, for all the little children. */
+            void displayResults(ProfileInstance* instance, ProfileBarList::iterator& bIter, Real& maxTimeMillisecs, Real& newGuiHeight, int& profileCount);
+
+			/** Processes frame stats for all of the mRoot's children */
+			void processFrameStats(void);
+            /** Processes specific ProfileInstance and it's children recursively.*/
+            void processFrameStats(ProfileInstance* instance, Real& maxFrameTime);
 
             /** Handles a change of the profiler's enabled state*/
             void changeEnableState();
@@ -316,32 +349,11 @@ namespace Ogre {
             OverlayElement* createPanel(const String& name, Real width, Real height, Real top, Real left, 
                                     const String& materialName, bool show = true);
 
-            /// Represents an individual profile call
-            struct ProfileInstance {
-
-                /// The name of the profile
-                String		name;
-
-                /// The name of the parent, empty string if root
-                String		parent;
-
-                /// The time this profile was started
-                ulong		currTime;
-
-                /// Represents the total time of all child profiles to subtract
-                /// from this profile
-                ulong		accum;
-
-                /// The hierarchical level of this profile, 0 being the root profile
-                uint		hierarchicalLvl;
-            };
 
             /// Represents the total timing information of a profile
             /// since profiles can be called more than once each frame
-            struct ProfileFrame {
-				
-                /// The name of the profile
-                String	name;
+            struct ProfileFrame 
+			{
 
                 /// The total time this profile has taken this frame
                 ulong	frameTime;
@@ -355,11 +367,8 @@ namespace Ogre {
             };
 			
             /// Represents a history of each profile during the duration of the app
-            struct ProfileHistory {
-
-                /// The name of the profile
-                String	name;
-
+            struct ProfileHistory 
+			{
                 /// The current percentage of frame time this profile has taken
                 Real	currentTimePercent; 
 				/// The current frame time this profile has taken in milliseconds
@@ -392,27 +401,65 @@ namespace Ogre {
 
 			};
 
-			
-            typedef list<ProfileInstance>::type ProfileStack;
-            typedef list<ProfileFrame>::type ProfileFrameList;
-            typedef list<ProfileHistory>::type ProfileHistoryList;
-            typedef map<String, ProfileHistoryList::iterator>::type ProfileHistoryMap;
-            typedef map<String, bool>::type DisabledProfileMap;
+			/// Represents an individual profile call
+			class ProfileInstance :
+				public ProfilerAlloc
+			{
+				friend class Profiler;
+			public:
+				ProfileInstance(void);
+				virtual ~ProfileInstance(void);
 
-            typedef list<OverlayElement*>::type ProfileBarList;
+				typedef Ogre::map<String,ProfileInstance*>::type ProfileChildren;
+
+				void logResults();
+				void reset();
+
+				inline bool watchForMax(void) { return history.currentTimePercent == history.maxTimePercent; }
+				inline bool watchForMin(void) { return history.currentTimePercent == history.minTimePercent; }
+				inline bool watchForLimit(Real limit, bool greaterThan = true)
+				{
+					if (greaterThan)
+						return history.currentTimePercent > limit;
+					else
+						return history.currentTimePercent < limit;
+				}
 
-            /// A stack for each individual profile per frame
-            ProfileStack mProfiles;
+				bool watchForMax(const String& profileName);
+				bool watchForMin(const String& profileName);
+				bool watchForLimit(const String& profileName, Real limit, bool greaterThan = true);
+                                
+				/// The name of the profile
+				String          name;
 
-            /// Accumulates the results of each profile per frame (since a profile can be called
-            /// more than once a frame)
-            ProfileFrameList mProfileFrame;
+				/// The name of the parent, null if root
+				ProfileInstance* parent;
 
-            /// Keeps track of the statistics of each profile
-            ProfileHistoryList mProfileHistory;
+				ProfileChildren children;
 
-            /// We use this for quick look-ups of profiles in the history list
-            ProfileHistoryMap mProfileHistoryMap;
+				ProfileFrame frame;
+				ulong frameNumber;
+
+				ProfileHistory history;
+
+				/// The time this profile was started
+				ulong           currTime;
+
+				/// Represents the total time of all child profiles to subtract
+				/// from this profile
+				ulong           accum;
+
+				/// The hierarchical level of this profile, 0 being the root profile
+				uint            hierarchicalLvl;
+			};
+
+			// lol. Uses typedef; put's original container type in name.
+            typedef set<String>::type DisabledProfileMap;
+			typedef ProfileInstance::ProfileChildren ProfileChildren;
+
+			ProfileInstance* mCurrent;
+			ProfileInstance* mLast;
+			ProfileInstance mRoot;
 
             /// Holds the names of disabled profiles
             DisabledProfileMap mDisabledProfiles;
@@ -475,10 +522,6 @@ namespace Ogre {
             /// Whether this profiler is enabled
             bool mEnabled;
 
-            /// Keeps track of whether this profiler has
-            /// received a request to be enabled/disabled
-            bool mEnableStateChangePending;
-
             /// Keeps track of the new enabled/disabled state that the user has requested
             /// which will be applied after the frame ends
             bool mNewEnableState;

data/deps/include/OGRE/OgreProgressiveMesh.h

@@ -60,7 +60,7 @@ namespace Ogre {
 		BitArray(int bits_count)	: bits_ptr(NULL) { resize(bits_count); }
 		BitArray& operator=(const BitArray& ba)	{ bits = ba.bits; bits_ptr = bits.size() > 0 ? &bits.front() : NULL; return *this; }
 		
-		bool getBit(size_t i) const	{ return bits_ptr[i >> 3] & bit_mask[i & 7]; }
+		bool getBit(size_t i) const	{ return (bits_ptr[i >> 3] & bit_mask[i & 7]) != 0; }
 		void setBit(size_t i)		{ bits_ptr[i >> 3] |= bit_mask[i & 7]; }
 		void clearBit(size_t i)		{ bits_ptr[i >> 3] &= ~bit_mask[i & 7]; }
 		void clearAllBits()			{ memset(bits_ptr, 0, bits.size()); }
@@ -224,7 +224,7 @@ namespace Ogre {
 		
 		size_t mRemovedVertexDuplicatesCount;	
 		size_t mCurrNumIndexes;
-		float mInvSquaredBoundBoxDiagonal;
+		Real mInvSquaredBoundBoxDiagonal;
 		int mVertexComponentFlags;	
 
         // Internal classes

data/deps/include/OGRE/OgreRenderSystem.h

@@ -1453,10 +1453,27 @@ namespace Ogre
 		@see Root::getDisplayMonitorCount
 		*/
 		virtual unsigned int getDisplayMonitorCount() const = 0;
+
+        /**
+        * This marks the beginning of an event for GPU profiling.
+        */
+        virtual void beginProfileEvent( const String &eventName ) = 0;
+
+        /**
+        * Ends the currently active GPU profiling event.
+        */
+        virtual void endProfileEvent( void ) = 0;
+
+        /**
+        * Marks an instantaneous event for graphics profilers.  
+        * This is equivalent to calling @see beginProfileEvent and @see endProfileEvent back to back.
+        */
+        virtual void markProfileEvent( const String &event ) = 0;
+
 	protected:
 
 		/** DepthBuffers to be attached to render targets */
-		DepthBufferMap	mDepthBufferPool;
+		DepthBufferMap mDepthBufferPool;
 
 		/** The render targets. */
 		RenderTargetMap mRenderTargets;

data/deps/include/OGRE/OgreRoot.h

@@ -36,7 +36,7 @@ THE SOFTWARE.
 #include "OgreSceneManagerEnumerator.h"
 #include "OgreResourceGroupManager.h"
 #include "OgreLodStrategyManager.h"
-#include "OgreWorkQueue.h"
+#include "OgreWorkQueue.h"       
 
 #include <exception>
 

data/deps/include/OGRE/OgreSearchOps.h

@@ -44,9 +44,7 @@ THE SOFTWARE.
 
 #include <dirent.h>
 #include <unistd.h>
-#if OGRE_PLATFORM != OGRE_PLATFORM_SYMBIAN
 #include <fnmatch.h>
-#endif
 
 /* Our simplified data entry structure */
 struct _finddata_t
@@ -56,7 +54,6 @@ struct _finddata_t
     unsigned long size;
 };
 
-#if OGRE_PLATFORM != OGRE_PLATFORM_SYMBIAN
 #define _A_NORMAL 0x00  /* Normalfile-Noread/writerestrictions */
 #define _A_RDONLY 0x01  /* Read only file */
 #define _A_HIDDEN 0x02  /* Hidden file */
@@ -70,5 +67,3 @@ int _findnext(intptr_t id, struct _finddata_t *data);
 int _findclose(intptr_t id);
 
 #endif
-
-#endif

data/deps/include/OGRE/OgreSimpleRenderable.h

@@ -73,7 +73,7 @@ namespace Ogre {
         /// Named constructor
         SimpleRenderable(const String& name);
 
-        void setMaterial( const String& matName );
+        virtual void setMaterial( const String& matName );
         virtual const MaterialPtr& getMaterial(void) const;
 
         virtual void setRenderOperation( const RenderOperation& rend );

data/deps/include/OGRE/OgreStdHeaders.h

@@ -5,7 +5,7 @@
     #define __STD_ALGORITHM
 #endif
 
-#if defined ( OGRE_GCC_VISIBILITY ) && (OGRE_PLATFORM != OGRE_PLATFORM_APPLE && OGRE_PLATFORM != OGRE_PLATFORM_APPLE_IOS)
+#if defined ( OGRE_GCC_VISIBILITY ) && ((OGRE_PLATFORM == OGRE_PLATFORM_APPLE && !__LP64__) && OGRE_PLATFORM != OGRE_PLATFORM_APPLE_IOS)
 /* Until libstdc++ for gcc 4.2 is released, we have to declare all
  * symbols in libstdc++.so externally visible, otherwise we end up
  * with them marked as hidden by -fvisible=hidden.
@@ -122,7 +122,7 @@ extern "C" {
 #   include "Threading/OgreThreadHeaders.h"
 #endif
 
-#if defined ( OGRE_GCC_VISIBILITY ) && (OGRE_PLATFORM != OGRE_PLATFORM_APPLE && OGRE_PLATFORM != OGRE_PLATFORM_APPLE_IOS)
+#if defined ( OGRE_GCC_VISIBILITY ) && ((OGRE_PLATFORM == OGRE_PLATFORM_APPLE && !__LP64__) && OGRE_PLATFORM != OGRE_PLATFORM_APPLE_IOS)
 #   pragma GCC visibility pop
 #endif
 #endif

data/deps/include/OGRE/OgreStringConverter.h

@@ -200,6 +200,11 @@ namespace Ogre {
             0.0 if the value could not be parsed, otherwise the numeric version of the String.
         */
         static unsigned long parseUnsignedLong(const String& val, unsigned long defaultValue = 0);
+        /** Converts a String to size_t. 
+        @return
+            defaultValue if the value could not be parsed, otherwise the numeric version of the String.
+        */
+        static size_t parseSizeT(const String& val, size_t defaultValue = 0);
         /** Converts a String to a boolean. 
         @remarks
             Returns true if case-insensitive match of the start of the string