AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 22:27:43 +00:00
Code Issues Projects Releases Wiki Activity

CActorContraption fixes, better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/World/CScriptSpiderBallWaypoint.hpp
View File

@@ -7,7 +7,7 @@ class CScriptSpiderBallWaypoint : public CActor {
enum class ECheckActiveWaypoint { Check, SkipCheck };
u32 xe8_;
std::vector<TUniqueId> xec_waypoints;
rstl::optional<zeus::CAABox> xfc_aabox;
std::optional<zeus::CAABox> xfc_aabox;
public:
CScriptSpiderBallWaypoint(TUniqueId, std::string_view, const CEntityInfo&, const zeus::CTransform&, bool, u32);
@@ -15,7 +15,7 @@ public:
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Render(const CStateManager& mgr) const { CActor::Render(mgr); }
void AddToRenderer(const zeus::CFrustum&, const CStateManager&) const {}
rstl::optional<zeus::CAABox> GetTouchBounds() const { return xfc_aabox; }
std::optional<zeus::CAABox> GetTouchBounds() const { return xfc_aabox; }
void AccumulateBounds(const zeus::CVector3f& v);
void BuildWaypointListAndBounds(CStateManager& mgr);
void AddPreviousWaypoint(TUniqueId uid);