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:
@@ -3,69 +3,62 @@
|
||||
#include "TCastTo.hpp"
|
||||
#include "CStateManager.hpp"
|
||||
|
||||
namespace urde
|
||||
{
|
||||
namespace urde {
|
||||
|
||||
CScriptWaypoint::CScriptWaypoint(TUniqueId uid, std::string_view name, const CEntityInfo& info,
|
||||
const zeus::CTransform& xf, bool active, float speed, float pause,
|
||||
u32 patternTranslate, u32 patternOrient, u32 patternFit, u32 behaviour,
|
||||
u32 behaviourOrient, u32 behaviourModifiers, u32 animation)
|
||||
: CActor(uid, active, name, info, xf, CModelData(), CMaterialList(),
|
||||
CActorParameters::None(), kInvalidUniqueId),
|
||||
xe8_speed(speed), xec_animation(animation), xf0_pause(pause),
|
||||
xf4_patternTranslate(patternTranslate), xf5_patternOrient(patternOrient),
|
||||
xf6_patternFit(patternFit), xf7_behaviour(behaviour),
|
||||
xf8_behaviourOrient(behaviourOrient), xfa_behaviourModifiers(behaviourModifiers)
|
||||
{
|
||||
SetUseInSortedLists(false);
|
||||
SetCallTouch(false);
|
||||
: CActor(uid, active, name, info, xf, CModelData(), CMaterialList(), CActorParameters::None(), kInvalidUniqueId)
|
||||
, xe8_speed(speed)
|
||||
, xec_animation(animation)
|
||||
, xf0_pause(pause)
|
||||
, xf4_patternTranslate(patternTranslate)
|
||||
, xf5_patternOrient(patternOrient)
|
||||
, xf6_patternFit(patternFit)
|
||||
, xf7_behaviour(behaviour)
|
||||
, xf8_behaviourOrient(behaviourOrient)
|
||||
, xfa_behaviourModifiers(behaviourModifiers) {
|
||||
SetUseInSortedLists(false);
|
||||
SetCallTouch(false);
|
||||
}
|
||||
|
||||
void CScriptWaypoint::Accept(IVisitor& visitor)
|
||||
{
|
||||
visitor.Visit(this);
|
||||
void CScriptWaypoint::Accept(IVisitor& visitor) { visitor.Visit(this); }
|
||||
|
||||
void CScriptWaypoint::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr) {
|
||||
CActor::AcceptScriptMsg(msg, sender, mgr);
|
||||
if (GetActive())
|
||||
if (msg == EScriptObjectMessage::Arrived)
|
||||
SendScriptMsgs(EScriptObjectState::Arrived, mgr, EScriptObjectMessage::None);
|
||||
}
|
||||
|
||||
void CScriptWaypoint::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr)
|
||||
{
|
||||
CActor::AcceptScriptMsg(msg, sender, mgr);
|
||||
if (GetActive())
|
||||
if (msg == EScriptObjectMessage::Arrived)
|
||||
SendScriptMsgs(EScriptObjectState::Arrived, mgr, EScriptObjectMessage::None);
|
||||
void CScriptWaypoint::AddToRenderer(const zeus::CFrustum&, const CStateManager&) const {
|
||||
// Empty
|
||||
}
|
||||
|
||||
void CScriptWaypoint::AddToRenderer(const zeus::CFrustum&, const CStateManager&) const
|
||||
{
|
||||
// Empty
|
||||
TUniqueId CScriptWaypoint::FollowWaypoint(CStateManager& mgr) const {
|
||||
for (const SConnection& conn : x20_conns)
|
||||
if (conn.x0_state == EScriptObjectState::Arrived && conn.x4_msg == EScriptObjectMessage::Follow)
|
||||
return mgr.GetIdForScript(conn.x8_objId);
|
||||
return kInvalidUniqueId;
|
||||
}
|
||||
|
||||
TUniqueId CScriptWaypoint::FollowWaypoint(CStateManager& mgr) const
|
||||
{
|
||||
for (const SConnection& conn : x20_conns)
|
||||
if (conn.x0_state == EScriptObjectState::Arrived && conn.x4_msg == EScriptObjectMessage::Follow)
|
||||
return mgr.GetIdForScript(conn.x8_objId);
|
||||
return kInvalidUniqueId;
|
||||
}
|
||||
|
||||
TUniqueId CScriptWaypoint::NextWaypoint(CStateManager& mgr) const
|
||||
{
|
||||
rstl::reserved_vector<TUniqueId, 10> ids;
|
||||
for (const SConnection& conn : x20_conns)
|
||||
{
|
||||
if (conn.x0_state == EScriptObjectState::Arrived && conn.x4_msg == EScriptObjectMessage::Next)
|
||||
{
|
||||
TUniqueId id = mgr.GetIdForScript(conn.x8_objId);
|
||||
if (id != kInvalidUniqueId)
|
||||
if (TCastToConstPtr<CScriptWaypoint> wp = mgr.GetObjectById(id))
|
||||
if (wp->GetActive())
|
||||
ids.push_back(wp->GetUniqueId());
|
||||
}
|
||||
TUniqueId CScriptWaypoint::NextWaypoint(CStateManager& mgr) const {
|
||||
rstl::reserved_vector<TUniqueId, 10> ids;
|
||||
for (const SConnection& conn : x20_conns) {
|
||||
if (conn.x0_state == EScriptObjectState::Arrived && conn.x4_msg == EScriptObjectMessage::Next) {
|
||||
TUniqueId id = mgr.GetIdForScript(conn.x8_objId);
|
||||
if (id != kInvalidUniqueId)
|
||||
if (TCastToConstPtr<CScriptWaypoint> wp = mgr.GetObjectById(id))
|
||||
if (wp->GetActive())
|
||||
ids.push_back(wp->GetUniqueId());
|
||||
}
|
||||
}
|
||||
|
||||
if (ids.size() == 0)
|
||||
return kInvalidUniqueId;
|
||||
if (ids.size() == 0)
|
||||
return kInvalidUniqueId;
|
||||
|
||||
return ids[int(mgr.GetActiveRandom()->Float() * ids.size() * 0.99f)];
|
||||
return ids[int(mgr.GetActiveRandom()->Float() * ids.size() * 0.99f)];
|
||||
}
|
||||
|
||||
}
|
||||
} // namespace urde
|
||||
|
||||
Reference in New Issue
Block a user