AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix credits scale

This commit is contained in:
Phillip Stephens 2021-06-03 15:59:07 -07:00
parent 0c6813d952
commit 665dc5fd51
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Runtime/MP1/CCredits.cpp
View File

@ -68,23 +68,23 @@ CIOWin::EMessageReturn CCredits::Update(float dt, CArchitectureQueue& queue) {
x30_text.back().first->SetOutlineColor(g_tweakGui->GetCreditsTextBorderColor()); x30_text.back().first->SetOutlineColor(g_tweakGui->GetCreditsTextBorderColor());
} }
auto tmp = std::make_pair(std::make_unique<CGuiTextSupport>( // auto tmp = std::make_pair(std::make_unique<CGuiTextSupport>(
g_ResFactory->GetResourceIdByName(g_tweakGui->GetCreditsFont())->id, // g_ResFactory->GetResourceIdByName(g_tweakGui->GetCreditsFont())->id,
CGuiTextProperties(true, true, EJustification::Center, EVerticalJustification::Top), // CGuiTextProperties(true, true, EJustification::Center, EVerticalJustification::Top),
g_tweakGui->GetCreditsTextFontColor(), g_tweakGui->GetCreditsTextBorderColor(), // g_tweakGui->GetCreditsTextFontColor(), g_tweakGui->GetCreditsTextBorderColor(),
zeus::skWhite, g_Viewport.x8_width - 64, 0, g_SimplePool, // zeus::skWhite, g_Viewport.x8_width - 64, 0, g_SimplePool,
CGuiWidget::EGuiModelDrawFlags::Alpha), // CGuiWidget::EGuiModelDrawFlags::Alpha),
zeus::CVector2i(0, 0)); // zeus::CVector2i(0, 0));
tmp.first->SetText( // tmp.first->SetText(
"\n&push;&font=C29C51F1;&main-color=#89D6FF;URDE DEVELOPMENT TEAM&pop;\n" // "\n&push;&font=C29C51F1;&main-color=#89D6FF;URDE DEVELOPMENT TEAM&pop;\n"
"&push;&main-color=#89D6FF;LEAD REVERSE ENGINEERING TEAM&pop\n;" // "&push;&main-color=#89D6FF;LEAD REVERSE ENGINEERING TEAM&pop\n;"
"Jack \"Cirrus\" Andersen\n" // "Jack \"Cirrus\" Andersen\n"
"Phillip \"Antidote\" Stephens\n" // "Phillip \"Antidote\" Stephens\n"
"Luke \"encounter\" Street\n\n" // "Luke \"encounter\" Street\n\n"
"&push;&main-color=#89D6FF;C++ COMPLIANCE & CLEANUP&pop;\n" // "&push;&main-color=#89D6FF;C++ COMPLIANCE & CLEANUP&pop;\n"
"Lioncache\n"); // "Lioncache\n");
x30_text.insert(x30_text.end() - 1, std::move(tmp)); // x30_text.insert(x30_text.end() - 1, std::move(tmp));
x30_text.back().first->SetOutlineColor(g_tweakGui->GetCreditsTextBorderColor()); // x30_text.back().first->SetOutlineColor(g_tweakGui->GetCreditsTextBorderColor());
} }
for (const auto& [text, offset] : x30_text) { for (const auto& [text, offset] : x30_text) {
@ -98,7 +98,7 @@ CIOWin::EMessageReturn CCredits::Update(float dt, CArchitectureQueue& queue) {
auto bounds = text->GetBounds(); auto bounds = text->GetBounds();
offset.y = (bounds.second.y - bounds.first.y); offset.y = (bounds.second.y - bounds.first.y);
offset.x = scaleY; offset.x = scaleY;
text->SetExtentX(g_Viewport.x8_width - 64); text->SetExtentX(g_Viewport.x8_width - 1280);
text->SetExtentY((bounds.second.y - bounds.first.y)); text->SetExtentY((bounds.second.y - bounds.first.y));
scaleY += (bounds.second.y - bounds.first.y); scaleY += (bounds.second.y - bounds.first.y);
} }
@ -231,7 +231,12 @@ void CCredits::DrawVideo() {
} }
void CCredits::DrawText() { void CCredits::DrawText() {
auto region = g_Renderer->SetViewportOrtho(false, -4096, 4096); float width = 896.f * g_Viewport.aspect;
CGraphics::SetOrtho(0.f, width, 896.f, 0.f, -4096.f, 4096.f);
auto region =
std::make_pair<zeus::CVector2f, zeus::CVector2f>(zeus::CVector2f{0.f, 0.f}, zeus::CVector2f{width, 896.f});
CGraphics::SetViewPointMatrix(zeus::CTransform());
CGraphics::SetModelMatrix(zeus::CTransform::Translate((width - 1280.f) / 2.f, 0.f, 896.f));
float dVar5 = (x48_ - (region.second.y() - region.first.y())); float dVar5 = (x48_ - (region.second.y() - region.first.y()));
for (const auto& [text, offset] : x30_text) { for (const auto& [text, offset] : x30_text) {
if (offset.y + offset.x >= dVar5 && offset.x <= x48_) { if (offset.y + offset.x >= dVar5 && offset.x <= x48_) {
@ -243,7 +248,7 @@ void CCredits::DrawText() {
} }
void CCredits::DrawText(CGuiTextSupport& text, const zeus::CVector3f& translation) { void CCredits::DrawText(CGuiTextSupport& text, const zeus::CVector3f& translation) {
auto region = g_Renderer->SetViewportOrtho(false, -4096, 4096); //auto region = g_Renderer->SetViewportOrtho(false, -4096, 4096);
zeus::CTransform xf = zeus::CTransform::Translate(translation); zeus::CTransform xf = zeus::CTransform::Translate(translation);
g_Renderer->SetModelMatrix(xf); g_Renderer->SetModelMatrix(xf);
text.Render(); text.Render();