AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 05:07:43 +00:00
Code Issues Projects Releases Wiki Activity

FRME bug fixes and shader adjustments

Browse Source
This commit is contained in:
Jack Andersen
2017-01-29 18:16:20 -10:00
parent 1fbd08b7c6
commit 83176b41a9
39 changed files with 424 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Runtime/GuiSys/CFontRenderState.cpp
View File

@@ -6,9 +6,9 @@ namespace urde
CFontRenderState::CFontRenderState()
{
x54_[0] = zeus::CColor::skWhite;
x54_[1] = zeus::CColor::skGrey;
x54_[2] = zeus::CColor::skWhite;
x54_colors[0] = zeus::CColor::skWhite;
x54_colors[1] = zeus::CColor::skGrey;
x54_colors[2] = zeus::CColor::skWhite;
RefreshPalette();
}
@@ -36,13 +36,13 @@ void CFontRenderState::SetColor(EColorType tp, const CTextColor& col)
case EColorType::Main:
case EColorType::Outline:
case EColorType::Geometry:
x54_[int(tp)] = col;
x54_colors[int(tp)] = col;
break;
case EColorType::Foreground:
x54_[0] = col;
x54_colors[0] = col;
break;
case EColorType::Background:
x54_[1] = col;
x54_colors[1] = col;
break;
}
RefreshColor(tp);
@@ -61,15 +61,15 @@ void CFontRenderState::RefreshColor(EColorType tp)
case EColorType::Main:
if (!x48_font)
return;
switch (x48_font.GetObj()->GetMode())
switch (x48_font->GetMode())
{
case EColorType::Main:
if (!x64_colorOverrides[0])
x0_drawStrOpts.x4_colors[0] = ConvertToTextureSpace(x54_[0]);
x0_drawStrOpts.x4_colors[0] = ConvertToTextureSpace(x54_colors[0]);
break;
case EColorType::Outline:
if (!x64_colorOverrides[0])
x0_drawStrOpts.x4_colors[0] = ConvertToTextureSpace(x54_[0]);
x0_drawStrOpts.x4_colors[0] = ConvertToTextureSpace(x54_colors[0]);
break;
default: break;
}
@@ -79,12 +79,12 @@ void CFontRenderState::RefreshColor(EColorType tp)
return;
if (x64_colorOverrides[1])
return;
if (x48_font.GetObj()->GetMode() == EColorType::Outline)
x0_drawStrOpts.x4_colors[1] = ConvertToTextureSpace(x54_[1]);
if (x48_font->GetMode() == EColorType::Outline)
x0_drawStrOpts.x4_colors[1] = ConvertToTextureSpace(x54_colors[1]);
break;
case EColorType::Geometry:
if (!x64_colorOverrides[2])
x0_drawStrOpts.x4_colors[2] = ConvertToTextureSpace(x54_[2]);
x0_drawStrOpts.x4_colors[2] = ConvertToTextureSpace(x54_colors[2]);
break;
case EColorType::Foreground:
RefreshColor(EColorType::Main);