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

data/deps/include/OGRE/OgreTimer.h

@@ -34,7 +34,7 @@ THE SOFTWARE.
 //Bring in the specific platform's header file
 #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
 # include "WIN32/OgreTimerImp.h"
-#elif (OGRE_PLATFORM == OGRE_PLATFORM_LINUX) || (OGRE_PLATFORM == OGRE_PLATFORM_SYMBIAN)
+#elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX
 # include "GLX/OgreTimerImp.h"
 #elif OGRE_PLATFORM == OGRE_PLATFORM_NACL  
 # include "NaCl/OgreTimerImp.h"

data/deps/include/OGRE/OgreUTFString.h

@@ -132,8 +132,6 @@ namespace Ogre {
 # else
 #   define OGRE_IS_NATIVE_WCHAR_T      0
 # endif
-#elif OGRE_PLATFORM == OGRE_PLATFORM_SYMBIAN
-#   define OGRE_IS_NATIVE_WCHAR_T      0
 #else   // OGRE_COMPILER != OGRE_COMPILER_MSVC
 
 // Assumed wchar_t is natively for other compilers

data/deps/include/OGRE/OgreWindowEventUtilities.h

@@ -32,7 +32,9 @@ THE SOFTWARE.
 #include "OgrePlatform.h"
 
 #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-#  define WIN32_LEAN_AND_MEAN
+#  if !defined(WIN32_LEAN_AND_MEAN)
+#   define WIN32_LEAN_AND_MEAN
+#  endif
 #  if !defined(NOMINMAX) && defined(_MSC_VER)
 #	define NOMINMAX // required to stop windows.h messing up std::min
 #  endif

data/deps/include/OGRE/OgreWorkQueue.h

@@ -472,7 +472,7 @@ namespace Ogre
 		class _OgreExport RequestHandlerHolder : public UtilityAlloc
 		{
 		protected:
-			OGRE_RW_MUTEX(mRWMutex);
+			OGRE_RW_MUTEX(mRWMutex)
 			RequestHandler* mHandler;
 		public:
 			RequestHandlerHolder(RequestHandler* handler)
@@ -529,7 +529,7 @@ namespace Ogre
 		OGRE_MUTEX(mRequestMutex)
 		OGRE_MUTEX(mProcessMutex)
 		OGRE_MUTEX(mResponseMutex)
-		OGRE_RW_MUTEX(mRequestHandlerMutex);
+		OGRE_RW_MUTEX(mRequestHandlerMutex)
 
 
 		void processRequestResponse(Request* r, bool synchronous);

data/deps/include/OGRE/RTShaderSystem/OgreShaderCGProgramProcessor.h

@@ -52,23 +52,23 @@ public:
 	/** Class constructor.
 	@param type The type of this program.
 	*/
-	CGProgramProcessor			();
+	CGProgramProcessor();
 
 	/** Class destructor */
-	virtual ~CGProgramProcessor	();
+	virtual ~CGProgramProcessor();
 
 	/** Return the target language of this processor. */
-	virtual const String&		getTargetLanguage	() const { return TargetLanguage; }
+	virtual const String& getTargetLanguage() const { return TargetLanguage; }
 	
 	/** 
 	@see ProgramProcessor::preCreateGpuPrograms
 	*/
-	virtual bool				preCreateGpuPrograms			(ProgramSet* programSet);
+	virtual bool preCreateGpuPrograms(ProgramSet* programSet);
  
 	/** 
 	@see ProgramProcessor::postCreateGpuPrograms
 	*/
-	virtual bool				postCreateGpuPrograms			(ProgramSet* programSet);
+	virtual bool postCreateGpuPrograms(ProgramSet* programSet);
 
 	static String TargetLanguage;
 	

data/deps/include/OGRE/RTShaderSystem/OgreShaderCGProgramWriter.h

@@ -52,20 +52,20 @@ public:
 	/** Class constructor. 
 	@param language The target shader language.
 	*/
-	CGProgramWriter	();
+	CGProgramWriter();
 
 	/** Class destructor */
-	virtual ~CGProgramWriter ();
+	virtual ~CGProgramWriter();
 
 	/** 
 	@see ProgramWriter::writeSourceCode.
 	*/
-	virtual void			writeSourceCode			(std::ostream& os, Program* program);
+	virtual void writeSourceCode(std::ostream& os, Program* program);
 
 	/** 
 	@see ProgramWriter::getTargetLanguage.
 	*/
-	virtual const String&  getTargetLanguage			() const { return TargetLanguage; }
+	virtual const String& getTargetLanguage() const { return TargetLanguage; }
 
 	static String TargetLanguage;
 
@@ -73,35 +73,37 @@ public:
 protected:
 
 	/** Initialize string maps. */
-	void		initializeStringMaps		();
+	void initializeStringMaps();
 
 	/** Write the program dependencies. */
-	void		writeProgramDependencies	(std::ostream& os, Program* program);
+	void writeProgramDependencies(std::ostream& os, Program* program);
 	
 	/** Write a uniform parameter. */
-	void		writeUniformParameter		(std::ostream& os, UniformParameterPtr parameter);
+	void writeUniformParameter(std::ostream& os, UniformParameterPtr parameter);
 
 	/** Write a function parameter. */
-	void		writeFunctionParameter		(std::ostream& os, ParameterPtr parameter);
+	void writeFunctionParameter(std::ostream& os, ParameterPtr parameter);
 
 	/** Write a local parameter. */
-	void		writeLocalParameter			(std::ostream& os, ParameterPtr parameter);
+	void writeLocalParameter(std::ostream& os, ParameterPtr parameter);
 
 	/** Write a function declaration. */
-	void		writeFunctionDeclaration	(std::ostream& os, Function* function, ParameterPtr & colorParameter);
+	void writeFunctionDeclaration(std::ostream& os, Function* function, ParameterPtr & colorParameter);
 
 	/** Write function atom instance. */
-	void		writeAtomInstance			(std::ostream& os, FunctionAtom* atom);
+	void writeAtomInstance(std::ostream& os, FunctionAtom* atom);
 
 
 protected:
-	typedef		map<GpuConstantType, const char*>::type		GpuConstTypeToStringMap;
-	typedef		map<Parameter::Semantic, const char*>::type	ParamSemanticToStringMap;
+	typedef map<GpuConstantType, const char*>::type GpuConstTypeToStringMap;
+	typedef map<Parameter::Semantic, const char*>::type	ParamSemanticToStringMap;
 
 // Attributes.
 protected:
-	GpuConstTypeToStringMap		mGpuConstTypeMap;		// Map between GPU constant type to string value.
-	ParamSemanticToStringMap	mParamSemanticMap;		// Map between parameter semantic to string value.
+	// Map between GPU constant type to string value.
+	GpuConstTypeToStringMap mGpuConstTypeMap;
+	// Map between parameter semantic to string value.
+	ParamSemanticToStringMap mParamSemanticMap;
 };
 
 /** CG program writer factory implementation.

data/deps/include/OGRE/RTShaderSystem/OgreShaderExDualQuaternionSkinning.h

@@ -68,17 +68,17 @@ public:
 	/**
 	@see SubRenderState::resolveParameters.
 	*/
-	virtual bool resolveParameters (ProgramSet* programSet);
+	virtual bool resolveParameters(ProgramSet* programSet);
 
 	/**
 	@see SubRenderState::resolveDependencies.
 	*/
-	virtual bool resolveDependencies (ProgramSet* programSet);
+	virtual bool resolveDependencies(ProgramSet* programSet);
 
 	/**
 	@see SubRenderState::addFunctionInvocations.
 	*/
-	virtual bool addFunctionInvocations (ProgramSet* programSet);
+	virtual bool addFunctionInvocations(ProgramSet* programSet);
 
 // Protected methods
 protected:

data/deps/include/OGRE/RTShaderSystem/OgreShaderExHardwareSkinning.h

@@ -156,23 +156,24 @@ protected:
 	/**
 	@see SubRenderState::resolveParameters.
 	*/
-	virtual bool resolveParameters (ProgramSet* programSet);
+	virtual bool resolveParameters(ProgramSet* programSet);
 
 	/**
 	@see SubRenderState::resolveDependencies.
 	*/
-	virtual bool resolveDependencies (ProgramSet* programSet);
+	virtual bool resolveDependencies(ProgramSet* programSet);
 
 	/**
 	@see SubRenderState::addFunctionInvocations.
 	*/
-	virtual bool addFunctionInvocations (ProgramSet* programSet);
+	virtual bool addFunctionInvocations(ProgramSet* programSet);
 
 	SharedPtr<LinearSkinning> mLinear;
 	SharedPtr<DualQuaternionSkinning> mDualQuat;
 	SharedPtr<HardwareSkinningTechnique> mActiveTechnique;
 	
-	const HardwareSkinningFactory* mCreator; ///The factory which created this sub render state
+	///The factory which created this sub render state
+	const HardwareSkinningFactory* mCreator;
 	SkinningType mSkinningType;
 };
 

data/deps/include/OGRE/RTShaderSystem/OgreShaderExHardwareSkinningTechnique.h

@@ -101,17 +101,17 @@ public:
 	/**
 	@see SubRenderState::resolveParameters.
 	*/
-	virtual bool resolveParameters (ProgramSet* programSet) = 0;
+	virtual bool resolveParameters(ProgramSet* programSet) = 0;
 
 	/**
 	@see SubRenderState::resolveDependencies.
 	*/
-	virtual bool resolveDependencies (ProgramSet* programSet) = 0;
+	virtual bool resolveDependencies(ProgramSet* programSet) = 0;
 
 	/**
 	@see SubRenderState::addFunctionInvocations.
 	*/
-	virtual bool addFunctionInvocations (ProgramSet* programSet) = 0;
+	virtual bool addFunctionInvocations(ProgramSet* programSet) = 0;
 
 protected:
 	/** Translates an index number to a mask value */

data/deps/include/OGRE/RTShaderSystem/OgreShaderExIntegratedPSSM3.h

@@ -67,28 +67,28 @@ public:
 	/** 
 	@see SubRenderState::getType.
 	*/
-	virtual const String&	getType					() const;
+	virtual const String& getType() const;
 
 	/** 
 	@see SubRenderState::getType.
 	*/
-	virtual int				getExecutionOrder		() const;
+	virtual int getExecutionOrder() const;
 
 	/** 
 	@see SubRenderState::updateGpuProgramsParams.
 	*/
-	virtual void			updateGpuProgramsParams	(Renderable* rend, Pass* pass, const AutoParamDataSource* source, const LightList* pLightList);
+	virtual void updateGpuProgramsParams(Renderable* rend, Pass* pass, const AutoParamDataSource* source, const LightList* pLightList);
 
 	/** 
 	@see SubRenderState::copyFrom.
 	*/
-	virtual void			copyFrom				(const SubRenderState& rhs);
+	virtual void copyFrom(const SubRenderState& rhs);
 
 
 	/** 
 	@see SubRenderState::preAddToRenderState.
 	*/
-	virtual bool			preAddToRenderState		(const RenderState* renderState, Pass* srcPass, Pass* dstPass);
+	virtual bool preAddToRenderState(const RenderState* renderState, Pass* srcPass, Pass* dstPass);
 
 
 	
@@ -98,7 +98,7 @@ public:
 	far point, and each value in between is both a far point of the previous
 	split, and a near point for the next one.
 	*/
-	void			setSplitPoints					(const SplitPointList& newSplitPoints);
+	void setSplitPoints(const SplitPointList& newSplitPoints);
 
 	static String Type;
 
@@ -108,13 +108,20 @@ protected:
 	// Shadow texture parameters.
 	struct _OgreRTSSExport ShadowTextureParams
 	{					
-		Real				mMaxRange;				// The max range of this shadow texture in terms of PSSM (far plane of viewing camera).
-		unsigned int		mTextureSamplerIndex;	// The shadow map sampler index.
-		UniformParameterPtr	mTextureSampler;		// The shadow map sampler.			
-		UniformParameterPtr	mInvTextureSize;		// The inverse texture 
-		UniformParameterPtr	mWorldViewProjMatrix;	// The source light view projection matrix combined with world matrix.		
-		ParameterPtr		mVSOutLightPosition;	// The vertex shader output position in light space.
-		ParameterPtr		mPSInLightPosition;		// The pixel shader input position in light space.
+		// The max range of this shadow texture in terms of PSSM (far plane of viewing camera).
+		Real mMaxRange;
+		// The shadow map sampler index.
+		unsigned int mTextureSamplerIndex;
+		// The shadow map sampler.			
+		UniformParameterPtr mTextureSampler;
+		// The inverse texture 
+		UniformParameterPtr mInvTextureSize;
+		// The source light view projection matrix combined with world matrix.		
+		UniformParameterPtr mWorldViewProjMatrix;
+		// The vertex shader output position in light space.
+		ParameterPtr mVSOutLightPosition;
+		// The pixel shader input position in light space.
+		ParameterPtr mPSInLightPosition;
 
 	};
 
@@ -130,27 +137,27 @@ protected:
 	/** 
 	@see SubRenderState::resolveParameters.
 	*/
-	virtual bool			resolveParameters		(ProgramSet* programSet);
+	virtual bool resolveParameters(ProgramSet* programSet);
 
 	/** 
 	@see SubRenderState::resolveDependencies.
 	*/
-	virtual bool			resolveDependencies		(ProgramSet* programSet);
+	virtual bool resolveDependencies(ProgramSet* programSet);
 
 	/** 
 	@see SubRenderState::addFunctionInvocations.
 	*/
-	virtual bool			addFunctionInvocations	(ProgramSet* programSet);
+	virtual bool addFunctionInvocations(ProgramSet* programSet);
 
 	/** 
 	Internal method that adds related vertex shader functions invocations.
 	*/
-	bool			addVSInvocation						(Function* vsMain, const int groupOrder, int& internalCounter);
+	bool addVSInvocation(Function* vsMain, const int groupOrder, int& internalCounter);
 
 	/** 
 	Internal method that adds related pixel shader functions invocations.
 	*/
-	bool			addPSInvocation						(Program* psProgram, const int groupOrder, int& internalCounter);
+	bool addPSInvocation(Program* psProgram, const int groupOrder, int& internalCounter);
 
 
 
@@ -158,17 +165,28 @@ protected:
 
 	// Attributes.
 protected:		
-	ShadowTextureParamsList		mShadowTextureParamsList;		// Shadow texture parameter list.	
-	UniformParameterPtr			mPSSplitPoints;					// Split points parameter.
-	ParameterPtr				mVSInPos;						// Vertex shader input position parameter.	
-	ParameterPtr				mVSOutPos;						// Vertex shader output position (clip space) parameter.
-	ParameterPtr				mVSOutDepth;					// Vertex shader output depth (clip space) parameter.
-	ParameterPtr				mPSInDepth;						// Pixel shader input depth (clip space) parameter.
-	ParameterPtr				mPSLocalShadowFactor;			// Pixel shader local computed shadow colour parameter.
-	ParameterPtr				mPSDiffuse;						// Pixel shader in/local diffuse colour parameter.
-	ParameterPtr				mPSOutDiffuse;					// Pixel shader output diffuse colour parameter.
-	ParameterPtr				mPSSpecualr;					// Pixel shader in/local specular colour parameter.
-	UniformParameterPtr			mPSDerivedSceneColour;			// Derived scene colour (ambient term).
+	// Shadow texture parameter list.	
+	ShadowTextureParamsList mShadowTextureParamsList;
+	// Split points parameter.
+	UniformParameterPtr mPSSplitPoints;
+	// Vertex shader input position parameter.	
+	ParameterPtr mVSInPos;
+	// Vertex shader output position (clip space) parameter.
+	ParameterPtr mVSOutPos;
+	// Vertex shader output depth (clip space) parameter.
+	ParameterPtr mVSOutDepth;
+	// Pixel shader input depth (clip space) parameter.
+	ParameterPtr mPSInDepth;
+	// Pixel shader local computed shadow colour parameter.
+	ParameterPtr mPSLocalShadowFactor;
+	// Pixel shader in/local diffuse colour parameter.
+	ParameterPtr mPSDiffuse;
+	// Pixel shader output diffuse colour parameter.
+	ParameterPtr mPSOutDiffuse;
+	// Pixel shader in/local specular colour parameter.
+	ParameterPtr mPSSpecualr;
+	// Derived scene colour (ambient term).
+	UniformParameterPtr mPSDerivedSceneColour;
 
 };
 
@@ -184,12 +202,12 @@ public:
 	/** 
 	@see SubRenderStateFactory::getType.
 	*/
-	virtual const String&	getType				() const;
+	virtual const String& getType() const;
 
 	/** 
 	@see SubRenderStateFactory::createInstance.
 	*/
-	virtual SubRenderState*	createInstance		(ScriptCompiler* compiler, PropertyAbstractNode* prop, Pass* pass, SGScriptTranslator* translator);
+	virtual SubRenderState* createInstance(ScriptCompiler* compiler, PropertyAbstractNode* prop, Pass* pass, SGScriptTranslator* translator);
 
 
 protected:
@@ -197,7 +215,7 @@ protected:
 	/** 
 	@see SubRenderStateFactory::createInstanceImpl.
 	*/
-	virtual SubRenderState*	createInstanceImpl	();
+	virtual SubRenderState* createInstanceImpl();
 
 
 };

data/deps/include/OGRE/RTShaderSystem/OgreShaderExLayeredBlending.h

@@ -97,10 +97,14 @@ public:
 	{
 		TextureBlend() : blendMode(LB_Invalid), sourceModifier(SM_Invalid), customNum(0) {}
 
-		BlendMode blendMode; //The blend mode to use
-		SourceModifier sourceModifier; //The source modification to use
-		int customNum; // The number of the custom param controlling the source modification
-		ParameterPtr modControlParam; //The parameter controlling the source modification
+		//The blend mode to use
+		BlendMode blendMode;
+		//The source modification to use
+		SourceModifier sourceModifier;
+		// The number of the custom param controlling the source modification
+		int customNum;
+		//The parameter controlling the source modification
+		ParameterPtr modControlParam;
 	};
 
 
@@ -145,7 +149,7 @@ public:
 	/** 
 	@see SubRenderState::copyFrom.
 	*/
-	virtual void copyFrom				(const SubRenderState& rhs);
+	virtual void copyFrom(const SubRenderState& rhs);
 
 	static String Type;
 
@@ -203,17 +207,17 @@ public:
 	/** 
 	@see SubRenderStateFactory::getType.
 	*/
-	virtual const String&	getType				() const;
+	virtual const String& getType() const;
 
 	/** 
 	@see SubRenderStateFactory::createInstance.
 	*/
-	virtual SubRenderState*	createInstance		(ScriptCompiler* compiler, PropertyAbstractNode* prop, TextureUnitState* texState, SGScriptTranslator* translator);
+	virtual SubRenderState* createInstance(ScriptCompiler* compiler, PropertyAbstractNode* prop, TextureUnitState* texState, SGScriptTranslator* translator);
 
 	/** 
 	@see SubRenderStateFactory::writeInstance.
 	*/
-	virtual void			writeInstance		(MaterialSerializer* ser, SubRenderState* subRenderState, const TextureUnitState* srcTextureUnit, const TextureUnitState* dstTextureUnit);
+	virtual void writeInstance(MaterialSerializer* ser, SubRenderState* subRenderState, const TextureUnitState* srcTextureUnit, const TextureUnitState* dstTextureUnit);
 
 	
 protected:
@@ -221,7 +225,7 @@ protected:
 	/** 
 	@see SubRenderStateFactory::createInstanceImpl.
 	*/
-	virtual SubRenderState*	createInstanceImpl	();
+	virtual SubRenderState* createInstanceImpl();
 
 	/** 
 	@Converts string to Enum

data/deps/include/OGRE/RTShaderSystem/OgreShaderExLinearSkinning.h

@@ -59,33 +59,33 @@ public:
 	/**
 	@see SubRenderState::resolveParameters.
 	*/
-	virtual bool resolveParameters (ProgramSet* programSet);
+	virtual bool resolveParameters(ProgramSet* programSet);
 
 	/**
 	@see SubRenderState::resolveDependencies.
 	*/
-	virtual bool resolveDependencies (ProgramSet* programSet);
+	virtual bool resolveDependencies(ProgramSet* programSet);
 
 	/**
 	@see SubRenderState::addFunctionInvocations.
 	*/
-	virtual bool addFunctionInvocations (ProgramSet* programSet);
+	virtual bool addFunctionInvocations(ProgramSet* programSet);
 
 protected:
 	/** Adds functions to calculate position data in world, object and projective space */
-	void addPositionCalculations (Function* vsMain, int& funcCounter);
+	void addPositionCalculations(Function* vsMain, int& funcCounter);
 
 	/** Adds the weight of a given position for a given index */
-	void addIndexedPositionWeight (Function* vsMain, int index, int& funcCounter);
+	void addIndexedPositionWeight(Function* vsMain, int index, int& funcCounter);
 
 	/** Adds the calculations for calculating a normal related element */
-	void addNormalRelatedCalculations (Function* vsMain,
+	void addNormalRelatedCalculations(Function* vsMain,
 						ParameterPtr& pNormalRelatedParam,
 						ParameterPtr& pNormalWorldRelatedParam,
 						int& funcCounter);
 
 	/** Adds the weight of a given normal related parameter for a given index */
-	void addIndexedNormalRelatedWeight (Function* vsMain, ParameterPtr& pNormalRelatedParam,
+	void addIndexedNormalRelatedWeight(Function* vsMain, ParameterPtr& pNormalRelatedParam,
 						ParameterPtr& pNormalWorldRelatedParam,
 						int index, int& funcCounter);
 };