AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rendering fixes for script nodes and certain UV anim modes

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
Show Stats 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++) for (u32 iPass = 0; iPass < mPasses.size(); iPass++)
mPasses[iPass]->SetAnimCurrent(Options, iPass); mPasses[iPass]->SetAnimCurrent(Options, iPass);
CGraphics::UpdateVertexBlock();
CGraphics::UpdatePixelBlock();
sCurrentMaterial = HashParameters(); 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 // Bind textures
CShader *pShader = CShader::CurrentShader(); CShader *pShader = CShader::CurrentShader();
@ -164,6 +175,11 @@ bool CMaterial::SetCurrent(ERenderOptions Options)
// Bind num lights // Bind num lights
GLuint NumLightsLoc = pShader->GetUniformLocation("NumLights"); GLuint NumLightsLoc = pShader->GetUniformLocation("NumLights");
glUniform1i(NumLightsLoc, CGraphics::sNumLights); glUniform1i(NumLightsLoc, CGraphics::sNumLights);
// Update shader blocks
CGraphics::UpdateVertexBlock();
CGraphics::UpdatePixelBlock();
return true; return true;
} }

29
Scene/CScriptNode.cpp
View File

@ -115,26 +115,29 @@ void CScriptNode::Draw(ERenderOptions Options)
{ {
if (!mpInstance) return; if (!mpInstance) return;
if (!mpActiveModel) // Set lighting
{ LoadModelMatrix();
glBlendFuncSeparate(GL_ONE, GL_ZERO, GL_ZERO, GL_ZERO); LoadLights();
glDepthMask(GL_TRUE);
LoadModelMatrix();
CGraphics::SetDefaultLighting();
CGraphics::UpdateLightBlock();
CDrawUtil::DrawShadedCube(CColor::skTransparentPurple);
return;
}
if (CGraphics::sLightMode == CGraphics::WorldLighting) if (CGraphics::sLightMode == CGraphics::WorldLighting)
CGraphics::sVertexBlock.COLOR0_Amb = CGraphics::sAreaAmbientColor.ToVector4f() * CGraphics::sWorldLightMultiplier; CGraphics::sVertexBlock.COLOR0_Amb = CGraphics::sAreaAmbientColor.ToVector4f() * CGraphics::sWorldLightMultiplier;
else else
CGraphics::sVertexBlock.COLOR0_Amb = CGraphics::skDefaultAmbientColor.ToVector4f(); CGraphics::sVertexBlock.COLOR0_Amb = CGraphics::skDefaultAmbientColor.ToVector4f();
LoadModelMatrix(); // Default to drawing purple box if no model
LoadLights(); if (!mpActiveModel)
{
glBlendFuncSeparate(GL_ONE, GL_ZERO, GL_ZERO, GL_ZERO);
glDepthMask(GL_TRUE);
LoadModelMatrix();
CGraphics::UpdateVertexBlock();
CGraphics::UpdateLightBlock();
CDrawUtil::DrawShadedCube(CColor::skTransparentPurple);
return;
}
// Set tev color (used rarely)
CGraphics::sPixelBlock.TevColor = mpInstance->GetTevColor().ToVector4f(); CGraphics::sPixelBlock.TevColor = mpInstance->GetTevColor().ToVector4f();
mpActiveModel->Draw(Options, 0); mpActiveModel->Draw(Options, 0);