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

CDrone: Implement UpdateLasers (sub_80163c40)

This commit is contained in:
Luke Street 2020-09-15 02:14:27 -04:00
parent 803acd9ac6
commit 5f4335c861
2 changed files with 69 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
Runtime/MP1/World/CDrone.cpp
View File

@ -65,7 +65,7 @@ CDrone::CDrone(TUniqueId uid, std::string_view name, EFlavorType flavor, const C
, x664_(f24) , x664_(f24)
, x690_colSphere(zeus::CSphere({0.f, 0.f, 1.8f}, 1.1f), CActor::GetMaterialList()) , x690_colSphere(zeus::CSphere({0.f, 0.f, 1.8f}, 1.1f), CActor::GetMaterialList())
, x6b0_pathFind(nullptr, 3 + int(b1) /* TODO double check */, pInfo.GetPathfindingIndex(), 1.f, 2.4f) , x6b0_pathFind(nullptr, 3 + int(b1) /* TODO double check */, pInfo.GetPathfindingIndex(), 1.f, 2.4f)
, x7cc_(CSfxManager::TranslateSFXID(sId)) , x7cc_laserSfx(CSfxManager::TranslateSFXID(sId))
, x82c_shieldModel(std::make_unique<CModelData>(CStaticRes{aId2, zeus::skOne3f})) , x82c_shieldModel(std::make_unique<CModelData>(CStaticRes{aId2, zeus::skOne3f}))
, x835_25_(b1) { , x835_25_(b1) {
UpdateTouchBounds(pInfo.GetHalfExtent()); UpdateTouchBounds(pInfo.GetHalfExtent());
@ -118,7 +118,7 @@ void CDrone::Think(float dt, CStateManager& mgr) {
} }
if (x824_activeLasers[0] || (x824_activeLasers[1] && IsAlive())) { if (x824_activeLasers[0] || (x824_activeLasers[1] && IsAlive())) {
sub_80163c40(mgr, dt); UpdateLasers(mgr, dt);
UpdateVisorFlare(mgr); UpdateVisorFlare(mgr);
} }
@ -505,6 +505,7 @@ void CDrone::PathFind(CStateManager& mgr, EStateMsg msg, float dt) {
zeus::CVector3f moveVec = x450_bodyController->GetCommandMgr().GetMoveVector(); zeus::CVector3f moveVec = x450_bodyController->GetCommandMgr().GetMoveVector();
if (moveVec.canBeNormalized()) { if (moveVec.canBeNormalized()) {
moveVec.normalize(); moveVec.normalize();
x450_bodyController->GetCommandMgr().ClearLocomotionCmds();
ApplyImpulseWR(GetMass() * (x5e4_ * moveVec), {}); ApplyImpulseWR(GetMass() * (x5e4_ * moveVec), {});
const auto target = (mgr.GetPlayer().GetAimPosition(mgr, 0.f) - GetTranslation()).normalized(); const auto target = (mgr.GetPlayer().GetAimPosition(mgr, 0.f) - GetTranslation()).normalized();
x450_bodyController->GetCommandMgr().DeliverCmd( x450_bodyController->GetCommandMgr().DeliverCmd(
@ -578,28 +579,28 @@ void CDrone::Attack(CStateManager& mgr, EStateMsg msg, float dt) {
} }
s32 state = mgr.GetActiveRandom()->Next() % 4; s32 state = mgr.GetActiveRandom()->Next() % 4;
if (state == 0) { if (state == 0) {
x7e0_[0] = out + (3.f * xf.rightVector()) - (4.f * xf.upVector()); x7e0_lasersStart[0] = out + (3.f * xf.rightVector()) - (4.f * xf.upVector());
x7fc_[0] = out - (3.f * xf.rightVector()) + (4.f * xf.upVector()); x7fc_lasersEnd[0] = out - (3.f * xf.rightVector()) + (4.f * xf.upVector());
x7e0_[1] = out - (3.f * xf.rightVector()) - (4.f * xf.upVector()); x7e0_lasersStart[1] = out - (3.f * xf.rightVector()) - (4.f * xf.upVector());
x7fc_[1] = out + (3.f * xf.rightVector()) + (4.f * xf.upVector()); x7fc_lasersEnd[1] = out + (3.f * xf.rightVector()) + (4.f * xf.upVector());
} else if (state == 1) { } else if (state == 1) {
x7e0_[0] = out + (3.f * xf.rightVector()) + (4.f * xf.upVector()); x7e0_lasersStart[0] = out + (3.f * xf.rightVector()) + (4.f * xf.upVector());
x7fc_[0] = out - (3.f * xf.rightVector()) - (4.f * xf.upVector()); x7fc_lasersEnd[0] = out - (3.f * xf.rightVector()) - (4.f * xf.upVector());
x7e0_[1] = out - (3.f * xf.rightVector()) + (4.f * xf.upVector()); x7e0_lasersStart[1] = out - (3.f * xf.rightVector()) + (4.f * xf.upVector());
x7fc_[1] = out + (3.f * xf.rightVector()) - (4.f * xf.upVector()); x7fc_lasersEnd[1] = out + (3.f * xf.rightVector()) - (4.f * xf.upVector());
} else if (state == 2) { } else if (state == 2) {
x7e0_[0] = out - (4.f * xf.rightVector()) - (3.f * xf.upVector()); x7e0_lasersStart[0] = out - (4.f * xf.rightVector()) - (3.f * xf.upVector());
x7fc_[0] = out + (4.f * xf.rightVector()) + (3.f * xf.upVector()); x7fc_lasersEnd[0] = out + (4.f * xf.rightVector()) + (3.f * xf.upVector());
x7e0_[1] = out + (4.f * xf.rightVector()) - (3.f * xf.upVector()); x7e0_lasersStart[1] = out + (4.f * xf.rightVector()) - (3.f * xf.upVector());
x7fc_[1] = out - (4.f * xf.rightVector()) + (3.f * xf.upVector()); x7fc_lasersEnd[1] = out - (4.f * xf.rightVector()) + (3.f * xf.upVector());
} else if (state == 3) { } else if (state == 3) {
x7e0_[0] = out - (4.f * xf.rightVector()) + (3.f * xf.upVector()); x7e0_lasersStart[0] = out - (4.f * xf.rightVector()) + (3.f * xf.upVector());
x7fc_[0] = out + (4.f * xf.rightVector()) - (3.f * xf.upVector()); x7fc_lasersEnd[0] = out + (4.f * xf.rightVector()) - (3.f * xf.upVector());
x7e0_[1] = out + (4.f * xf.rightVector()) + (3.f * xf.upVector()); x7e0_lasersStart[1] = out + (4.f * xf.rightVector()) + (3.f * xf.upVector());
x7fc_[1] = out - (4.f * xf.rightVector()) - (3.f * xf.upVector()); x7fc_lasersEnd[1] = out - (4.f * xf.rightVector()) - (3.f * xf.upVector());
} }
x818_[0] = 0.f; x818_lasersTime[0] = 0.f;
x818_[1] = 0.f; x818_lasersTime[1] = 0.f;
x835_24_ = true; x835_24_ = true;
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
if (x7c8_ == 0) { if (x7c8_ == 0) {
@ -1066,8 +1067,49 @@ void CDrone::UpdateScanner(CStateManager& mgr, float dt) {
} }
} }
void CDrone::sub_80163c40(CStateManager& mgr, float dt) { void CDrone::UpdateLasers(CStateManager& mgr, float dt) {
// TODO implement constexpr auto matFilter =
CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Solid}, {EMaterialTypes::ProjectilePassthrough});
const auto beaconXf = GetLctrTransform("Beacon_LCTR"sv);
for (size_t i = 0; i < x818_lasersTime.size(); ++i) {
if (x818_lasersTime[i] >= 1.f || !x824_activeLasers[i]) {
continue;
}
x818_lasersTime[i] += dt;
const auto vec =
(x7e0_lasersStart[i] * (1.f - x818_lasersTime[i]) + (x7fc_lasersEnd[i] * x818_lasersTime[i]) - beaconXf.origin)
.normalized();
auto box = zeus::skInvertedBox;
box.accumulateBounds(GetTranslation() + 1000.f * vec);
box.accumulateBounds(GetTranslation());
rstl::reserved_vector<TUniqueId, 1024> nearList;
mgr.BuildNearList(nearList, box, matFilter, nullptr);
TUniqueId id;
const auto result = mgr.RayWorldIntersection(id, beaconXf.origin + 2.f * vec, vec, 10000.f, matFilter, nearList);
if (result.IsInvalid()) {
continue;
}
if (x7d8_laserIds[i] != kInvalidUniqueId) {
if (auto* laser = static_cast<CDroneLaser*>(mgr.ObjectById(x7d8_laserIds[i]))) {
laser->SetTransform(beaconXf);
laser->sub_80167754(mgr, result.GetPoint(), result.GetPlane().normal());
}
}
if (TCastToPtr<CPlayer> player = mgr.ObjectById(id)) {
if (x420_curDamageRemTime <= 0.f) {
mgr.ApplyDamage(GetUniqueId(), player->GetUniqueId(), GetUniqueId(), GetContactDamage(),
CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Solid}, {}), zeus::skZero3f);
x420_curDamageRemTime = x424_damageWaitTime;
mgr.GetPlayerState()->GetStaticInterference().AddSource(GetUniqueId(), 0.3f, 1.f);
CSfxManager::AddEmitter(x7cc_laserSfx, result.GetPoint(), zeus::skZero3f, true, false, 127, GetAreaIdAlways());
}
}
if (id != GetUniqueId() && TCastToPtr<CAi>{mgr.ObjectById(id)}) {
x834_31_attackOver = true;
float rem = GetModelData()->GetAnimationData()->GetAnimTimeRemaining("Whole Body"sv);
UpdateAnimation(rem, mgr, true);
}
}
} }
void CDrone::sub_801633a8(CStateManager& mgr) { void CDrone::sub_801633a8(CStateManager& mgr) {

10
Runtime/MP1/World/CDrone.hpp
View File

@ -72,12 +72,12 @@ class CDrone : public CPatterned {
float x7c0_ = 0.f; float x7c0_ = 0.f;
float x7c4_ = 0.f; float x7c4_ = 0.f;
s32 x7c8_ = 0; s32 x7c8_ = 0;
s16 x7cc_; u16 x7cc_laserSfx;
CSfxHandle x7d0_; CSfxHandle x7d0_;
rstl::reserved_vector<TUniqueId, 2> x7d8_laserIds = {{kInvalidUniqueId, kInvalidUniqueId}}; rstl::reserved_vector<TUniqueId, 2> x7d8_laserIds = {{kInvalidUniqueId, kInvalidUniqueId}};
rstl::reserved_vector<zeus::CVector3f, 2> x7e0_ = {{zeus::skZero3f, zeus::skZero3f}}; rstl::reserved_vector<zeus::CVector3f, 2> x7e0_lasersStart = {{zeus::skZero3f, zeus::skZero3f}};
rstl::reserved_vector<zeus::CVector3f, 2> x7fc_ = {{zeus::skZero3f, zeus::skZero3f}}; rstl::reserved_vector<zeus::CVector3f, 2> x7fc_lasersEnd = {{zeus::skZero3f, zeus::skZero3f}};
rstl::reserved_vector<float, 2> x818_ = {{0.f, 0.f}}; rstl::reserved_vector<float, 2> x818_lasersTime = {{0.f, 0.f}};
rstl::reserved_vector<bool, 2> x824_activeLasers = {{false, false}}; rstl::reserved_vector<bool, 2> x824_activeLasers = {{false, false}};
std::unique_ptr<CModelData> x82c_shieldModel; std::unique_ptr<CModelData> x82c_shieldModel;
u8 x832_a : 3 = 0; u8 x832_a : 3 = 0;
@ -103,7 +103,7 @@ class CDrone : public CPatterned {
void StrafeFromCompanions(CStateManager& mgr); void StrafeFromCompanions(CStateManager& mgr);
void UpdateScanner(CStateManager& mgr, float dt); void UpdateScanner(CStateManager& mgr, float dt);
void sub_80163c40(CStateManager& mgr, float dt); void UpdateLasers(CStateManager& mgr, float dt);
void sub_801633a8(CStateManager& mgr); void sub_801633a8(CStateManager& mgr);
void sub_8015f25c(float dt, CStateManager& mgr); void sub_8015f25c(float dt, CStateManager& mgr);
void sub_8015f158(float dt); void sub_8015f158(float dt);