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

Ensure rumble pre-pulse

Browse Source
This commit is contained in:
Jack Andersen
2018-01-26 09:46:35 -10:00
parent 13a31be23b
commit 6f7cd14836
3 changed files with 54 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/Input/CRumbleVoice.hpp
View File

@@ -54,25 +54,25 @@ struct SAdsrDelta
enum class EPhase
{
Stop,
Queued,
PrePulse,
Attack,
Decay,
Sustain,
Release
};
float x0_curLevel = 0.f;
float x0_curIntensity = 0.f;
float x4_attackTime = 0.f;
float x8_decayTime = 0.f;
float xc_releaseTime = 0.f;
float x10_autoReleaseTime = 0.f;
float x14_attackLevel;
float x18_sustainLevel;
float x14_attackIntensity;
float x18_sustainIntensity;
ERumblePriority x1c_priority;
EPhase x20_phase;
SAdsrDelta(EPhase phase, ERumblePriority priority)
: x1c_priority(priority), x20_phase(phase)
: 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)
@@ -80,7 +80,7 @@ struct SAdsrDelta
static SAdsrDelta Stopped() { return SAdsrDelta(EPhase::Stop); }
static SAdsrDelta Start(ERumblePriority priority, bool preQueue)
{ return SAdsrDelta(preQueue ? EPhase::Queued : EPhase::Attack, priority); }
{ return SAdsrDelta(preQueue ? EPhase::PrePulse : EPhase::Attack, priority); }
};
class CRumbleVoice