Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed #1521

Browse source
This commit is contained in:
Lwmte 2024-12-21 22:07:46 +01:00
parent 7076014c9b
commit 1de0d48d58
1 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
TombEngine/Renderer/RendererDraw.cpp
View file

@ -1881,10 +1881,6 @@ namespace TEN::Renderer
_context->RSSetViewports(1, &view.Viewport); _context->RSSetViewports(1, &view.Viewport);
ResetScissor(); ResetScissor();
SetBlendMode(BlendMode::Opaque);
SetCullMode(CullMode::CounterClockwise);
SetDepthState(DepthState::Write);
// Bind main render target again. Main depth buffer is already filled and avoids overdraw in following steps. // Bind main render target again. Main depth buffer is already filled and avoids overdraw in following steps.
_context->OMSetRenderTargets(1, _renderTarget.RenderTargetView.GetAddressOf(), _renderTarget.DepthStencilView.Get()); _context->OMSetRenderTargets(1, _renderTarget.RenderTargetView.GetAddressOf(), _renderTarget.DepthStencilView.Get());
@ -2195,6 +2191,11 @@ namespace TEN::Renderer
void Renderer::DoRenderPass(RendererPass pass, RenderView& view, bool drawMirrors) void Renderer::DoRenderPass(RendererPass pass, RenderView& view, bool drawMirrors)
{ {
// Reset GPU state.
SetBlendMode(BlendMode::Opaque);
SetCullMode(CullMode::CounterClockwise);
SetDepthState(DepthState::Write);
// Draw room geometry first, if applicable for a given pass. // Draw room geometry first, if applicable for a given pass.
if (pass != RendererPass::Transparent && pass != RendererPass::GunFlashes) if (pass != RendererPass::Transparent && pass != RendererPass::GunFlashes)
DrawRooms(view, pass); DrawRooms(view, pass);
@ -2230,12 +2231,6 @@ namespace TEN::Renderer
break; break;
default: default:
if (statics)
{
DrawStatics(view, pass);
DrawDebris(view, pass); // Debris mostly originate from shatter statics.
}
if (moveables) if (moveables)
{ {
DrawItems(view, pass); DrawItems(view, pass);
@ -2254,6 +2249,12 @@ namespace TEN::Renderer
DrawGunShells(view, pass); DrawGunShells(view, pass);
} }
if (statics)
{
DrawStatics(view, pass);
DrawDebris(view, pass); // Debris mostly originate from shatter statics.
}
// Sorted sprites are already collected at the beginning of frame. // Sorted sprites are already collected at the beginning of frame.
if (sprites && pass != RendererPass::CollectTransparentFaces) if (sprites && pass != RendererPass::CollectTransparentFaces)
DrawSprites(view, pass); DrawSprites(view, pass);
@ -3139,11 +3140,6 @@ namespace TEN::Renderer
// Clear just the Z-buffer to start drawing on top of horizon. // Clear just the Z-buffer to start drawing on top of horizon.
_context->ClearDepthStencilView(depthTarget, D3D11_CLEAR_DEPTH | D3D11_CLEAR_STENCIL, 1.0f, 0); _context->ClearDepthStencilView(depthTarget, D3D11_CLEAR_DEPTH | D3D11_CLEAR_STENCIL, 1.0f, 0);
// Reset the GPU state
SetDepthState(DepthState::Write);
SetBlendMode(BlendMode::Opaque);
SetCullMode(CullMode::CounterClockwise);
} }
void Renderer::Render(float interpFactor) void Renderer::Render(float interpFactor)