mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-16 21:17:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_lyt_meter_timer OK by shamefully avoiding an inline

Browse Source
This commit is contained in:
robojumper
2025-04-18 20:50:14 +02:00
parent cd7e0d47a9
commit 7f7a93451e
5 changed files with 104 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/lyt/meter/d_lyt_meter_timer.cpp
+12 -16
View File
@@ -1,3 +1,5 @@
#define NEED_DIRECT_FRAMECTRL_ACCESS 1
#include "d/lyt/meter/d_lyt_meter_timer.h"
#include "common.h"
@@ -612,6 +614,14 @@ void LytMeterTimerPart2_c::initOutAnim() {
mAnm[TIMER_02_ANIM_OUT].setAnimEnable(false);
}
void LytMeterTimerPart2_c::initChangeFruitAnim() {
mAnm[TIMER_02_ANIM_CHANGE_FRUIT].setForwardOnce();
mAnm[TIMER_02_ANIM_CHANGE_FRUIT].setFrame(0.0f);
mAnm[TIMER_02_ANIM_CHANGE_FRUIT].setAnimEnable(true);
mLyt.calc();
mAnm[TIMER_02_ANIM_CHANGE_FRUIT].setAnimEnable(false);
}
void LytMeterTimerPart2_c::startInAnim() {
if (dLytMeterContainer_c::GetMeter()->fn_800D5650()) {
mAnm[TIMER_02_ANIM_MAP_POSITION].setFrame(1.0f);
@@ -626,14 +636,6 @@ void LytMeterTimerPart2_c::startInAnim() {
mAnm[TIMER_02_ANIM_IN].setAnimEnable(true);
}
void LytMeterTimerPart2_c::initChangeFruitAnim() {
mAnm[TIMER_02_ANIM_CHANGE_FRUIT].setForwardOnce();
mAnm[TIMER_02_ANIM_CHANGE_FRUIT].setFrame(0.0f);
mAnm[TIMER_02_ANIM_CHANGE_FRUIT].setAnimEnable(true);
mLyt.calc();
mAnm[TIMER_02_ANIM_CHANGE_FRUIT].setAnimEnable(false);
}
void LytMeterTimerPart2_c::enableBloomAnim() {
mAnm[TIMER_02_ANIM_BLOOM].setAnimEnable(true);
}
@@ -741,14 +743,8 @@ void LytMeterTimerPart2_c::syncTimeWithSafe() {
if (time == 0) {
time = 2000;
}
// FPR regswap between 2000.0f and cast constant
// Not sure why the cast needs to be pulled out here
// This way works in other functions, but breaks instructions in this case
// f32 loopFrame = duration - (time / 2000.0f) * duration;
f32 fTime = time;
f32 loopFrame = duration - (fTime / 2000.0f) * duration;
f32 safeDuration = mAnm[TIMER_02_ANIM_SIREN_SAFE].getAnimDuration() - 1.0f;
f32 loopFrame = duration - (time / 2000.0f) * duration;
f32 safeDuration = mAnm[TIMER_02_ANIM_SIREN_SAFE].getFrameCtrl()->mEndFrame - 1.0f;
f32 finalFrame = loopFrame;
if (safeDuration < finalFrame) {
finalFrame = finalFrame - safeDuration;