mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moves TextRenderer shader to a more relevant place, into the rendering function argument.

Browse Source 
This was SVN commit r25606.
This commit is contained in:
vladislavbelov
2021-05-30 18:28:06 +00:00
parent 7f6ef5db79
commit 7f16a5c40c
9 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/CGUI.cpp
-1
View File
@@ -43,7 +43,6 @@
#include "ps/Profile.h"
#include "ps/Pyrogenesis.h"
#include "ps/XML/Xeromyces.h"
#include "renderer/Renderer.h"
#include "scriptinterface/ScriptContext.h"
#include "scriptinterface/ScriptInterface.h"
source/gui/CGUIText.cpp
+2 -2
View File
@@ -451,7 +451,7 @@ void CGUIText::Draw(CGUI& pGUI, CCanvas2D& canvas, const CGUIColor& DefaultColor
std::floor(clipping.GetHeight() * g_GuiScale));
}
CTextRenderer textRenderer(tech->GetShader());
CTextRenderer textRenderer;
textRenderer.SetClippingRect(clipping);
textRenderer.Translate(0.0f, 0.0f, 0.0f);
@@ -466,7 +466,7 @@ void CGUIText::Draw(CGUI& pGUI, CCanvas2D& canvas, const CGUIColor& DefaultColor
textRenderer.Put(floorf(pos.X + tc.m_Pos.X), floorf(pos.Y + tc.m_Pos.Y), &tc.m_String);
}
textRenderer.Render();
textRenderer.Render(tech->GetShader());
for (const SSpriteCall& sc : m_SpriteCalls)
pGUI.DrawSprite(sc.m_Sprite, canvas, sc.m_Area + pos);
source/gui/ObjectTypes/CInput.cpp
+2 -2
View File
@@ -1266,7 +1266,7 @@ void CInput::Draw(CCanvas2D& canvas)
CShaderTechniquePtr tech = g_Renderer.GetShaderManager().LoadEffect(str_gui_text);
CTextRenderer textRenderer(tech->GetShader());
CTextRenderer textRenderer;
textRenderer.Font(font_name);
// Set the Z to somewhat more, so we can draw a selected area between the
@@ -1517,7 +1517,7 @@ void CInput::Draw(CCanvas2D& canvas)
textRenderer.Translate(0.f, ls, 0.f);
}
textRenderer.Render();
textRenderer.Render(tech->GetShader());
if (cliparea != CRect())
glDisable(GL_SCISSOR_TEST);