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

Merge branch 'master' of ssh+git://git.axiodl.com:6431/AxioDL/urde

This commit is contained in:
Phillip Stephens 2020-04-13 00:48:15 -07:00
parent 6838515d3d 7d6e466b68
commit 5aae402149
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Runtime/Input/CRumbleGenerator.cpp
View File

@ -24,8 +24,9 @@ void CRumbleGenerator::Update(float dt) {
if (!b_tp) { if (!b_tp) {
b_tp = true; b_tp = true;
s_tp = now; s_tp = now;
} else } else {
ms = std::chrono::duration_cast<std::chrono::milliseconds>(now - s_tp).count(); ms = std::chrono::duration_cast<std::chrono::milliseconds>(now - s_tp).count();
}
#endif #endif
if (!xf0_24_disabled) { if (!xf0_24_disabled) {
@ -38,7 +39,7 @@ void CRumbleGenerator::Update(float dt) {
if (xe0_commandArray[i] != EMotorState::Stop) { if (xe0_commandArray[i] != EMotorState::Stop) {
#if PWM_MONITOR #if PWM_MONITOR
s_tp = now; s_tp = now;
printf("%lldms ON\n", ms); fmt::print(FMT_STRING("{}ms ON\n"), ms);
#endif #endif
xe0_commandArray[i] = EMotorState::Stop; xe0_commandArray[i] = EMotorState::Stop;
updated = true; updated = true;
@ -50,7 +51,7 @@ void CRumbleGenerator::Update(float dt) {
if (xe0_commandArray[i] != EMotorState::Rumble) { if (xe0_commandArray[i] != EMotorState::Rumble) {
#if PWM_MONITOR #if PWM_MONITOR
s_tp = now; s_tp = now;
printf("%lldms Off\n", ms); fmt::print(FMT_STRING("{}ms Off\n"), ms);
#endif #endif
xe0_commandArray[i] = EMotorState::Rumble; xe0_commandArray[i] = EMotorState::Rumble;
updated = true; updated = true;
@ -62,7 +63,7 @@ void CRumbleGenerator::Update(float dt) {
if (xe0_commandArray[i] != EMotorState::Stop) { if (xe0_commandArray[i] != EMotorState::Stop) {
#if PWM_MONITOR #if PWM_MONITOR
s_tp = now; s_tp = now;
printf("%lldms ON\n", ms); fmt::print(FMT_STRING("{}ms ON\n"), ms);
#endif #endif
xe0_commandArray[i] = EMotorState::Stop; xe0_commandArray[i] = EMotorState::Stop;
updated = true; updated = true;

10
Runtime/Particle/CDecalManager.cpp
View File

@ -21,8 +21,9 @@ void CDecalManager::Initialize() {
return; return;
m_DecalPool.clear(); m_DecalPool.clear();
for (int i = 0; i < 64; ++i) for (int i = 0; i < 64; ++i) {
m_DecalPool.emplace_back(std::optional<CDecal>{}, 0, i - 1, false); m_DecalPool.emplace_back(std::nullopt, 0, i - 1, false);
}
m_FreeIndex = 63; m_FreeIndex = 63;
m_PoolInitialized = true; m_PoolInitialized = true;
@ -39,8 +40,9 @@ void CDecalManager::Reinitialize() {
Initialize(); Initialize();
m_DecalPool.clear(); m_DecalPool.clear();
for (int i = 0; i < 64; ++i) for (int i = 0; i < 64; ++i) {
m_DecalPool.emplace_back(std::optional<CDecal>{}, 0, i - 1, false); m_DecalPool.emplace_back(std::nullopt, 0, i - 1, false);
}
m_ActiveIndexList.clear(); m_ActiveIndexList.clear();