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

CDrone: PathFind fixes

This commit is contained in:
Luke Street 2020-09-13 19:55:20 -04:00
parent 3780671ff6
commit 754321314e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -476,7 +476,7 @@ void CDrone::Patrol(CStateManager& mgr, EStateMsg msg, float dt) {
void CDrone::PathFind(CStateManager& mgr, EStateMsg msg, float dt) { void CDrone::PathFind(CStateManager& mgr, EStateMsg msg, float dt) {
if (msg == EStateMsg::Activate) { if (msg == EStateMsg::Activate) {
zeus::CVector3f searchOff = GetTranslation() + zeus::CVector3f{0.f, 0.f, x664_}; auto searchOff = GetDestPos();
CPathFindSearch::EResult res = GetSearchPath()->Search(GetTranslation(), searchOff); CPathFindSearch::EResult res = GetSearchPath()->Search(GetTranslation(), searchOff);
if (res != CPathFindSearch::EResult::Success && if (res != CPathFindSearch::EResult::Success &&
(res == CPathFindSearch::EResult::NoDestPoint || res == CPathFindSearch::EResult::NoPath)) { (res == CPathFindSearch::EResult::NoDestPoint || res == CPathFindSearch::EResult::NoPath)) {
@ -486,7 +486,9 @@ void CDrone::PathFind(CStateManager& mgr, EStateMsg msg, float dt) {
SetDestPos(searchOff); SetDestPos(searchOff);
} }
} }
x834_30_visible = true; if (x3fc_flavor == CPatterned::EFlavorType::One) {
x834_30_visible = true;
}
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
CPatterned::PathFind(mgr, msg, dt); CPatterned::PathFind(mgr, msg, dt);
x450_bodyController->GetCommandMgr().BlendSteeringCmds(); x450_bodyController->GetCommandMgr().BlendSteeringCmds();
@ -494,9 +496,9 @@ void CDrone::PathFind(CStateManager& mgr, EStateMsg msg, float dt) {
if (moveVec.canBeNormalized()) { if (moveVec.canBeNormalized()) {
moveVec.normalize(); moveVec.normalize();
ApplyImpulseWR(GetMass() * (x5e4_ * moveVec), {}); ApplyImpulseWR(GetMass() * (x5e4_ * moveVec), {});
zeus::CVector3f target = (mgr.GetPlayer().GetAimPosition(mgr, 0.f) - GetTranslation()); const auto target = (mgr.GetPlayer().GetAimPosition(mgr, 0.f) - GetTranslation()).normalized();
x450_bodyController->GetCommandMgr().DeliverCmd( x450_bodyController->GetCommandMgr().DeliverCmd(
CBCLocomotionCmd(FLT_EPSILON * GetTransform().basis[1], target.normalized(), 1.f)); CBCLocomotionCmd(FLT_EPSILON * GetTransform().frontVector(), target, 1.f));
x450_bodyController->GetCommandMgr().DeliverTargetVector(target); x450_bodyController->GetCommandMgr().DeliverTargetVector(target);
StrafeFromCompanions(mgr); StrafeFromCompanions(mgr);
if (x630_ <= 0.f) { if (x630_ <= 0.f) {