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

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

@@ -69,28 +69,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);
 
 
 	
@@ -103,18 +103,24 @@ protected:
 	struct _OgreRTSSExport LightParams
 	{
 		Light::LightTypes		mType;				// Light type.		
-		UniformParameterPtr		mPosition;			// Light position.
-		UniformParameterPtr		mDirection;			// Light direction.
-		UniformParameterPtr		mAttenuatParams;	// Attenuation parameters.
-		UniformParameterPtr		mSpotParams;		// Spot light parameters.
-		UniformParameterPtr		mDiffuseColour;		// Diffuse colour.
-		UniformParameterPtr		mSpecularColour;	// Specular colour.
+		// Light position.
+		UniformParameterPtr mPosition;
+		// Light direction.
+		UniformParameterPtr mDirection;
+		// Attenuation parameters.
+		UniformParameterPtr mAttenuatParams;
+		// Spot light parameters.
+		UniformParameterPtr mSpotParams;
+		// Diffuse colour.
+		UniformParameterPtr mDiffuseColour;
+		// Specular colour.
+		UniformParameterPtr mSpecularColour;
 
 	};
 
-	typedef vector<LightParams>::type				LightParamsList;
-	typedef LightParamsList::iterator				LightParamsIterator;
-	typedef LightParamsList::const_iterator			LightParamsConstIterator;
+	typedef vector<LightParams>::type LightParamsList;
+	typedef LightParamsList::iterator LightParamsIterator;
+	typedef LightParamsList::const_iterator	LightParamsConstIterator;
 
 // Protected methods
 protected:
@@ -124,110 +130,136 @@ protected:
 	can be the vertex colour component. To establish such a link one should provide the matching flags to this
 	sub render state.
 	*/
-	void					setTrackVertexColourType(TrackVertexColourType type) { mTrackVertexColourType = type; }
+	void setTrackVertexColourType(TrackVertexColourType type) { mTrackVertexColourType = type; }
 
 	/** 
 	Return the current track per vertex type.
 	*/
-	TrackVertexColourType	getTrackVertexColourType() const { return mTrackVertexColourType; }
+	TrackVertexColourType getTrackVertexColourType() const { return mTrackVertexColourType; }
 
 
 	/** 
 	Set the light count per light type that this sub render state will generate.
 	@see ShaderGenerator::setLightCount.
 	*/
-	void					setLightCount			(const int lightCount[3]);
+	void setLightCount(const int lightCount[3]);
 
 	/** 
 	Get the light count per light type that this sub render state will generate.
 	@see ShaderGenerator::getLightCount.
 	*/
-	void					getLightCount			(int lightCount[3]) const;
+	void getLightCount(int lightCount[3]) const;
 	/** 
 	Set the specular component state. If set to true this sub render state will compute a specular
 	lighting component in addition to the diffuse component.
 	@param enable Pass true to enable specular component computation.
 	*/
-	void					setSpecularEnable		(bool enable) { mSpecularEnable = enable; }
+	void setSpecularEnable(bool enable) { mSpecularEnable = enable; }
 
 	/** 
 	Get the specular component state. 
 	*/
-	bool					getSpecularEnable		() const	  { return mSpecularEnable; }
+	bool getSpecularEnable() const { return mSpecularEnable; }
 
 
 	/** 
 	@see SubRenderState::resolveParameters.
 	*/
-	virtual bool			resolveParameters			(ProgramSet* programSet);
+	virtual bool resolveParameters(ProgramSet* programSet);
 
 	/** Resolve global lighting parameters */
-	bool					resolveGlobalParameters		(ProgramSet* programSet);
+	bool resolveGlobalParameters(ProgramSet* programSet);
 
 	/** Resolve per light parameters */
-	bool					resolvePerLightParameters	(ProgramSet* programSet);
+	bool resolvePerLightParameters(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 global illumination component functions invocations.
 	*/
-	bool			addPSGlobalIlluminationInvocation	(Function* psMain, const int groupOrder, int& internalCounter);
+	bool addPSGlobalIlluminationInvocation(Function* psMain, const int groupOrder, int& internalCounter);
 
 	/** 
 	Internal method that adds per light illumination component functions invocations.
 	*/
-	bool			addPSIlluminationInvocation		(LightParams* curLightParams, Function* psMain, const int groupOrder, int& internalCounter);
+	bool addPSIlluminationInvocation(LightParams* curLightParams, Function* psMain, const int groupOrder, int& internalCounter);
 
 	/** 
 	Internal method that adds the final colour assignments.
 	*/
-	bool			addPSFinalAssignmentInvocation	(Function* psMain, const int groupOrder, int& internalCounter);
+	bool addPSFinalAssignmentInvocation(Function* psMain, const int groupOrder, int& internalCounter);
 
 
 // Attributes.
 protected:	
-	TrackVertexColourType	mTrackVertexColourType;			// Track per vertex colour type.
-	bool					mSpecularEnable;				// Specular component enabled/disabled.
-	LightParamsList			mLightParamsList;				// Light list.
-	UniformParameterPtr		mWorldViewMatrix;				// World view matrix parameter.
-	UniformParameterPtr		mWorldViewITMatrix;				// World view matrix inverse transpose parameter.
-	ParameterPtr			mVSInPosition;					// Vertex shader input position parameter.
-	ParameterPtr			mVSOutViewPos;					// Vertex shader output view position (position in camera space) parameter.
-	ParameterPtr			mPSInViewPos;					// Pixel shader input view position (position in camera space) parameter.
-	ParameterPtr			mVSInNormal;					// Vertex shader input normal.
-	ParameterPtr			mVSOutNormal;					// Vertex shader output normal.
-	ParameterPtr			mPSInNormal;					// Pixel shader input normal.
-	ParameterPtr			mPSTempDiffuseColour;			// Pixel shader temporary diffuse calculation parameter.
-	ParameterPtr			mPSTempSpecularColour;			// Pixel shader temporary specular calculation parameter.
-	ParameterPtr			mPSDiffuse;						// Pixel shader input/local diffuse parameter.	
-	ParameterPtr			mPSSpecular;					// Pixel shader input/local specular parameter.	
-	ParameterPtr			mPSOutDiffuse;					// Pixel shader output diffuse parameter.	
-	ParameterPtr			mPSOutSpecular;					// Pixel shader output specular parameter.	
-	UniformParameterPtr		mDerivedSceneColour;			// Derived scene colour parameter.
-	UniformParameterPtr		mLightAmbientColour;			// Ambient light colour parameter.
-	UniformParameterPtr		mDerivedAmbientLightColour;		// Derived ambient light colour parameter.
-	UniformParameterPtr		mSurfaceAmbientColour;			// Surface ambient colour parameter.
-	UniformParameterPtr		mSurfaceDiffuseColour;			// Surface diffuse colour parameter.
-	UniformParameterPtr		mSurfaceSpecularColour;			// Surface specular colour parameter.
-	UniformParameterPtr		mSurfaceEmissiveColour;			// Surface emissive colour parameter.
-	UniformParameterPtr		mSurfaceShininess;				// Surface shininess parameter.
-	static Light			msBlankLight;					// Shared blank light.
+	// Track per vertex colour type.
+	TrackVertexColourType mTrackVertexColourType;
+	// Specular component enabled/disabled.
+	bool mSpecularEnable;
+	// Light list.
+	LightParamsList mLightParamsList;
+	// World view matrix parameter.
+	UniformParameterPtr mWorldViewMatrix;
+	// World view matrix inverse transpose parameter.
+	UniformParameterPtr mWorldViewITMatrix;
+	// Vertex shader input position parameter.
+	ParameterPtr mVSInPosition;
+	// Vertex shader output view position (position in camera space) parameter.
+	ParameterPtr mVSOutViewPos;
+	// Pixel shader input view position (position in camera space) parameter.
+	ParameterPtr mPSInViewPos;
+	// Vertex shader input normal.
+	ParameterPtr mVSInNormal;
+	// Vertex shader output normal.
+	ParameterPtr mVSOutNormal;
+	// Pixel shader input normal.
+	ParameterPtr mPSInNormal;
+	// Pixel shader temporary diffuse calculation parameter.
+	ParameterPtr mPSTempDiffuseColour;
+	// Pixel shader temporary specular calculation parameter.
+	ParameterPtr mPSTempSpecularColour;
+	// Pixel shader input/local diffuse parameter.	
+	ParameterPtr mPSDiffuse;
+	// Pixel shader input/local specular parameter.	
+	ParameterPtr mPSSpecular;
+	// Pixel shader output diffuse parameter.	
+	ParameterPtr mPSOutDiffuse;
+	// Pixel shader output specular parameter.	
+	ParameterPtr mPSOutSpecular;
+	// Derived scene colour parameter.
+	UniformParameterPtr mDerivedSceneColour;
+	// Ambient light colour parameter.
+	UniformParameterPtr mLightAmbientColour;
+	// Derived ambient light colour parameter.
+	UniformParameterPtr mDerivedAmbientLightColour;
+	// Surface ambient colour parameter.
+	UniformParameterPtr mSurfaceAmbientColour;
+	// Surface diffuse colour parameter.
+	UniformParameterPtr mSurfaceDiffuseColour;
+	// Surface specular colour parameter.
+	UniformParameterPtr mSurfaceSpecularColour;
+	// Surface emissive colour parameter.
+	UniformParameterPtr mSurfaceEmissiveColour;
+	// Surface shininess parameter.
+	UniformParameterPtr mSurfaceShininess;
+	// Shared blank light.
+	static Light msBlankLight;
 };
 
 
@@ -242,17 +274,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, Pass* pass, SGScriptTranslator* translator);
+	virtual SubRenderState* createInstance(ScriptCompiler* compiler, PropertyAbstractNode* prop, Pass* pass, SGScriptTranslator* translator);
 
 	/** 
 	@see SubRenderStateFactory::writeInstance.
 	*/
-	virtual void			writeInstance		(MaterialSerializer* ser, SubRenderState* subRenderState, Pass* srcPass, Pass* dstPass);
+	virtual void writeInstance(MaterialSerializer* ser, SubRenderState* subRenderState, Pass* srcPass, Pass* dstPass);
 
 	
 protected:
@@ -260,7 +292,7 @@ protected:
 	/** 
 	@see SubRenderStateFactory::createInstanceImpl.
 	*/
-	virtual SubRenderState*	createInstanceImpl	();
+	virtual SubRenderState* createInstanceImpl();
 
 
 };

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

@@ -166,9 +166,9 @@ public:
 
 // Protected methods
 protected:	
-	virtual bool			resolveParameters		(ProgramSet* programSet);	
-	virtual bool			resolveDependencies		(ProgramSet* programSet);
-	virtual bool			addFunctionInvocations	(ProgramSet* programSet);
+	virtual bool resolveParameters(ProgramSet* programSet);	
+	virtual bool resolveDependencies(ProgramSet* programSet);
+	virtual bool addFunctionInvocations(ProgramSet* programSet);
 
 	/** 
 	Given an address mode returns the function name which calculates the UV values for that addressing mode
@@ -178,13 +178,18 @@ protected:
 
 // Attributes.
 protected:
-	ParameterPtr mVSInpTextureTableIndex; // The index of the information on the texture in the table
+	// The index of the information on the texture in the table
+	ParameterPtr mVSInpTextureTableIndex;
 	
 	TextureUnitState::UVWAddressingMode mTextureAddressings[TAS_MAX_TEXTURES]; // The addressing mode for each texture
-	ParameterPtr mVSOutTextureDatas[TAS_MAX_TEXTURES]; // The position and size of the texture in the atlas 
-	ParameterPtr mPSInpTextureDatas[TAS_MAX_TEXTURES]; // The position and size of the texture in the atlas
-	UniformParameterPtr mPSTextureSizes[TAS_MAX_TEXTURES]; //A parameter carrying the sizes of the atlas textures
-	UniformParameterPtr mVSTextureTable[TAS_MAX_TEXTURES]; // The table containing information on the textures in the atlas
+	// The position and size of the texture in the atlas 
+	ParameterPtr mVSOutTextureDatas[TAS_MAX_TEXTURES];
+	// The position and size of the texture in the atlas
+	ParameterPtr mPSInpTextureDatas[TAS_MAX_TEXTURES];
+	//A parameter carrying the sizes of the atlas textures
+	UniformParameterPtr mPSTextureSizes[TAS_MAX_TEXTURES];
+	// The table containing information on the textures in the atlas
+	UniformParameterPtr mVSTextureTable[TAS_MAX_TEXTURES];
 
 	//The position of the texture coordinates containing the index information 
 	ushort mAtlasTexcoordPos; 
@@ -345,7 +350,7 @@ protected:
 	/** 
 	@see SubRenderStateFactory::createInstanceImpl.
 	*/
-	virtual SubRenderState*	createInstanceImpl();
+	virtual SubRenderState* createInstanceImpl();
 
 private:
 

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

@@ -72,22 +72,22 @@ 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::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);
 
 	/** 
 	Set the resolve stage flags that this sub render state will produce.
@@ -95,44 +95,53 @@ public:
 	and the pixel shader should output diffuse component he should pass SF_VS_INPUT_DIFFUSE | SF_PS_OUTPUT_DIFFUSE.
 	@param flags The stage flag to set.
 	*/
-	void				setResolveStageFlags		(unsigned int flags) { mResolveStageFlags = flags; }
+	void setResolveStageFlags(unsigned int flags) { mResolveStageFlags = flags; }
 
 	/** 
 	Get the current resolve stage flags.		
 	*/
-	unsigned int		getResolveStageFlags		() const			 { return mResolveStageFlags; }
+	unsigned int getResolveStageFlags() const			 { return mResolveStageFlags; }
 
 	/** 
 	Add the given mask to resolve stage flags that this sub render state will produce.	
 	@param mask The mask to add to current flag set.
 	*/
-	void				addResolveStageMask 		(unsigned int mask)  { mResolveStageFlags |= mask; }
+	void addResolveStageMask(unsigned int mask)  { mResolveStageFlags |= mask; }
 
 	/** 
 	Remove the given mask from the resolve stage flags that this sub render state will produce.	
 	@param mask The mask to remove from current flag set.
 	*/
-	void				removeResolveStageMask 		(unsigned int mask)  { mResolveStageFlags &= ~mask; }
+	void removeResolveStageMask(unsigned int mask)  { mResolveStageFlags &= ~mask; }
 
 	static String Type;
 
 // Protected methods
 protected:	
-	virtual bool			resolveParameters		(ProgramSet* programSet);	
-	virtual bool			resolveDependencies		(ProgramSet* programSet);
-	virtual bool			addFunctionInvocations	(ProgramSet* programSet);
+	virtual bool resolveParameters(ProgramSet* programSet);	
+	virtual bool resolveDependencies(ProgramSet* programSet);
+	virtual bool addFunctionInvocations(ProgramSet* programSet);
 
 // Attributes.
 protected:
-	ParameterPtr	mVSInputDiffuse;			// Vertex shader input diffuse component.
-	ParameterPtr	mVSInputSpecular;			// Vertex shader input specular component.
-	ParameterPtr	mVSOutputDiffuse;			// Vertex shader output diffuse component.
-	ParameterPtr	mVSOutputSpecular;			// Vertex shader input specular component.
-	ParameterPtr	mPSInputDiffuse;			// Pixel shader input diffuse component.
-	ParameterPtr	mPSInputSpecular;			// Pixel shader input specular component.
-	ParameterPtr	mPSOutputDiffuse;			// Pixel shader output diffuse component.
-	ParameterPtr	mPSOutputSpecular;			// Pixel shader input specular component.
-	unsigned int	mResolveStageFlags;			// Stage flags that defines resolve parameters definitions.
+	// Vertex shader input diffuse component.
+	ParameterPtr mVSInputDiffuse;
+	// Vertex shader input specular component.
+	ParameterPtr mVSInputSpecular;
+	// Vertex shader output diffuse component.
+	ParameterPtr mVSOutputDiffuse;
+	// Vertex shader input specular component.
+	ParameterPtr mVSOutputSpecular;
+	// Pixel shader input diffuse component.
+	ParameterPtr mPSInputDiffuse;
+	// Pixel shader input specular component.
+	ParameterPtr mPSInputSpecular;
+	// Pixel shader output diffuse component.
+	ParameterPtr mPSOutputDiffuse;
+	// Pixel shader input specular component.
+	ParameterPtr mPSOutputSpecular;
+	// Stage flags that defines resolve parameters definitions.
+	unsigned int mResolveStageFlags;
 };
 
 
@@ -147,17 +156,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, Pass* pass, SGScriptTranslator* translator);
+	virtual SubRenderState* createInstance(ScriptCompiler* compiler, PropertyAbstractNode* prop, Pass* pass, SGScriptTranslator* translator);
 
 	/** 
 	@see SubRenderStateFactory::writeInstance.
 	*/
-	virtual void			writeInstance		(MaterialSerializer* ser, SubRenderState* subRenderState, Pass* srcPass, Pass* dstPass);
+	virtual void writeInstance(MaterialSerializer* ser, SubRenderState* subRenderState, Pass* srcPass, Pass* dstPass);
 
 	
 protected:
@@ -165,7 +174,7 @@ protected:
 	/** 
 	@see SubRenderStateFactory::createInstanceImpl.
 	*/
-	virtual SubRenderState*	createInstanceImpl	();
+	virtual SubRenderState* createInstanceImpl();
 
 
 };

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

@@ -67,27 +67,27 @@ 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);
 
 	/** 
 	Set the fog properties this fog sub render state should emulate.
@@ -98,7 +98,7 @@ public:
 	@param fogDensity Fog density used in exponential modes only.
 	@see http://msdn.microsoft.com/en-us/library/bb173401.aspx
 	*/
-	void			setFogProperties				(FogMode fogMode, 
+	void setFogProperties(FogMode fogMode, 
 		const ColourValue& fogColour, 
 		float fogStart, 
 		float fogEnd, 
@@ -108,12 +108,12 @@ public:
 	Set the fog calculation mode. Either per vertex or per pixel.
 	@param calcMode The calculation mode to set.
 	*/
-	void			setCalcMode						(CalcMode calcMode) { mCalcMode = calcMode; }
+	void setCalcMode(CalcMode calcMode) { mCalcMode = calcMode; }
 
 	/** 
 	Return the current calculation mode.
 	*/
-	CalcMode		getCalcMode						() const { return mCalcMode; }
+	CalcMode getCalcMode() const { return mCalcMode; }
 
 	static String Type;
 
@@ -123,35 +123,49 @@ 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);
 
 // Attributes.
 protected:	
-	CalcMode			mCalcMode;				// Fog calculation mode.
-	FogMode				mFogMode;				// Fog formula. 
-	ColourValue			mFogColourValue;		// Fog colour value.
-	Vector4				mFogParamsValue;		// Fog parameters (density, start, end, 1/end-start).
-	bool				mPassOverrideParams;	// True if the fog parameters should be taken from the pass.
-
-	UniformParameterPtr	mWorldViewProjMatrix;	// World view projection parameter.		
-	UniformParameterPtr	mFogColour;				// Fog colour parameter.	
-	UniformParameterPtr	mFogParams;				// Fog parameters program parameter.	
-	ParameterPtr		mVSInPos;				// Vertex shader input position parameter.
-	ParameterPtr		mVSOutFogFactor;		// Vertex shader output fog colour parameter.
-	ParameterPtr		mPSInFogFactor;			// Pixel shader input fog factor.
-	ParameterPtr		mVSOutDepth;			// Vertex shader output depth.
-	ParameterPtr		mPSInDepth;				// Pixel shader input depth.
-	ParameterPtr		mPSOutDiffuse;			// Pixel shader output diffuse colour.
+	// Fog calculation mode.
+	CalcMode mCalcMode;
+	// Fog formula. 
+	FogMode mFogMode;
+	// Fog colour value.
+	ColourValue mFogColourValue;
+	// Fog parameters (density, start, end, 1/end-start).
+	Vector4 mFogParamsValue;
+	// True if the fog parameters should be taken from the pass.
+	bool mPassOverrideParams;
+
+	// World view projection parameter.		
+	UniformParameterPtr mWorldViewProjMatrix;
+	// Fog colour parameter.	
+	UniformParameterPtr mFogColour;
+	// Fog parameters program parameter.	
+	UniformParameterPtr mFogParams;
+	// Vertex shader input position parameter.
+	ParameterPtr mVSInPos;
+	// Vertex shader output fog colour parameter.
+	ParameterPtr mVSOutFogFactor;
+	// Pixel shader input fog factor.
+	ParameterPtr mPSInFogFactor;
+	// Vertex shader output depth.
+	ParameterPtr mVSOutDepth;
+	// Pixel shader input depth.
+	ParameterPtr mPSInDepth;
+	// Pixel shader output diffuse colour.
+	ParameterPtr mPSOutDiffuse;
 };
 
 
@@ -166,17 +180,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, Pass* pass, SGScriptTranslator* translator);
+	virtual SubRenderState* createInstance(ScriptCompiler* compiler, PropertyAbstractNode* prop, Pass* pass, SGScriptTranslator* translator);
 
 	/** 
 	@see SubRenderStateFactory::writeInstance.
 	*/
-	virtual void			writeInstance		(MaterialSerializer* ser, SubRenderState* subRenderState, Pass* srcPass, Pass* dstPass);
+	virtual void writeInstance(MaterialSerializer* ser, SubRenderState* subRenderState, Pass* srcPass, Pass* dstPass);
 
 	
 protected:
@@ -184,7 +198,7 @@ protected:
 	/** 
 	@see SubRenderStateFactory::createInstanceImpl.
 	*/
-	virtual SubRenderState*	createInstanceImpl	();
+	virtual SubRenderState* createInstanceImpl();
 
 
 };