Skip to content

Commit

Permalink
maintenance
Browse files Browse the repository at this point in the history
  • Loading branch information
W-Drew authored and github-actions[bot] committed Jan 12, 2024
1 parent 7c5df1b commit d8d82ef
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 91 deletions.
2 changes: 2 additions & 0 deletions cmake/sourcelist.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -984,6 +984,7 @@ set(SOURCES
include/RE/H/hkpConstraintData.h
include/RE/H/hkpConstraintInfo.h
include/RE/H/hkpConstraintInstance.h
include/RE/H/hkpConstraintMotor.h
include/RE/H/hkpConstraintOwner.h
include/RE/H/hkpContactListener.h
include/RE/H/hkpContactPointEvent.h
Expand Down Expand Up @@ -1028,6 +1029,7 @@ set(SOURCES
include/RE/H/hkpSimulationIsland.h
include/RE/H/hkpSingleShapeContainer.h
include/RE/H/hkpSolverInfo.h
include/RE/H/hkpSolverResults.h
include/RE/H/hkpSphereRepShape.h
include/RE/H/hkpSphereShape.h
include/RE/H/hkpTypedBroadPhaseHandle.h
Expand Down
164 changes: 82 additions & 82 deletions include/RE/H/hkpConstraintMotor.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,105 +4,105 @@

namespace RE
{
class hkpConstraintMotor : public hkReferencedObject
{
public:
enum class MotorType
{
kInvalid = 0,

kPosition,
kVelocity,
kSpring,
kCallback,

kNUM
};

inline static constexpr auto RTTI = RTTI_hkpConstraintMotor;
class hkpConstraintMotor : public hkReferencedObject
{
public:
enum class MotorType
{
kInvalid = 0,

kPosition,
kVelocity,
kSpring,
kCallback,

kNUM
};

inline static constexpr auto RTTI = RTTI_hkpConstraintMotor;
inline static constexpr auto VTABLE = VTABLE_hkpConstraintMotor;

// members
stl::enumeration<MotorType, uint8_t> type; // 10
};
static_assert(sizeof(hkpConstraintMotor) == 0x18);
// members
stl::enumeration<MotorType, uint8_t> type; // 10
};
static_assert(sizeof(hkpConstraintMotor) == 0x18);

class hkpLimitedForceConstraintMotor : public hkpConstraintMotor
{
public:
inline static constexpr auto RTTI = RTTI_hkpLimitedForceConstraintMotor;
class hkpLimitedForceConstraintMotor : public hkpConstraintMotor
{
public:
inline static constexpr auto RTTI = RTTI_hkpLimitedForceConstraintMotor;
inline static constexpr auto VTABLE = VTABLE_hkpLimitedForceConstraintMotor;

// members
float minForce; // 18
float maxForce; // 1C
};
static_assert(sizeof(hkpLimitedForceConstraintMotor) == 0x20);
// members
float minForce; // 18
float maxForce; // 1C
};
static_assert(sizeof(hkpLimitedForceConstraintMotor) == 0x20);

class hkpPositionConstraintMotor : public hkpLimitedForceConstraintMotor
{
public:
inline static constexpr auto RTTI = RTTI_hkpPositionConstraintMotor;
class hkpPositionConstraintMotor : public hkpLimitedForceConstraintMotor
{
public:
inline static constexpr auto RTTI = RTTI_hkpPositionConstraintMotor;
inline static constexpr auto VTABLE = VTABLE_hkpPositionConstraintMotor;

// members
float tau; // 20
float damping; // 24
float proportionalRecoveryVelocity; // 28
float constantRecoveryVelocity; // 2C
};
static_assert(sizeof(hkpPositionConstraintMotor) == 0x30);

class hkpVelocityConstraintMotor : public hkpLimitedForceConstraintMotor
{
public:
inline static constexpr auto RTTI = RTTI_hkpVelocityConstraintMotor;
// members
float tau; // 20
float damping; // 24
float proportionalRecoveryVelocity; // 28
float constantRecoveryVelocity; // 2C
};
static_assert(sizeof(hkpPositionConstraintMotor) == 0x30);

class hkpVelocityConstraintMotor : public hkpLimitedForceConstraintMotor
{
public:
inline static constexpr auto RTTI = RTTI_hkpVelocityConstraintMotor;
inline static constexpr auto VTABLE = VTABLE_hkpVelocityConstraintMotor;

// members
float tau; // 20
float targetVelocity; // 24
bool useConstraintTarget; // 28
};
static_assert(sizeof(hkpVelocityConstraintMotor) == 0x30);

class hkpSpringDamperConstraintMotor : public hkpLimitedForceConstraintMotor
{
public:
inline static constexpr auto RTTI = RTTI_hkpSpringDamperConstraintMotor;
// members
float tau; // 20
float targetVelocity; // 24
bool useConstraintTarget; // 28
};
static_assert(sizeof(hkpVelocityConstraintMotor) == 0x30);

class hkpSpringDamperConstraintMotor : public hkpLimitedForceConstraintMotor
{
public:
inline static constexpr auto RTTI = RTTI_hkpSpringDamperConstraintMotor;
inline static constexpr auto VTABLE = VTABLE_hkpSpringDamperConstraintMotor;

// members
float springConstant; // 20
float springDamping; // 24
};
static_assert(sizeof(hkpSpringDamperConstraintMotor) == 0x28);
// members
float springConstant; // 20
float springDamping; // 24
};
static_assert(sizeof(hkpSpringDamperConstraintMotor) == 0x28);

class hkpCallbackConstraintMotor : public hkpLimitedForceConstraintMotor
{
public:
enum class CallbackType
{
kUnk = 0,
class hkpCallbackConstraintMotor : public hkpLimitedForceConstraintMotor
{
public:
enum class CallbackType
{
kUnk = 0,

kUser0,
kUser1,
kUser2,
kUser0,
kUser1,
kUser2,

kNUM
};
kNUM
};

inline static constexpr auto RTTI = RTTI_hkpCallbackConstraintMotor;
inline static constexpr auto RTTI = RTTI_hkpCallbackConstraintMotor;
inline static constexpr auto VTABLE = VTABLE_hkpCallbackConstraintMotor;

using CallbackFunction = void(const hkpCallbackConstraintMotor& motor, const void* unk0, void* unk1);
using CallbackFunction = void(const hkpCallbackConstraintMotor& motor, const void* unk0, void* unk1);

// members
CallbackFunction* func; // 20
stl::enumeration<CallbackType, std::uint32_t> callbackType; // 28
std::uint64_t userData0; // 30
std::uint64_t userData1; // 38
std::uint64_t userData2; // 40
};
static_assert(sizeof(hkpCallbackConstraintMotor) == 0x48);
// members
CallbackFunction* func; // 20
stl::enumeration<CallbackType, std::uint32_t> callbackType; // 28
std::uint64_t userData0; // 30
std::uint64_t userData1; // 38
std::uint64_t userData2; // 40
};
static_assert(sizeof(hkpCallbackConstraintMotor) == 0x48);
}
2 changes: 1 addition & 1 deletion include/RE/H/hkpLimitedHingeConstraintData.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace RE
inline float getCurrentAngle()
{
return solverResults[SolverResultType::kLimit].data * -1.f;
}
}

hkpSolverResults solverResults[SolverResultType::kNUM]; // 00
bool previousTargetInitialized; // 40
Expand Down
2 changes: 1 addition & 1 deletion include/RE/H/hkpRagdollConstraintData.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace RE
kTwist,
kCone,
kPlane,

kLinear0,
kLinear1,
kLinear2,
Expand Down
14 changes: 7 additions & 7 deletions include/RE/H/hkpSolverResults.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
namespace RE
{

class hkpSolverResults
{
public:
float impulse; // 00
float data; // 04
};
static_assert(sizeof(hkpSolverResults) == 0x08);
class hkpSolverResults
{
public:
float impulse; // 00
float data; // 04
};
static_assert(sizeof(hkpSolverResults) == 0x08);

}

0 comments on commit d8d82ef

Please sign in to comment.