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

Merge pull request #252 from lioncash/resize2 

CRumbleVoice: Resize vectors within constructor initializer list
This commit is contained in:
Luke Street 2020-03-18 01:09:09 -04:00 committed by GitHub
parent 92c9ec02e5 488e377374
commit f6e2f196ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Runtime/Input/CRumbleVoice.cpp
View File

@ -2,9 +2,7 @@
namespace urde { namespace urde {
CRumbleVoice::CRumbleVoice() { CRumbleVoice::CRumbleVoice() : x0_datas(4), x10_deltas(4, SAdsrDelta::Stopped()) {
x0_datas.resize(4);
x10_deltas.resize(4, SAdsrDelta::Stopped());
x20_handleIds.resize(4); x20_handleIds.resize(4);
} }
@ -24,16 +22,17 @@ bool CRumbleVoice::OwnsSustained(s16 handle) const {
} }
s16 CRumbleVoice::GetFreeChannel() const { s16 CRumbleVoice::GetFreeChannel() const {
for (s16 i = 0; i < 4; ++i) for (s16 i = 0; i < 4; ++i) {
if (!((1 << i) & x2c_usedChannels)) if (!((1 << i) & x2c_usedChannels)) {
return i; return i;
return false; }
}
return 0;
} }
float CRumbleVoice::GetIntensity() const { float CRumbleVoice::GetIntensity() const {
return std::min(2.f, std::max(x10_deltas[0].x0_curIntensity, return std::min(2.f, std::max({x10_deltas[0].x0_curIntensity, x10_deltas[1].x0_curIntensity,
std::max(x10_deltas[1].x0_curIntensity, x10_deltas[2].x0_curIntensity, x10_deltas[3].x0_curIntensity}));
std::max(x10_deltas[2].x0_curIntensity, x10_deltas[3].x0_curIntensity))));
} }
bool CRumbleVoice::UpdateChannel(SAdsrDelta& delta, const SAdsrData& data, float dt) { bool CRumbleVoice::UpdateChannel(SAdsrDelta& delta, const SAdsrData& data, float dt) {