2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-15 07:26:10 +00:00

CActorContraption fixes, better CMake dependency handling

This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions

View File

@@ -55,8 +55,8 @@ void CAtomicBeta::UpdateBeams(CStateManager& mgr, bool fireBeam) {
return;
for (u32 i = 0; i < kBombCount; ++i) {
zeus::CTransform xf = GetTransform() * GetScaledLocatorTransform(skBombLocators[i]);
zeus::CTransform newXf = zeus::lookAt(xf.origin, xf.origin + xf.basis[1], zeus::skUp);
//zeus::CTransform xf = GetTransform() * GetScaledLocatorTransform(skBombLocators[i]);
//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 (fireBeam)
proj->Fire(GetTransform() * GetScaledLocatorTransform(skBombLocators[i]), mgr, false);