AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-19 09:55:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rendering fixes for script nodes and certain UV anim modes

Browse Source
This commit is contained in:
parax0
2015-08-20 12:34:05 -04:00
parent 63c8351dcf
commit 3542759c74
2 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Resource/CMaterial.cpp
View File

@@ -146,11 +146,22 @@ bool CMaterial::SetCurrent(ERenderOptions Options)
for (u32 iPass = 0; iPass < mPasses.size(); iPass++)
mPasses[iPass]->SetAnimCurrent(Options, iPass);
CGraphics::UpdateVertexBlock();
CGraphics::UpdatePixelBlock();
sCurrentMaterial = HashParameters();
}
// If the passes are otherwise the same, update UV anims that use the model matrix
else
{
for (u32 iPass = 0; iPass < mPasses.size(); iPass++)
{
EUVAnimMode mode = mPasses[iPass]->AnimMode();
if ((mode == eInverseMV) || (mode == eInverseMVTranslated) ||
(mode == eModelMatrix) || (mode == eSimpleMode))
mPasses[iPass]->SetAnimCurrent(Options, iPass);
}
}
// Bind textures
CShader *pShader = CShader::CurrentShader();
@@ -164,6 +175,11 @@ bool CMaterial::SetCurrent(ERenderOptions Options)
// Bind num lights
GLuint NumLightsLoc = pShader->GetUniformLocation("NumLights");
glUniform1i(NumLightsLoc, CGraphics::sNumLights);
// Update shader blocks
CGraphics::UpdateVertexBlock();
CGraphics::UpdatePixelBlock();
return true;
}