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

CActorContraption fixes, better CMake dependency handling

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

View File

@@ -30,12 +30,12 @@ public:
float x30_wallElasticConstant;
float x34_wallElasticLinear;
float x38_maxPositiveVerticalVelocity;
rstl::optional<zeus::CVector3f> x3c_floorPlaneNormal;
std::optional<zeus::CVector3f> x3c_floorPlaneNormal;
};
struct SMoveObjectResult {
rstl::optional<TUniqueId> x0_id;
rstl::optional<CCollisionInfo> x8_collision;
std::optional<TUniqueId> x0_id;
std::optional<CCollisionInfo> x8_collision;
u32 x6c_processedCollisions;
float x70_processedDt;
};