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

Migrate to new CInputGenerator and rename old

Browse Source
This commit is contained in:
Phillip Stephens
2022-03-22 12:04:57 -07:00
parent 9804543327
commit 42dde9187b
15 changed files with 406 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Runtime/Input/CRumbleGenerator.cpp
View File

@@ -69,17 +69,18 @@ void CRumbleGenerator::Update(float dt) {
}
}
}
if (updated)
g_InputGenerator->ControlAllMotors(xe0_commandArray);
if (updated) {
PADControlAllMotors(reinterpret_cast<const u32*>(xe0_commandArray.data()));
}
}
}
void CRumbleGenerator::HardStopAll() {
static constexpr std::array HardStopCommands{
EMotorState::StopHard,
EMotorState::StopHard,
EMotorState::StopHard,
EMotorState::StopHard,
(u32)EMotorState::StopHard,
(u32)EMotorState::StopHard,
(u32)EMotorState::StopHard,
(u32)EMotorState::StopHard,
};
xc0_periodTime.fill(0.0f);
@@ -89,7 +90,8 @@ void CRumbleGenerator::HardStopAll() {
voice.HardReset();
}
g_InputGenerator->ControlAllMotors(HardStopCommands);
// TODO(phil): switch this to g_InputGenerator->GetContoller()->SetMotorState?
PADControlAllMotors(static_cast<const u32*>(HardStopCommands.data()));
}
s16 CRumbleGenerator::Rumble(const SAdsrData& adsr, float gain, ERumblePriority prio, EIOPort port) {