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

CRumbleVoice: Make SAdsrDelta interface constexpr 

Makes the API consistent between SAdsrData and SAdsrDelta.
This commit is contained in:
Lioncash 2019-09-10 19:11:07 -04:00
parent 6ca5143b15
commit d7493d5920
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/Input/CRumbleVoice.hpp
View File

@ -59,17 +59,17 @@ struct SAdsrDelta {
float x8_decayTime = 0.f;
float xc_releaseTime = 0.f;
float x10_autoReleaseTime = 0.f;
float x14_attackIntensity;
float x18_sustainIntensity;
float x14_attackIntensity = 0.f;
float x18_sustainIntensity = 0.f;
ERumblePriority x1c_priority;
EPhase x20_phase;
SAdsrDelta(EPhase phase, ERumblePriority priority)
constexpr SAdsrDelta(EPhase phase, ERumblePriority priority) noexcept
: x0_curIntensity(phase == EPhase::PrePulse ? 2.f : 0.f), x1c_priority(priority), x20_phase(phase) {}
SAdsrDelta(EPhase phase) : x1c_priority(ERumblePriority::None), x20_phase(phase) {}
constexpr SAdsrDelta(EPhase phase) noexcept : x1c_priority(ERumblePriority::None), x20_phase(phase) {}
static SAdsrDelta Stopped() { return SAdsrDelta(EPhase::Stop); }
static SAdsrDelta Start(ERumblePriority priority, bool prePulse) {
static constexpr SAdsrDelta Stopped() noexcept { return SAdsrDelta(EPhase::Stop); }
static constexpr SAdsrDelta Start(ERumblePriority priority, bool prePulse) noexcept {
return SAdsrDelta(prePulse ? EPhase::PrePulse : EPhase::Attack, priority);
}
};