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

CScriptActor: Brace statements where applicable 

Makes the code consistent.
This commit is contained in:
Lioncash 2020-05-07 08:14:39 -04:00
parent 63fda8f1c7
commit c81d6632bb
2 changed files with 52 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
Runtime/World/CScriptActor.cpp
View File

@ -35,11 +35,13 @@ CScriptActor::CScriptActor(TUniqueId uid, std::string_view name, const CEntityIn
x2e2_30_scaleAdvancementDelta = scaleAdvancementDelta; x2e2_30_scaleAdvancementDelta = scaleAdvancementDelta;
x2e2_31_materialFlag54 = materialFlag54; x2e2_31_materialFlag54 = materialFlag54;
if (x64_modelData && (x64_modelData->HasAnimData() || x64_modelData->HasNormalModel()) && castsShadow) if (x64_modelData && (x64_modelData->HasAnimData() || x64_modelData->HasNormalModel()) && castsShadow) {
CreateShadow(true); CreateShadow(true);
}
if (x64_modelData && x64_modelData->HasAnimData()) if (x64_modelData && x64_modelData->HasAnimData()) {
x64_modelData->EnableLooping(looping); x64_modelData->EnableLooping(looping);
}
x150_momentum = zeus::CVector3f(0.f, 0.f, zMomentum); x150_momentum = zeus::CVector3f(0.f, 0.f, zMomentum);
} }
@ -50,10 +52,11 @@ void CScriptActor::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CSta
switch (msg) { switch (msg) {
case EScriptObjectMessage::InitializedInArea: case EScriptObjectMessage::InitializedInArea:
for (const SConnection& conn : x20_conns) { for (const SConnection& conn : x20_conns) {
if (conn.x0_state != EScriptObjectState::InheritBounds || conn.x4_msg != EScriptObjectMessage::Activate) if (conn.x0_state != EScriptObjectState::InheritBounds || conn.x4_msg != EScriptObjectMessage::Activate) {
continue; continue;
}
auto search = mgr.GetIdListForScript(conn.x8_objId); const auto search = mgr.GetIdListForScript(conn.x8_objId);
for (auto it = search.first; it != search.second; ++it) { for (auto it = search.first; it != search.second; ++it) {
if (TCastToConstPtr<CScriptTrigger>(mgr.GetObjectById(it->second))) { if (TCastToConstPtr<CScriptTrigger>(mgr.GetObjectById(it->second))) {
x2e0_triggerId = it->second; x2e0_triggerId = it->second;
@ -62,8 +65,9 @@ void CScriptActor::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CSta
} }
} }
if (x2e2_31_materialFlag54) if (x2e2_31_materialFlag54) {
CActor::AddMaterial(EMaterialTypes::Unknown54, mgr); CActor::AddMaterial(EMaterialTypes::Unknown54, mgr);
}
break; break;
case EScriptObjectMessage::Reset: case EScriptObjectMessage::Reset:
x2e2_25_dead = false; x2e2_25_dead = false;
@ -86,23 +90,25 @@ void CScriptActor::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CSta
} }
void CScriptActor::Think(float dt, CStateManager& mgr) { void CScriptActor::Think(float dt, CStateManager& mgr) {
if (!GetActive()) if (!GetActive()) {
return; return;
}
if (HasModelData() && x64_modelData->HasAnimData()) { if (HasModelData() && x64_modelData->HasAnimData()) {
bool timeRemaining = x64_modelData->GetAnimationData()->IsAnimTimeRemaining(dt - FLT_EPSILON, "Whole Body"); const bool timeRemaining = x64_modelData->GetAnimationData()->IsAnimTimeRemaining(dt - FLT_EPSILON, "Whole Body");
bool loop = x64_modelData->GetIsLoop(); const bool loop = x64_modelData->GetIsLoop();
SAdvancementDeltas deltas = CActor::UpdateAnimation(dt, mgr, true); const SAdvancementDeltas deltas = CActor::UpdateAnimation(dt, mgr, true);
if (timeRemaining || loop) { if (timeRemaining || loop) {
x2e2_26_animating = true; x2e2_26_animating = true;
if (x2e2_30_scaleAdvancementDelta) if (x2e2_30_scaleAdvancementDelta) {
MoveToOR(x34_transform.rotate(x64_modelData->GetScale() * x34_transform.transposeRotate(deltas.x0_posDelta)), MoveToOR(x34_transform.rotate(x64_modelData->GetScale() * x34_transform.transposeRotate(deltas.x0_posDelta)),
dt); dt);
else } else {
MoveToOR(deltas.x0_posDelta, dt); MoveToOR(deltas.x0_posDelta, dt);
}
//if (TCastToPtr<MP1::CActorContraption>(this)) //if (TCastToPtr<MP1::CActorContraption>(this))
//printf("DEL %f\n", zeus::radToDeg(zeus::CEulerAngles(deltas.xc_rotDelta).z())); //printf("DEL %f\n", zeus::radToDeg(zeus::CEulerAngles(deltas.xc_rotDelta).z()));
@ -125,43 +131,49 @@ void CScriptActor::Think(float dt, CStateManager& mgr) {
void CScriptActor::PreRender(CStateManager& mgr, const zeus::CFrustum& frustum) { void CScriptActor::PreRender(CStateManager& mgr, const zeus::CFrustum& frustum) {
CActor::PreRender(mgr, frustum); CActor::PreRender(mgr, frustum);
if (xe4_30_outOfFrustum && TCastToPtr<CCinematicCamera>(mgr.GetCameraManager()->GetCurrentCamera(mgr))) if (xe4_30_outOfFrustum && TCastToConstPtr<CCinematicCamera>(mgr.GetCameraManager()->GetCurrentCamera(mgr))) {
xe4_30_outOfFrustum = false; xe4_30_outOfFrustum = false;
}
if (!xe4_30_outOfFrustum && x2e2_29_processModelFlags) { if (!xe4_30_outOfFrustum && x2e2_29_processModelFlags) {
if (x2e2_27_xrayAlphaEnabled) { if (x2e2_27_xrayAlphaEnabled) {
zeus::CColor col(1.f, x2dc_xrayAlpha); const zeus::CColor col(1.f, x2dc_xrayAlpha);
CModelFlags xrayFlags(5, 0, 3, col); const CModelFlags xrayFlags(5, 0, 3, col);
if (mgr.GetPlayerState()->GetActiveVisor(mgr) == CPlayerState::EPlayerVisor::XRay) { if (mgr.GetPlayerState()->GetActiveVisor(mgr) == CPlayerState::EPlayerVisor::XRay) {
xb4_drawFlags = xrayFlags; xb4_drawFlags = xrayFlags;
x2e2_28_inXrayAlpha = true; x2e2_28_inXrayAlpha = true;
} else if (x2e2_28_inXrayAlpha) { } else if (x2e2_28_inXrayAlpha) {
x2e2_28_inXrayAlpha = false; x2e2_28_inXrayAlpha = false;
if (xb4_drawFlags == xrayFlags) if (xb4_drawFlags == xrayFlags) {
xb4_drawFlags = CModelFlags(0, 0, 3, zeus::skWhite); xb4_drawFlags = CModelFlags(0, 0, 3, zeus::skWhite);
}
} }
} }
if (x2e2_24_noThermalHotZ && xe6_27_thermalVisorFlags == 2) { if (x2e2_24_noThermalHotZ && xe6_27_thermalVisorFlags == 2) {
if (mgr.GetPlayerState()->GetActiveVisor(mgr) == CPlayerState::EPlayerVisor::Thermal) if (mgr.GetPlayerState()->GetActiveVisor(mgr) == CPlayerState::EPlayerVisor::Thermal) {
xb4_drawFlags.x2_flags &= ~3; // Disable Z test/update xb4_drawFlags.x2_flags &= ~3; // Disable Z test/update
else } else {
xb4_drawFlags.x2_flags |= 3; // Enable Z test/update xb4_drawFlags.x2_flags |= 3; // Enable Z test/update
}
} }
if (x2d8_shaderIdx != 0) if (x2d8_shaderIdx != 0) {
xb4_drawFlags.x1_matSetIdx = u8(x2d8_shaderIdx); xb4_drawFlags.x1_matSetIdx = u8(x2d8_shaderIdx);
}
} }
if (mgr.GetObjectById(x2e0_triggerId) == nullptr) if (mgr.GetObjectById(x2e0_triggerId) == nullptr) {
x2e0_triggerId = kInvalidUniqueId; x2e0_triggerId = kInvalidUniqueId;
}
} }
zeus::CAABox CScriptActor::GetSortingBounds(const CStateManager& mgr) const { zeus::CAABox CScriptActor::GetSortingBounds(const CStateManager& mgr) const {
if (x2e0_triggerId != kInvalidUniqueId) { if (x2e0_triggerId != kInvalidUniqueId) {
TCastToConstPtr<CScriptTrigger> trigger(mgr.GetObjectById(x2e0_triggerId)); const TCastToConstPtr<CScriptTrigger> trigger(mgr.GetObjectById(x2e0_triggerId));
if (trigger) if (trigger) {
return trigger->GetTriggerBoundsWR(); return trigger->GetTriggerBoundsWR();
}
} }
return CActor::GetSortingBounds(mgr); return CActor::GetSortingBounds(mgr);
@ -173,9 +185,10 @@ EWeaponCollisionResponseTypes CScriptActor::GetCollisionResponseType(const zeus:
EProjectileAttrib w) const { EProjectileAttrib w) const {
const CDamageVulnerability* dVuln = GetDamageVulnerability(); const CDamageVulnerability* dVuln = GetDamageVulnerability();
if (dVuln->GetVulnerability(wMode, false) == EVulnerability::Deflect) { if (dVuln->GetVulnerability(wMode, false) == EVulnerability::Deflect) {
EDeflectType deflectType = dVuln->GetDeflectionType(wMode); const EDeflectType deflectType = dVuln->GetDeflectionType(wMode);
if (deflectType < EDeflectType::Four && deflectType >= EDeflectType::One) if (deflectType < EDeflectType::Four && deflectType >= EDeflectType::One) {
return EWeaponCollisionResponseTypes::Unknown15; return EWeaponCollisionResponseTypes::Unknown15;
}
} }
return CActor::GetCollisionResponseType(v1, v2, wMode, w); return CActor::GetCollisionResponseType(v1, v2, wMode, w);
} }

25
Runtime/World/CScriptActorKeyframe.cpp
View File

@ -28,12 +28,14 @@ void CScriptActorKeyframe::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId u
if (GetActive()) { if (GetActive()) {
if (!x44_25_isPassive) { if (!x44_25_isPassive) {
for (const SConnection& conn : x20_conns) { for (const SConnection& conn : x20_conns) {
if (conn.x0_state != EScriptObjectState::Play || conn.x4_msg != EScriptObjectMessage::Play) if (conn.x0_state != EScriptObjectState::Play || conn.x4_msg != EScriptObjectMessage::Play) {
continue; continue;
}
auto search = mgr.GetIdListForScript(conn.x8_objId); const auto search = mgr.GetIdListForScript(conn.x8_objId);
for (auto it = search.first; it != search.second; ++it) for (auto it = search.first; it != search.second; ++it) {
UpdateEntity(it->second, mgr); UpdateEntity(it->second, mgr);
}
} }
} }
@ -62,19 +64,23 @@ void CScriptActorKeyframe::Think(float dt, CStateManager& mgr) {
x44_28_playing = false; x44_28_playing = false;
for (const SConnection& conn : x20_conns) { for (const SConnection& conn : x20_conns) {
if (conn.x0_state != EScriptObjectState::Play || conn.x4_msg != EScriptObjectMessage::Play) if (conn.x0_state != EScriptObjectState::Play || conn.x4_msg != EScriptObjectMessage::Play) {
continue; continue;
}
CEntity* ent = mgr.ObjectById(mgr.GetIdForScript(conn.x8_objId)); CEntity* ent = mgr.ObjectById(mgr.GetIdForScript(conn.x8_objId));
if (TCastToPtr<CScriptActor> act = ent) { if (const TCastToPtr<CScriptActor> act = ent) {
if (act->HasModelData() && act->GetModelData()->HasAnimData()) { if (act->HasModelData() && act->GetModelData()->HasAnimData()) {
CAnimData* animData = act->GetModelData()->GetAnimationData(); CAnimData* animData = act->GetModelData()->GetAnimationData();
if (animData->IsAdditiveAnimation(x34_animationId)) if (animData->IsAdditiveAnimation(x34_animationId)) {
animData->DelAdditiveAnimation(x34_animationId); animData->DelAdditiveAnimation(x34_animationId);
}
if (animData->GetDefaultAnimation() == x34_animationId) if (animData->GetDefaultAnimation() == x34_animationId) {
animData->EnableLooping(false); animData->EnableLooping(false);
}
} }
} else if (TCastToPtr<CPatterned> ai = ent) { } else if (const TCastToPtr<CPatterned> ai = ent) {
CAnimData* animData = ai->GetModelData()->GetAnimationData(); CAnimData* animData = ai->GetModelData()->GetAnimationData();
if (animData->IsAdditiveAnimation(x34_animationId)) { if (animData->IsAdditiveAnimation(x34_animationId)) {
animData->DelAdditiveAnimation(x34_animationId); animData->DelAdditiveAnimation(x34_animationId);
@ -98,8 +104,9 @@ void CScriptActorKeyframe::UpdateEntity(TUniqueId uid, CStateManager& mgr) {
} }
if (act) { if (act) {
if (!act->GetActive()) if (!act->GetActive()) {
mgr.SendScriptMsg(act, GetUniqueId(), EScriptObjectMessage::Activate); mgr.SendScriptMsg(act, GetUniqueId(), EScriptObjectMessage::Activate);
}
act->SetDrawFlags({0, 0, 3, zeus::skWhite}); act->SetDrawFlags({0, 0, 3, zeus::skWhite});
if (act->HasModelData() && act->GetModelData()->HasAnimData()) { if (act->HasModelData() && act->GetModelData()->HasAnimData()) {
CAnimData* animData = act->GetModelData()->GetAnimationData(); CAnimData* animData = act->GetModelData()->GetAnimationData();