OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- objectcolor stuff.

Browse source 
# Conflicts:
#	src/gl/renderer/gl_renderstate.cpp
This commit is contained in:
Christoph Oelckers 2017-01-28 18:19:58 +01:00
commit 12d073a27d
7 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -72,6 +72,7 @@ void FRenderState::Reset()
mModelMatrixEnabled = false;
mTextureMatrixEnabled = false;
mObjectColor = 0xffffffff;
mObjectColor2 = 0;
mVertexBuffer = mCurrentVertexBuffer = NULL;
mColormapState = CM_DEFAULT;
mSoftLight = 0;
@ -144,6 +145,8 @@ bool FRenderState::ApplyShader()
glVertexAttrib4fv(VATTR_COLOR, mColor.vec);
glVertexAttrib4fv(VATTR_NORMAL, mNormal.vec);
//activeShader->muObjectColor2.Set(mObjectColor2);
activeShader->muObjectColor2.Set(mObjectColor2);
activeShader->muDesaturation.Set(mDesaturation / 255.f);
activeShader->muFogEnabled.Set(fogset);