2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 00:27:42 +00:00

New code style refactor

This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions

View File

@@ -3,99 +3,81 @@
#include "CStateManager.hpp"
#include "TCastTo.hpp"
namespace urde
{
CScriptCoverPoint::CScriptCoverPoint(TUniqueId uid, std::string_view name, const CEntityInfo &info,
zeus::CTransform xf, bool active, u32 flags, bool crouch,
float horizontalAngle, float verticalAngle, float coverTime)
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(),
CMaterialList(EMaterialTypes::NoStepLogic), CActorParameters::None(), kInvalidUniqueId),
xe8_flags(flags),
xf4_coverTime(coverTime)
{
xf8_24_crouch = crouch;
xec_cosHorizontalAngle = std::cos(zeus::degToRad(horizontalAngle) * 0.5f);
xf0_sinVerticalAngle = std::sin(zeus::degToRad(verticalAngle) * 0.5f);
x100_touchBounds.emplace(xf.origin, xf.origin);
namespace urde {
CScriptCoverPoint::CScriptCoverPoint(TUniqueId uid, std::string_view name, const CEntityInfo& info, zeus::CTransform xf,
bool active, u32 flags, bool crouch, float horizontalAngle, float verticalAngle,
float coverTime)
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(EMaterialTypes::NoStepLogic),
CActorParameters::None(), kInvalidUniqueId)
, xe8_flags(flags)
, xf4_coverTime(coverTime) {
xf8_24_crouch = crouch;
xec_cosHorizontalAngle = std::cos(zeus::degToRad(horizontalAngle) * 0.5f);
xf0_sinVerticalAngle = std::sin(zeus::degToRad(verticalAngle) * 0.5f);
x100_touchBounds.emplace(xf.origin, xf.origin);
}
void CScriptCoverPoint::Accept(IVisitor& visitor)
{
visitor.Visit(this);
void CScriptCoverPoint::Accept(IVisitor& visitor) { visitor.Visit(this); }
void CScriptCoverPoint::Think(float delta, CStateManager&) {
if (x11c_timeLeft <= 0.f)
return;
x11c_timeLeft -= delta;
}
void CScriptCoverPoint::Think(float delta, CStateManager&)
{
if (x11c_timeLeft <= 0.f)
return;
x11c_timeLeft -= delta;
std::experimental::optional<zeus::CAABox> CScriptCoverPoint::GetTouchBounds() const {
if (x100_touchBounds)
return x100_touchBounds;
return {};
}
std::experimental::optional<zeus::CAABox> CScriptCoverPoint::GetTouchBounds() const
{
if (x100_touchBounds)
return x100_touchBounds;
return {};
void CScriptCoverPoint::SetInUse(bool inUse) {
xf8_25_inUse = inUse;
if (inUse)
x11c_timeLeft = xf4_coverTime;
}
void CScriptCoverPoint::SetInUse(bool inUse)
{
xf8_25_inUse = inUse;
if (inUse)
x11c_timeLeft = xf4_coverTime;
}
bool CScriptCoverPoint::GetInUse(TUniqueId uid) const
{
if (xf8_25_inUse || x11c_timeLeft > 0.f)
return true;
if (xfa_occupant == kInvalidUniqueId || uid == kInvalidUniqueId || xfa_occupant == uid)
return false;
bool CScriptCoverPoint::GetInUse(TUniqueId uid) const {
if (xf8_25_inUse || x11c_timeLeft > 0.f)
return true;
}
bool CScriptCoverPoint::Blown(const zeus::CVector3f& point) const
{
if (!x30_24_active)
return true;
if (ShouldWallHang())
{
zeus::CVector3f posDif = point - x34_transform.origin;
posDif *= zeus::CVector3f(1.f / posDif.magnitude());
zeus::CVector3f normDif = posDif.normalized();
zeus::CVector3f frontVec = x34_transform.frontVector();
frontVec.normalize();
if (frontVec.dot(normDif) <= GetCosHorizontalAngle() || (posDif.z() * posDif.z()) >= GetSinSqVerticalAngle())
return true;
}
if (xfa_occupant == kInvalidUniqueId || uid == kInvalidUniqueId || xfa_occupant == uid)
return false;
return true;
}
float CScriptCoverPoint::GetSinSqVerticalAngle() const
{
return xf0_sinVerticalAngle * xf0_sinVerticalAngle;
bool CScriptCoverPoint::Blown(const zeus::CVector3f& point) const {
if (!x30_24_active)
return true;
if (ShouldWallHang()) {
zeus::CVector3f posDif = point - x34_transform.origin;
posDif *= zeus::CVector3f(1.f / posDif.magnitude());
zeus::CVector3f normDif = posDif.normalized();
zeus::CVector3f frontVec = x34_transform.frontVector();
frontVec.normalize();
if (frontVec.dot(normDif) <= GetCosHorizontalAngle() || (posDif.z() * posDif.z()) >= GetSinSqVerticalAngle())
return true;
}
return false;
}
void CScriptCoverPoint::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr)
{
CActor::AcceptScriptMsg(msg, uid, mgr);
float CScriptCoverPoint::GetSinSqVerticalAngle() const { return xf0_sinVerticalAngle * xf0_sinVerticalAngle; }
if (msg == EScriptObjectMessage::WorldInitialized)
{
for (const SConnection& con : x20_conns)
if (con.x0_state == EScriptObjectState::Retreat)
{
xfc_retreating = mgr.GetIdForScript(con.x8_objId);
break;
}
}
void CScriptCoverPoint::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) {
CActor::AcceptScriptMsg(msg, uid, mgr);
if (msg == EScriptObjectMessage::WorldInitialized) {
for (const SConnection& con : x20_conns)
if (con.x0_state == EScriptObjectState::Retreat) {
xfc_retreating = mgr.GetIdForScript(con.x8_objId);
break;
}
}
}
}
} // namespace urde