Removes hardcoded 1px width borders from GUI sprites.
Tested By: Imarok Differential Revision: https://code.wildfiregames.com/D4008 This was SVN commit r25541.
This commit is contained in:
parent
8054097daf
commit
3e5638e548
@ -9,9 +9,11 @@
|
||||
<sprite name = "ModernScrollBack">
|
||||
<image backcolor="43 42 40"
|
||||
size="0 0 100% 100%"
|
||||
border="true"
|
||||
bordercolor="0 0 0"
|
||||
/>
|
||||
<image backcolor="0 0 0" size="0 0 100% 1"/>
|
||||
<image backcolor="0 0 0" size="0 100%-1 100% 100%"/>
|
||||
<image backcolor="0 0 0" size="0 0 1 100%"/>
|
||||
<image backcolor="0 0 0" size="100%-1 0 100% 100%"/>
|
||||
<image texture = "global/modern/scrollback.png"
|
||||
real_texture_placement = "0 0 15 128"
|
||||
size = "0 0 100% 100%"
|
||||
@ -513,9 +515,11 @@
|
||||
<sprite name="BlackBorderOnGray">
|
||||
<image backcolor="darkgray"
|
||||
size="0 0 100% 100%"
|
||||
border="true"
|
||||
bordercolor="black"
|
||||
/>
|
||||
<image backcolor="0 0 0" size="0 0 100% 1"/>
|
||||
<image backcolor="0 0 0" size="0 100%-1 100% 100%"/>
|
||||
<image backcolor="0 0 0" size="0 0 1 100%"/>
|
||||
<image backcolor="0 0 0" size="100%-1 0 100% 100%"/>
|
||||
</sprite>
|
||||
<!--
|
||||
==========================================
|
||||
|
@ -827,16 +827,6 @@
|
||||
<ref name="ccolor"/>
|
||||
</attribute>
|
||||
</optional>
|
||||
<optional>
|
||||
<attribute name="bordercolor">
|
||||
<ref name="ccolor"/>
|
||||
</attribute>
|
||||
</optional>
|
||||
<optional>
|
||||
<attribute name="border">
|
||||
<ref name="bool"/>
|
||||
</attribute>
|
||||
</optional>
|
||||
<optional>
|
||||
<attribute name="fixed_h_aspect_ratio">
|
||||
<data type="decimal"/>
|
||||
|
@ -41,9 +41,11 @@
|
||||
<image
|
||||
backcolor="white"
|
||||
size="0 0 100% 100%"
|
||||
border="true"
|
||||
bordercolor="black"
|
||||
/>
|
||||
<image backcolor="black" size="0 0 100% 1"/>
|
||||
<image backcolor="black" size="0 100%-1 100% 100%"/>
|
||||
<image backcolor="black" size="0 0 1 100%"/>
|
||||
<image backcolor="black" size="100%-1 0 100% 100%"/>
|
||||
</sprite>
|
||||
|
||||
<!--
|
||||
|
@ -63,9 +63,11 @@
|
||||
<sprite name="pgUserReportBox">
|
||||
<image backcolor="0 0 0 220"
|
||||
size="0 0 100% 100%"
|
||||
border="true"
|
||||
bordercolor="200 200 200"
|
||||
/>
|
||||
<image backcolor="200 200 200" size="0 0 100% 1"/>
|
||||
<image backcolor="200 200 200" size="0 100%-1 100% 100%"/>
|
||||
<image backcolor="200 200 200" size="0 0 1 100%"/>
|
||||
<image backcolor="200 200 200" size="100%-1 0 100% 100%"/>
|
||||
</sprite>
|
||||
|
||||
</sprites>
|
||||
|
@ -17,9 +17,11 @@
|
||||
<sprite name="bgTooltipBox">
|
||||
<image backcolor="0 0 0 200"
|
||||
size="0 0 100% 100%"
|
||||
border="true"
|
||||
bordercolor="white"
|
||||
/>
|
||||
<image backcolor="white" size="0 0 100% 1"/>
|
||||
<image backcolor="white" size="0 100%-1 100% 100%"/>
|
||||
<image backcolor="white" size="0 0 1 100%"/>
|
||||
<image backcolor="white" size="100%-1 0 100% 100%"/>
|
||||
</sprite>
|
||||
|
||||
</sprites>
|
||||
|
@ -1,18 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<sprites>
|
||||
<sprite name="IconFrame_Gold">
|
||||
<image
|
||||
border="true"
|
||||
bordercolor="163 163 103"
|
||||
backcolor="0 0 0 0"
|
||||
size="0 0 100% 100%"
|
||||
/>
|
||||
<image
|
||||
border="true"
|
||||
bordercolor="0 0 0"
|
||||
backcolor="0 0 0 0"
|
||||
size="1 1 100%-1 100%-1"
|
||||
/>
|
||||
<sprite name="IconFrameGold">
|
||||
<image backcolor="163 163 103" size="0 0 100% 1"/>
|
||||
<image backcolor="163 163 103" size="0 100%-1 100% 100%"/>
|
||||
<image backcolor="163 163 103" size="0 0 1 100%"/>
|
||||
<image backcolor="163 163 103" size="100%-1 0 100% 100%"/>
|
||||
|
||||
<image backcolor="0 0 0" size="1 1 100%-1 2"/>
|
||||
<image backcolor="0 0 0" size="1 100%-2 100%-1 100%-1"/>
|
||||
<image backcolor="0 0 0" size="1 1 2 100%-1"/>
|
||||
<image backcolor="0 0 0" size="100%-2 1 100%-1 100%-1"/>
|
||||
</sprite>
|
||||
</sprites>
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
<styles>
|
||||
<style name="IconFrame"
|
||||
sprite="IconFrame_Gold"
|
||||
sprite="IconFrameGold"
|
||||
ghost="true"
|
||||
/>
|
||||
|
||||
|
@ -503,27 +503,33 @@
|
||||
<image
|
||||
backcolor="darkbrown"
|
||||
size="0 0 100% 100%"
|
||||
border="true"
|
||||
bordercolor="gold"
|
||||
/>
|
||||
<image backcolor="gold" size="0 0 100% 1"/>
|
||||
<image backcolor="gold" size="0 100%-1 100% 100%"/>
|
||||
<image backcolor="gold" size="0 0 1 100%"/>
|
||||
<image backcolor="gold" size="100%-1 0 100% 100%"/>
|
||||
</sprite>
|
||||
|
||||
<sprite name="BackgroundInformationTooltip">
|
||||
<image
|
||||
backcolor="0 0 0 192"
|
||||
size="0 0 100% 100%"
|
||||
border="true"
|
||||
bordercolor="white"
|
||||
/>
|
||||
<image backcolor="white" size="0 0 100% 1"/>
|
||||
<image backcolor="white" size="0 100%-1 100% 100%"/>
|
||||
<image backcolor="white" size="0 0 1 100%"/>
|
||||
<image backcolor="white" size="100%-1 0 100% 100%"/>
|
||||
</sprite>
|
||||
|
||||
<sprite name="BackgroundErrorTooltip">
|
||||
<image
|
||||
backcolor="0 0 0 192"
|
||||
size="0 0 100% 100%"
|
||||
border="true"
|
||||
bordercolor="red"
|
||||
/>
|
||||
<image backcolor="red" size="0 0 100% 1"/>
|
||||
<image backcolor="red" size="0 100%-1 100% 100%"/>
|
||||
<image backcolor="red" size="0 0 1 100%"/>
|
||||
<image backcolor="red" size="100%-1 0 100% 100%"/>
|
||||
</sprite>
|
||||
|
||||
<!-- ================================ ================================ -->
|
||||
|
@ -1086,19 +1086,6 @@ void CGUI::Xeromyces_ReadImage(const XMBData& xmb, XMBElement element, CGUISprit
|
||||
if (!ParseString<CGUIColor>(this, attr_value, Image->m_BackColor))
|
||||
LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value));
|
||||
}
|
||||
else if (attr_name == "bordercolor")
|
||||
{
|
||||
if (!ParseString<CGUIColor>(this, attr_value, Image->m_BorderColor))
|
||||
LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value));
|
||||
}
|
||||
else if (attr_name == "border")
|
||||
{
|
||||
bool b;
|
||||
if (!ParseString<bool>(this, attr_value, b))
|
||||
LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value));
|
||||
else
|
||||
Image->m_Border = b;
|
||||
}
|
||||
else
|
||||
debug_warn(L"Invalid data - DTD shouldn't allow this");
|
||||
}
|
||||
|
@ -55,7 +55,6 @@ public:
|
||||
m_RoundCoordinates(true),
|
||||
m_WrapMode(GL_REPEAT),
|
||||
m_Effects(),
|
||||
m_Border(false),
|
||||
m_Size(CGUISize::Full()),
|
||||
m_TextureSize(CGUISize::Full())
|
||||
{
|
||||
@ -97,10 +96,6 @@ public:
|
||||
|
||||
// Color
|
||||
CGUIColor m_BackColor;
|
||||
CGUIColor m_BorderColor;
|
||||
|
||||
// 0 or 1 pixel border is the only option
|
||||
bool m_Border;
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -228,7 +228,6 @@ void GUIRenderer::UpdateDrawCallCache(const CGUI& pGUI, DrawCalls& Calls, const
|
||||
}
|
||||
|
||||
Call.m_BackColor = &(*cit)->m_BackColor;
|
||||
Call.m_BorderColor = (*cit)->m_Border ? &(*cit)->m_BorderColor : nullptr;
|
||||
|
||||
if (!Call.m_HasTexture)
|
||||
{
|
||||
@ -419,20 +418,6 @@ void GUIRenderer::Draw(DrawCalls& Calls)
|
||||
shader->VertexPointer(3, GL_FLOAT, 3*sizeof(float), &data[0]);
|
||||
glDrawArrays(GL_TRIANGLES, 0, 6);
|
||||
|
||||
if (cit->m_BorderColor != nullptr)
|
||||
{
|
||||
shader->Uniform(str_color, *cit->m_BorderColor);
|
||||
|
||||
data.clear();
|
||||
ADD(Verts.left + 0.5f, Verts.top + 0.5f, 0.0f);
|
||||
ADD(Verts.right - 0.5f, Verts.top + 0.5f, 0.0f);
|
||||
ADD(Verts.right - 0.5f, Verts.bottom - 0.5f, 0.0f);
|
||||
ADD(Verts.left + 0.5f, Verts.bottom - 0.5f, 0.0f);
|
||||
|
||||
shader->VertexPointer(3, GL_FLOAT, 3*sizeof(float), &data[0]);
|
||||
glDrawArrays(GL_LINE_LOOP, 0, 4);
|
||||
}
|
||||
|
||||
if (cit->m_EnableBlending)
|
||||
glDisable(GL_BLEND);
|
||||
#undef ADD
|
||||
|
@ -54,7 +54,6 @@ namespace GUIRenderer
|
||||
|
||||
CRect m_Vertices;
|
||||
|
||||
CGUIColor* m_BorderColor; // == nullptr for no border
|
||||
CGUIColor* m_BackColor;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user