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

Working movie player

Browse Source
This commit is contained in:
Luke Street
2022-02-08 01:54:05 -05:00
parent a1482b4743
commit 921d6bf10a
10 changed files with 612 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/MP1/CFrontEndUI.cpp
View File

@@ -56,7 +56,7 @@ struct FEMovie {
bool loop;
};
constexpr std::array<FEMovie, 9> FEMovies{{
constexpr std::array<FEMovie, 8> FEMovies{{
{"Video/00_first_start.thp", false},
{"Video/01_startloop.thp", true},
{"Video/02_start_fileselect_A.thp", false},
@@ -65,7 +65,6 @@ constexpr std::array<FEMovie, 9> FEMovies{{
{"Video/06_fileselect_GBA.thp", false},
{"Video/07_GBAloop.thp", true},
{"Video/08_GBA_fileselect.thp", false},
{"Video/08_GBA_fileselect.thp", false},
}};
constexpr SObjectTag g_DefaultWorldTag = {FOURCC('MLVL'), 0x158efe17};
@@ -2021,7 +2020,7 @@ void CFrontEndUI::Draw() {
if (xcc_curMoviePtr && xcc_curMoviePtr->GetIsFullyCached()) {
/* Render movie */
xcc_curMoviePtr->SetFrame({-hPad, vPad, 0.f}, {-hPad, -vPad, 0.f}, {hPad, -vPad, 0.f}, {hPad, vPad, 0.f});
xcc_curMoviePtr->SetFrame(hPad, vPad);
xcc_curMoviePtr->DrawFrame();
}
@@ -2038,7 +2037,7 @@ void CFrontEndUI::Draw() {
xe4_fusionBonusFrme->Draw();
}
if (x64_pressStartAlpha > 0.f && x38_pressStart.IsLoaded() && m_pressStartQuad) {
if (x64_pressStartAlpha > 0.f && x38_pressStart.IsLoaded()) {
/* Render "Press Start" */
const zeus::CRectangle rect(0.5f - x38_pressStart->GetWidth() / 2.f / 640.f * hPad,
0.5f + (x38_pressStart->GetHeight() / 2.f - 240.f + 72.f) / 480.f * vPad,
@@ -2047,7 +2046,7 @@ void CFrontEndUI::Draw() {
zeus::CColor color = zeus::skWhite;
color.a() = x64_pressStartAlpha;
aurora::shaders::queue_textured_quad(
aurora::shaders::CameraFilterType::Blend,
aurora::shaders::CameraFilterType::Add,
x38_pressStart->GetTexture()->ref,
aurora::shaders::ZTest::None,
color,
@@ -2130,9 +2129,6 @@ bool CFrontEndUI::PumpLoad() {
if (!x44_frontendAudioGrp.IsLoaded())
return false;
/* Ready to construct texture quads */
m_pressStartQuad.emplace(EFilterType::Add, x38_pressStart);
return true;
}