Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-07 19:23:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix blending modes issue (#281)

Browse source 
Only for rooms and some objects but not for Lara or most effects
This commit is contained in:
Lwmte 2021-08-01 15:54:54 +03:00
parent f53c825007
commit ed9fc47d27
5 changed files with 60 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

33
TR5Main/Renderer/Renderer11Draw.cpp
View file

@ -148,12 +148,9 @@ namespace T5M::Renderer
if (bucket.Vertices.size() == 0)
continue;
if (bucket.blendMode == 0)
m_context->OMSetBlendState(m_states->Opaque(), NULL, 0xFFFFFFFF);
else
m_context->OMSetBlendState(m_states->Additive(), NULL, 0xFFFFFFFF);
setBlendMode(bucket.blendMode);
m_stMisc.AlphaTest = (bucket.blendMode == 0);
m_stMisc.AlphaTest = (bucket.blendMode != BLEND_MODES::BLENDMODE_OPAQUE);
m_cbMisc.updateData(m_stMisc, m_context.Get());
m_context->PSSetConstantBuffers(3, 1, m_cbMisc.get());
@ -470,7 +467,7 @@ namespace T5M::Renderer
for (auto& bucket : mesh->buckets)
{
if (bucket.Vertices.size() == 0 && bucket.blendMode == 0)
if (bucket.Vertices.size() == 0 && bucket.blendMode == BLENDMODE_OPAQUE)
continue;
// Draw vertices
@ -1388,12 +1385,9 @@ namespace T5M::Renderer
if (bucket.Vertices.size() == 0)
continue;
if (bucket.blendMode == 0)
m_context->OMSetBlendState(m_states->Opaque(), NULL, 0xFFFFFFFF);
else
m_context->OMSetBlendState(m_states->Additive(), NULL, 0xFFFFFFFF);
setBlendMode(bucket.blendMode);
m_stMisc.AlphaTest = (bucket.blendMode == 0);
m_stMisc.AlphaTest = (bucket.blendMode != BLEND_MODES::BLENDMODE_OPAQUE);
m_cbMisc.updateData(m_stMisc, m_context.Get());
m_context->PSSetConstantBuffers(3, 1, m_cbMisc.get());
@ -2864,9 +2858,10 @@ namespace T5M::Renderer
}
if (bucket.Vertices.size() == 0)
continue;
if (transparent && bucket.blendMode == 0)
if (transparent && bucket.blendMode == BLENDMODE_OPAQUE)
continue;
setBlendMode(bucket.blendMode);
m_context->DrawIndexed(bucket.Indices.size(), bucket.StartIndex, 0);
}
}
@ -3000,9 +2995,10 @@ namespace T5M::Renderer
{
if (bucket.Vertices.size() == 0)
continue;
if (transparent && bucket.blendMode == 0)
if (transparent && bucket.blendMode == BLENDMODE_OPAQUE)
continue;
setBlendMode(bucket.blendMode);
m_context->DrawIndexed(bucket.Indices.size(), bucket.StartIndex, 0);
}
}
@ -3028,7 +3024,6 @@ namespace T5M::Renderer
m_context->VSSetShader(m_vsRooms_Anim.Get(), nullptr, 0);
}
m_context->PSSetShader(m_psRooms.Get(), NULL, 0);
// Set texture
@ -3081,11 +3076,11 @@ namespace T5M::Renderer
for (auto& bucket : room->buckets)
{
if (transparent) {
if (bucket.blendMode == BLEND_MODES::BLENDMODE_OPAQUE)
if (bucket.blendMode == BLEND_MODES::BLENDMODE_OPAQUE || bucket.blendMode == BLEND_MODES::BLENDMODE_ALPHATEST)
continue;
}
else {
if (bucket.blendMode != BLEND_MODES::BLENDMODE_OPAQUE)
if (bucket.blendMode != BLEND_MODES::BLENDMODE_OPAQUE && bucket.blendMode != BLEND_MODES::BLENDMODE_ALPHATEST)
continue;
}
@ -3114,6 +3109,7 @@ namespace T5M::Renderer
if (bucket.Vertices.size() == 0)
continue;
setBlendMode(bucket.blendMode);
m_context->DrawIndexed(bucket.Indices.size(), bucket.StartIndex, 0);
m_numDrawCalls++;
}
@ -3266,10 +3262,7 @@ namespace T5M::Renderer
if (bucket.Vertices.size() == 0)
continue;
if (bucket.blendMode != 0)
m_context->OMSetBlendState(m_states->Additive(), NULL, 0xFFFFFFFF);
else
m_context->OMSetBlendState(m_states->Opaque(), NULL, 0xFFFFFFFF);
setBlendMode(bucket.blendMode);
// Draw vertices
m_context->DrawIndexed(bucket.Indices.size(), bucket.StartIndex, 0);