OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Revert "- made r_fullbrightignoresectorcolor a MAPINFO option, so far only working on the software renderer. GL still needs a few changes to handle it correctly."

Browse source 
This reverts commit dd03bb1fcb.

Turns out that making this work in GL will create a complete mess so better remove the option as it would only cause problems.
This commit is contained in:
Christoph Oelckers 2017-01-28 18:26:52 +01:00
commit 1d2ae53ecb
12 changed files with 25 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gl/renderer/gl_renderstate.cpp
View file

@ -141,10 +141,9 @@ bool FRenderState::ApplyShader()
fogset = -gl_fogmode;
}
}
glVertexAttrib4fv(VATTR_NORMAL, mNormal.vec);
glVertexAttrib4fv(VATTR_COLOR, mColor.vec);
activeShader->muObjectColor.Set(mObjectColor);
glVertexAttrib4fv(VATTR_NORMAL, mNormal.vec);
activeShader->muDesaturation.Set(mDesaturation / 255.f);
activeShader->muFogEnabled.Set(fogset);
@ -153,6 +152,7 @@ bool FRenderState::ApplyShader()
activeShader->muCameraPos.Set(mCameraPos.vec);
activeShader->muLightParms.Set(mLightParms);
activeShader->muFogColor.Set(mFogColor);
activeShader->muObjectColor.Set(mObjectColor);
activeShader->muDynLightColor.Set(mDynColor.vec);
activeShader->muInterpolationFactor.Set(mInterpolationFactor);
activeShader->muClipHeight.Set(mClipHeight);