Merge branch 'master' into temp-ghash-setopstemp-ghash-setops

1 files changed, 6 insertions, 15 deletions

diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
index 1334ddb2a26..b034315e3d6 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
@@ -80,12 +80,7 @@ class RAS_OpenGLRasterizer : public RAS_IRasterizer
 	
 	/* fogging vars */
 	bool m_fogenabled;
-	float m_fogstart;
-	float m_fogdist;
-	float m_fogr;
-	float m_fogg;
-	float m_fogb;
-	
+
 	float m_redback;
 	float m_greenback;
 	float m_blueback;
@@ -198,16 +193,12 @@ public:
 	virtual const MT_Point3& GetCameraPosition();
 	virtual bool GetCameraOrtho();
 	
-	virtual void SetFog(float start, float dist, float r, float g, float b);
-	virtual void SetFogColor(float r, float g, float b);
-	virtual void SetFogStart(float fogstart);
-	virtual void SetFogEnd(float fogend);
-	void DisableFog();
+	virtual void SetFog(short type, float start, float dist, float intensity, float color[3]);
+	virtual void EnableFog(bool enable);
 	virtual void DisplayFog();
-	virtual bool IsFogEnabled();
 
-	virtual void SetBackColor(float red, float green, float blue, float alpha);
-	
+	virtual void SetBackColor(float color[3]);
+
 	virtual void SetDrawingMode(int drawingmode);
 	virtual int GetDrawingMode();
 
@@ -227,7 +218,7 @@ public:
 	virtual void SetDiffuse(float difX, float difY, float difZ, float diffuse);
 	virtual void SetEmissive(float eX, float eY, float eZ, float e);
 
-	virtual void SetAmbientColor(float red, float green, float blue);
+	virtual void SetAmbientColor(float color[3]);
 	virtual void SetAmbient(float factor);
 
 	virtual void SetPolygonOffset(float mult, float add);