diff options
| author | Thomas Szepe <HG1_public@gmx.net> | 2015-03-23 23:40:11 +0300 |
|---|---|---|
| committer | Thomas Szepe <HG1_public@gmx.net> | 2015-03-23 23:40:11 +0300 |
| commit | d07c666a0e542517914dad580d1b3f4787525852 (patch) | |
| tree | 4f9c2c5999817acaca97351e72e71f3f19cb7652 /source/gameengine/Rasterizer | |
| parent | 2affbb437bd3cbf3e1a502bd65a5eefb64a92b9b (diff) | |
BGE: Add setMistType and setMistIntensity API.
This patch adds the missing setMistType() and setMistIntensity() to the API
Reviewers: campbellbarton, brecht, moguri
Reviewed By: campbellbarton, brecht, moguri
Subscribers: campbellbarton, dingto
Differential Revision: https://developer.blender.org/D149
Diffstat (limited to 'source/gameengine/Rasterizer')
3 files changed, 10 insertions, 4 deletions
diff --git a/source/gameengine/Rasterizer/RAS_IRasterizer.h b/source/gameengine/Rasterizer/RAS_IRasterizer.h index 6f5273f035f..22ffcd48739 100644 --- a/source/gameengine/Rasterizer/RAS_IRasterizer.h +++ b/source/gameengine/Rasterizer/RAS_IRasterizer.h @@ -297,7 +297,7 @@ public: /** * Fog */ - virtual void SetFog(float start, float dist, float r, float g, float b) = 0; + virtual void SetFog(short type, float start, float dist, float intensity, float r, float g, float b) = 0; virtual void SetFogColor(float r, float g,float b) = 0; virtual void SetFogStart(float start) = 0; virtual void SetFogEnd(float end) = 0; diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp index 14a184bbe7f..9269640afa3 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp @@ -247,14 +247,18 @@ void RAS_OpenGLRasterizer::SetFogEnd(float fogend) -void RAS_OpenGLRasterizer::SetFog(float start, +void RAS_OpenGLRasterizer::SetFog(short type, + float start, float dist, + float intensity, float r, float g, float b) { + m_fogtype = type; m_fogstart = start; m_fogdist = dist; + m_fogintensity = intensity; m_fogr = r; m_fogg = g; m_fogb = b; @@ -279,7 +283,7 @@ void RAS_OpenGLRasterizer::DisplayFog() { float params[4] = {m_fogr, m_fogg, m_fogb, 1.0f}; glFogi(GL_FOG_MODE, GL_LINEAR); - glFogf(GL_FOG_DENSITY, 0.1f); + glFogf(GL_FOG_DENSITY, m_fogintensity / 10.0f); glFogf(GL_FOG_START, m_fogstart); glFogf(GL_FOG_END, m_fogstart + m_fogdist); glFogfv(GL_FOG_COLOR, params); diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h index 042243230b3..48023f9786c 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h @@ -80,8 +80,10 @@ class RAS_OpenGLRasterizer : public RAS_IRasterizer /* fogging vars */ bool m_fogenabled; + short m_fogtype; float m_fogstart; float m_fogdist; + float m_fogintensity; float m_fogr; float m_fogg; float m_fogb; @@ -198,7 +200,7 @@ public: virtual const MT_Point3& GetCameraPosition(); virtual bool GetCameraOrtho(); - virtual void SetFog(float start, float dist, float r, float g, float b); + virtual void SetFog(short type, float start, float dist, float intensity, 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); |