From b84ca25736fc002ab9311e64c8fc3431d806e7bd Mon Sep 17 00:00:00 2001 From: Eli2 Date: Sun, 15 Nov 2015 00:38:03 +0100 Subject: [PATCH] Fix inconsistent hud texture filtering --- src/gui/Hud.cpp | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/gui/Hud.cpp b/src/gui/Hud.cpp index 133552305b..a11b6d9698 100644 --- a/src/gui/Hud.cpp +++ b/src/gui/Hud.cpp @@ -1435,6 +1435,12 @@ void PlayerInterfaceFader::update() { } } +static void setHudTextureState() { + GRenderer->GetTextureStage(0)->setMinFilter(TextureStage::FilterLinear); + GRenderer->GetTextureStage(0)->setMagFilter(TextureStage::FilterLinear); + GRenderer->GetTextureStage(0)->setWrapMode(TextureStage::WrapClamp); +} + void HudRoot::draw() { const Vec2f mousePos = Vec2f(DANAEMouse); @@ -1474,11 +1480,8 @@ void HudRoot::draw() { precastSpellsGui.updateRect(damagedEquipmentGui.rect()); precastSpellsGui.update(); + setHudTextureState(); - GRenderer->GetTextureStage(0)->setMinFilter(TextureStage::FilterLinear); - GRenderer->GetTextureStage(0)->setMagFilter(TextureStage::FilterNearest); - GRenderer->GetTextureStage(0)->setWrapMode(TextureStage::WrapClamp); - if(player.Interface & INTER_COMBATMODE) { hitStrengthGauge.draw(); } @@ -1532,6 +1535,8 @@ void HudRoot::draw() { ARX_INTERFACE_ManageOpenedBook_SpellsDraw(); } } + + setHudTextureState(); } if(CurrSpellSymbol || player.SpellToMemorize.bSpell) { @@ -1592,14 +1597,14 @@ void HudRoot::draw() { levelUpIconGui.draw(); } - GRenderer->GetTextureStage(0)->setMinFilter(TextureStage::FilterLinear); - GRenderer->GetTextureStage(0)->setMagFilter(TextureStage::FilterLinear); - GRenderer->GetTextureStage(0)->setWrapMode(TextureStage::WrapRepeat); - precastSpellsGui.draw(); activeSpellsGui.update(hudSlider); activeSpellsGui.updateInput(mousePos); activeSpellsGui.draw(); + + GRenderer->GetTextureStage(0)->setMinFilter(TextureStage::FilterLinear); + GRenderer->GetTextureStage(0)->setMagFilter(TextureStage::FilterLinear); + GRenderer->GetTextureStage(0)->setWrapMode(TextureStage::WrapRepeat); } void HudRoot::recalcScale() {