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

CAtomicBeta: Make skBombLocators an internal array 

Like with CAtomicAlpha, we can also fully hide this array from external
view by making it internally linked.
This commit is contained in:
Lioncash 2019-10-03 01:32:30 -04:00
parent abe8b9510b
commit 67cd0d44c6
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Runtime/MP1/World/CAtomicBeta.cpp
View File

@ -1,5 +1,7 @@
#include "Runtime/MP1/World/CAtomicBeta.hpp" #include "Runtime/MP1/World/CAtomicBeta.hpp"
#include <array>
#include "Runtime/CSimplePool.hpp" #include "Runtime/CSimplePool.hpp"
#include "Runtime/CStateManager.hpp" #include "Runtime/CStateManager.hpp"
#include "Runtime/GameGlobalObjects.hpp" #include "Runtime/GameGlobalObjects.hpp"
@ -9,7 +11,11 @@
#include "Runtime/World/CPlayer.hpp" #include "Runtime/World/CPlayer.hpp"
namespace urde::MP1 { namespace urde::MP1 {
const std::string_view CAtomicBeta::skBombLocators[3] = {"bomb2_LCTR"sv, "bomb3_LCTR"sv, "bomb4_LCTR"sv}; constexpr std::array skBombLocators{
"bomb2_LCTR"sv,
"bomb3_LCTR"sv,
"bomb4_LCTR"sv,
};
CAtomicBeta::CAtomicBeta(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CAtomicBeta::CAtomicBeta(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
CModelData&& mData, const CActorParameters& actParms, const CPatternedInfo& pInfo, CModelData&& mData, const CActorParameters& actParms, const CPatternedInfo& pInfo,
@ -43,7 +49,7 @@ CAtomicBeta::CAtomicBeta(TUniqueId uid, std::string_view name, const CEntityInfo
void CAtomicBeta::CreateBeams(CStateManager& mgr) { void CAtomicBeta::CreateBeams(CStateManager& mgr) {
const SElectricBeamInfo beamInfo{x600_electricWeapon, 50.f, x634_beamRadius, 10.f, x62c_beamParticle, x630_, x638_}; const SElectricBeamInfo beamInfo{x600_electricWeapon, 50.f, x634_beamRadius, 10.f, x62c_beamParticle, x630_, x638_};
for (u32 i = 0; i < kBombCount; ++i) { for (size_t i = 0; i < kBombCount; ++i) {
x568_projectileIds.push_back(mgr.AllocateUniqueId()); x568_projectileIds.push_back(mgr.AllocateUniqueId());
mgr.AddObject(new CElectricBeamProjectile(x608_, EWeaponType::AI, beamInfo, {}, EMaterialTypes::Character, mgr.AddObject(new CElectricBeamProjectile(x608_, EWeaponType::AI, beamInfo, {}, EMaterialTypes::Character,
x610_projectileDamage, x568_projectileIds[i], GetAreaIdAlways(), x610_projectileDamage, x568_projectileIds[i], GetAreaIdAlways(),
@ -52,17 +58,19 @@ void CAtomicBeta::CreateBeams(CStateManager& mgr) {
} }
void CAtomicBeta::UpdateBeams(CStateManager& mgr, bool fireBeam) { void CAtomicBeta::UpdateBeams(CStateManager& mgr, bool fireBeam) {
if (x574_beamFired == fireBeam) if (x574_beamFired == fireBeam) {
return; return;
}
for (u32 i = 0; i < kBombCount; ++i) { for (size_t i = 0; i < kBombCount; ++i) {
//zeus::CTransform xf = GetTransform() * GetScaledLocatorTransform(skBombLocators[i]); //zeus::CTransform xf = GetTransform() * GetScaledLocatorTransform(skBombLocators[i]);
//zeus::CTransform newXf = zeus::lookAt(xf.origin, xf.origin + xf.basis[1], zeus::skUp); //zeus::CTransform newXf = zeus::lookAt(xf.origin, xf.origin + xf.basis[1], zeus::skUp);
if (CElectricBeamProjectile* proj = static_cast<CElectricBeamProjectile*>(mgr.ObjectById(x568_projectileIds[i]))) { if (auto* const proj = static_cast<CElectricBeamProjectile*>(mgr.ObjectById(x568_projectileIds[i]))) {
if (fireBeam) if (fireBeam) {
proj->Fire(GetTransform() * GetScaledLocatorTransform(skBombLocators[i]), mgr, false); proj->Fire(GetTransform() * GetScaledLocatorTransform(skBombLocators[i]), mgr, false);
else } else {
proj->ResetBeam(mgr, false); proj->ResetBeam(mgr, false);
}
} }
} }
x574_beamFired = fireBeam; x574_beamFired = fireBeam;
@ -127,11 +135,13 @@ void CAtomicBeta::Think(float dt, CStateManager& mgr) {
UpdateOrCreateEmitter(x64c_, x644_, GetTranslation(), 96 / 127.f); UpdateOrCreateEmitter(x64c_, x644_, GetTranslation(), 96 / 127.f);
} }
for (u32 i = 0; i < kBombCount; ++i) { for (size_t i = 0; i < kBombCount; ++i) {
if (CElectricBeamProjectile* proj = static_cast<CElectricBeamProjectile*>(mgr.ObjectById(x568_projectileIds[i]))) { if (auto* const proj = static_cast<CElectricBeamProjectile*>(mgr.ObjectById(x568_projectileIds[i]))) {
if (!proj->GetActive()) if (!proj->GetActive()) {
continue; continue;
zeus::CTransform xf = GetTransform() * GetScaledLocatorTransform(skBombLocators[i]); }
const zeus::CTransform xf = GetTransform() * GetScaledLocatorTransform(skBombLocators[i]);
proj->UpdateFx(zeus::lookAt(xf.origin, xf.origin + xf.basis[1], zeus::skUp), dt, mgr); proj->UpdateFx(zeus::lookAt(xf.origin, xf.origin + xf.basis[1], zeus::skUp), dt, mgr);
} }
} }

1
Runtime/MP1/World/CAtomicBeta.hpp
View File

@ -13,7 +13,6 @@ class CWeaponDescription;
namespace urde::MP1 { namespace urde::MP1 {
class CAtomicBeta final : public CPatterned { class CAtomicBeta final : public CPatterned {
static const std::string_view skBombLocators[3];
static constexpr u32 kBombCount = 3; static constexpr u32 kBombCount = 3;
rstl::reserved_vector<TUniqueId, kBombCount> x568_projectileIds; rstl::reserved_vector<TUniqueId, kBombCount> x568_projectileIds;
bool x574_beamFired = false; bool x574_beamFired = false;