AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 09:47: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

6
Runtime/World/CPhysicsActor.hpp
View File

@@ -99,7 +99,7 @@ protected:
CCollidableAABox x1c0_collisionPrimitive;
zeus::CVector3f x1e8_primitiveOffset;
CMotionState x1f4_lastNonCollidingState;
rstl::optional<zeus::CVector3f> x228_lastFloorPlaneNormal;
std::optional<zeus::CVector3f> x228_lastFloorPlaneNormal;
float x238_maximumCollisionVelocity = 1000000.0f;
float x23c_stepUpHeight;
float x240_stepDownHeight;
@@ -186,10 +186,10 @@ public:
void SetNumTicksPartialUpdate(u32 t) { x250_numTicksPartialUpdate = t; }
u32 GetNumTicksStuck() const { return x24c_numTicksStuck; }
void SetNumTicksStuck(u32 t) { x24c_numTicksStuck = t; }
const rstl::optional<zeus::CVector3f>& GetLastFloorPlaneNormal() const {
const std::optional<zeus::CVector3f>& GetLastFloorPlaneNormal() const {
return x228_lastFloorPlaneNormal;
}
void SetLastFloorPlaneNormal(const rstl::optional<zeus::CVector3f>& n) { x228_lastFloorPlaneNormal = n; }
void SetLastFloorPlaneNormal(const std::optional<zeus::CVector3f>& n) { x228_lastFloorPlaneNormal = n; }
CMotionState PredictMotion_Internal(float) const;
CMotionState PredictMotion(float dt) const;