OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'remotes/origin/materials'

Browse source
This commit is contained in:
Christoph Oelckers 2018-03-03 08:54:04 +01:00
commit b327aa737a
35 changed files with 1041 additions and 314 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,6 +87,8 @@ void FRenderState::Reset()
mSpecialEffect = EFF_NONE;
mClipHeight = 0.f;
mClipHeightDirection = 0.f;
mGlossiness = 0.0f;
mSpecularLevel = 0.0f;
mShaderTimer = 0.0f;
ClearClipSplit();
@ -137,7 +139,7 @@ bool FRenderState::ApplyShader()
}
else
{
activeShader = GLRenderer->mShaderManager->Get(mTextureEnabled ? mEffectState : 4, mAlphaThreshold >= 0.f, mPassType);
activeShader = GLRenderer->mShaderManager->Get(mTextureEnabled ? mEffectState : SHADER_NoTexture, mAlphaThreshold >= 0.f, mPassType);
activeShader->Bind();
}
@ -178,6 +180,7 @@ bool FRenderState::ApplyShader()
activeShader->muLightIndex.Set(mLightIndex); // will always be -1 for now
activeShader->muClipSplit.Set(mClipSplit);
activeShader->muViewHeight.Set(viewheight);
activeShader->muSpecularMaterial.Set(mGlossiness, mSpecularLevel);
if (mGlowEnabled)
{