From eb78d14ab811f02db2df14fddb90e9ef7d491619 Mon Sep 17 00:00:00 2001 From: MrThatKid Date: Fri, 20 Apr 2018 18:27:37 -0700 Subject: [PATCH] Moved display zbuffer clear to after notefields are drawn (#1679) * Added display zbuffer clear DrawNoteFieldBoard * Removed display zbuffer clear in NoteField --- src/NoteField.cpp | 4 ---- src/ScreenGameplay.cpp | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/NoteField.cpp b/src/NoteField.cpp index 03da0d11f6..becf648081 100644 --- a/src/NoteField.cpp +++ b/src/NoteField.cpp @@ -761,10 +761,6 @@ void NoteField::DrawPrimitives() m_FieldRenderArgs.draw_pixels_before_targets); return; } - - // Clear the z buffer so 3D notes aren't hidden by anything in the underlay using masking. -Kyz - DISPLAY->ClearZBuffer(); - // Some might prefer an else block, instead of returning from the if, but I // don't want to bump the indent on the entire remaining section. -Kyz ArrowEffects::SetCurrentOptions(&m_pPlayerState->m_PlayerOptions.GetCurrent()); diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp index 1801468b5f..c267b46d7a 100644 --- a/src/ScreenGameplay.cpp +++ b/src/ScreenGameplay.cpp @@ -61,6 +61,7 @@ #include "Song.h" #include "XmlFileUtil.h" #include "Profile.h" // for replay data stuff +#include "RageDisplay.h" // Defines #define SHOW_LIFE_METER_FOR_DISABLED_PLAYERS THEME->GetMetricB(m_sName,"ShowLifeMeterForDisabledPlayers") @@ -2046,6 +2047,8 @@ void ScreenGameplay::DrawPrimitives() { pi->m_pPlayer->DrawNoteFieldBoard(); } + // Clear the z buffer so 3D notes aren't hidden by anything in the underlay using masking. -Kyz + DISPLAY->ClearZBuffer(); ScreenWithMenuElements::DrawPrimitives(); }