zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed: fog density calculation for fixed function was not correct.

This commit is contained in:
Christoph Oelckers 2014-05-12 14:58:37 +02:00
parent 4d005bdfa0
commit 55d4c89753
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gl/renderer/gl_renderstate.cpp
View File

@ -69,7 +69,7 @@ void FRenderState::Reset()
ffTextureEnabled = ffFogEnabled = false; ffTextureEnabled = ffFogEnabled = false;
mSpecialEffect = ffSpecialEffect = EFF_NONE; mSpecialEffect = ffSpecialEffect = EFF_NONE;
mFogColor.d = ffFogColor.d = -1; mFogColor.d = ffFogColor.d = -1;
mFogDensity = ffFogDensity = 0; ffFogDensity = 0;
mTextureMode = ffTextureMode = -1; mTextureMode = ffTextureMode = -1;
mDesaturation = 0; mDesaturation = 0;
mSrcBlend = GL_SRC_ALPHA; mSrcBlend = GL_SRC_ALPHA;
@ -316,10 +316,11 @@ void FRenderState::Apply(bool forcenoshader)
GLfloat FogColor[4]={mFogColor.r/255.0f,mFogColor.g/255.0f,mFogColor.b/255.0f,0.0f}; GLfloat FogColor[4]={mFogColor.r/255.0f,mFogColor.g/255.0f,mFogColor.b/255.0f,0.0f};
glFogfv(GL_FOG_COLOR, FogColor); glFogfv(GL_FOG_COLOR, FogColor);
} }
if (ffFogDensity != mFogDensity) if (ffFogDensity != mLightParms[2])
{ {
glFogf(GL_FOG_DENSITY, mFogDensity/64000.f); const float LOG2E = 1.442692f; // = 1/log(2)
ffFogDensity=mFogDensity; glFogf(GL_FOG_DENSITY, -mLightParms[2] / LOG2E);
ffFogDensity = mLightParms[2];
} }
} }
if (mSpecialEffect != ffSpecialEffect) if (mSpecialEffect != ffSpecialEffect)

1
src/gl/renderer/gl_renderstate.h
View File

@ -65,7 +65,6 @@ class FRenderState
PalEntry mFogColor; PalEntry mFogColor;
PalEntry mObjectColor; PalEntry mObjectColor;
PalEntry mDynColor; PalEntry mDynColor;
float mFogDensity;
int mEffectState; int mEffectState;
int mColormapState; int mColormapState;