falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ksys/phys: Rename ScRigidBodyGroup functions/members for clarity

This commit is contained in:
Léo Lam 2022-03-25 00:14:24 +01:00
parent c8bc5da770
commit 7136dc0115
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
3 changed files with 60 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/uking_functions.csv
View File

@ -84266,11 +84266,11 @@ Address,Quality,Size,Name
0x0000007100fcca90,O,000108,_ZN4ksys4phys28StaticCompoundRigidBodyGroup18setInstanceEnabledENS0_13BodyLayerTypeEib 0x0000007100fcca90,O,000108,_ZN4ksys4phys28StaticCompoundRigidBodyGroup18setInstanceEnabledENS0_13BodyLayerTypeEib
0x0000007100fccafc,O,000116,_ZN4ksys4phys28StaticCompoundRigidBodyGroup30enableAllInstancesAndShapeKeysEv 0x0000007100fccafc,O,000116,_ZN4ksys4phys28StaticCompoundRigidBodyGroup30enableAllInstancesAndShapeKeysEv
0x0000007100fccb70,O,000268,_ZN4ksys4phys28StaticCompoundRigidBodyGroup31resetMatricesAndUpdateTransformEv 0x0000007100fccb70,O,000268,_ZN4ksys4phys28StaticCompoundRigidBodyGroup31resetMatricesAndUpdateTransformEv
0x0000007100fccc7c,O,000312,_ZN4ksys4phys28StaticCompoundRigidBodyGroup33restoreMatricesAndUpdateTransformEv 0x0000007100fccc7c,O,000312,_ZN4ksys4phys28StaticCompoundRigidBodyGroup20applyExtraTransformsEv
0x0000007100fccdb4,O,000944,_ZN4ksys4phys28StaticCompoundRigidBodyGroup14processUpdatesEv 0x0000007100fccdb4,O,000944,_ZN4ksys4phys28StaticCompoundRigidBodyGroup14processUpdatesEv
0x0000007100fcd164,O,000244,_ZN4ksys4phys28StaticCompoundRigidBodyGroup15restoreMatricesEv 0x0000007100fcd164,O,000244,_ZN4ksys4phys28StaticCompoundRigidBodyGroup24recomputeTransformMatrixEv
0x0000007100fcd258,O,000288,_ZN4ksys4phys28StaticCompoundRigidBodyGroup9setMatrixERKN4sead8Matrix34IfEEi 0x0000007100fcd258,O,000288,_ZN4ksys4phys28StaticCompoundRigidBodyGroup17setExtraTransformERKN4sead8Matrix34IfEEi
0x0000007100fcd378,O,000028,_ZNK4ksys4phys28StaticCompoundRigidBodyGroup9getMatrixEi 0x0000007100fcd378,O,000028,_ZNK4ksys4phys28StaticCompoundRigidBodyGroup17getExtraTransformEi
0x0000007100fcd394,O,000144,_ZNK4ksys4phys28StaticCompoundRigidBodyGroup20getTransformedMatrixERKN4sead8Matrix34IfEE 0x0000007100fcd394,O,000144,_ZNK4ksys4phys28StaticCompoundRigidBodyGroup20getTransformedMatrixERKN4sead8Matrix34IfEE
0x0000007100fcd424,O,000164,_ZNK4ksys4phys28StaticCompoundRigidBodyGroup23getInvTransformedMatrixERKN4sead8Matrix34IfEE 0x0000007100fcd424,O,000164,_ZNK4ksys4phys28StaticCompoundRigidBodyGroup23getInvTransformedMatrixERKN4sead8Matrix34IfEE
0x0000007100fcd4c8,O,000136,_ZNK4ksys4phys28StaticCompoundRigidBodyGroup17getTransformedPosERKN4sead7Vector3IfEE 0x0000007100fcd4c8,O,000136,_ZNK4ksys4phys28StaticCompoundRigidBodyGroup17getTransformedPosERKN4sead7Vector3IfEE

Can't render this file because it is too large.

90
src/KingSystem/Physics/StaticCompound/physStaticCompoundRigidBodyGroup.cpp
View File

@ -13,7 +13,7 @@
namespace ksys::phys { namespace ksys::phys {
// TODO: rename // TODO: rename
constexpr int BodyGroupNumMatrices = 8; constexpr int BodyGroupNumExtraTransforms = 8;
static StaticCompoundRigidBodyGroup::Config sScRigidBodyGroupConfig; static StaticCompoundRigidBodyGroup::Config sScRigidBodyGroupConfig;
static StaticCompoundRigidBodyGroup::Epsilons sScRigidBodyGroupEpsilons; static StaticCompoundRigidBodyGroup::Epsilons sScRigidBodyGroupEpsilons;
@ -37,8 +37,8 @@ StaticCompoundRigidBodyGroup::~StaticCompoundRigidBodyGroup() {
mRigidBodiesPerBodyLayerType.freeBuffer(); mRigidBodiesPerBodyLayerType.freeBuffer();
mShapesPerBodyLayerType.freeBuffer(); mShapesPerBodyLayerType.freeBuffer();
mMatrices2.freeBuffer(); mExtraTransforms.freeBuffer();
mMatrices.freeBuffer(); mPendingExtraTransforms.freeBuffer();
_e8.freeBuffer(); _e8.freeBuffer();
mRigidBodies.freeBuffer(); mRigidBodies.freeBuffer();
} }
@ -96,9 +96,9 @@ void StaticCompoundRigidBodyGroup::init(const hkpPhysicsSystem& system, sead::Ma
} }
} }
mMatrices2.allocBufferAssert(BodyGroupNumMatrices, heap); mExtraTransforms.allocBufferAssert(BodyGroupNumExtraTransforms, heap);
mMatrices.allocBufferAssert(BodyGroupNumMatrices, heap); mPendingExtraTransforms.allocBufferAssert(BodyGroupNumExtraTransforms, heap);
resetMatrices(); resetExtraTransforms();
mFlags.set(Flag::Initialised); mFlags.set(Flag::Initialised);
} }
@ -172,34 +172,34 @@ void StaticCompoundRigidBodyGroup::enableAllInstancesAndShapeKeys() {
} }
} }
void StaticCompoundRigidBodyGroup::resetMatrices() { void StaticCompoundRigidBodyGroup::resetExtraTransforms() {
for (int i = 0, n = mMatrices2.size(); i < n; ++i) { for (int i = 0, n = mExtraTransforms.size(); i < n; ++i) {
mMatrices2[i].makeIdentity(); mExtraTransforms[i].makeIdentity();
mMatrices[i].makeIdentity(); mPendingExtraTransforms[i].makeIdentity();
} }
} }
void StaticCompoundRigidBodyGroup::resetMatricesAndUpdateTransform() { void StaticCompoundRigidBodyGroup::resetMatricesAndUpdateTransform() {
resetMatrices(); resetExtraTransforms();
mModifiedMatrices = 0; mPendingTransformChanges = 0;
ScopedWorldLock lock_entity{ContactLayerType::Entity}; ScopedWorldLock lock_entity{ContactLayerType::Entity};
ScopedWorldLock lock_sensor{ContactLayerType::Sensor}; ScopedWorldLock lock_sensor{ContactLayerType::Sensor};
restoreMatricesAndUpdateTransform(); applyExtraTransforms();
} }
void StaticCompoundRigidBodyGroup::restoreMatricesAndUpdateTransform() { void StaticCompoundRigidBodyGroup::applyExtraTransforms() {
mFlags.set(Flag::_2); mFlags.set(Flag::ShouldRecomputeExtraTransform);
mFlags.set(Flag::_4); mFlags.set(Flag::ShouldRecomputeTransform);
if (mModifiedMatrices != 0) { if (mPendingTransformChanges != 0) {
for (int i = 0, n = mMatrices.size(); i < n; ++i) { for (int i = 0, n = mPendingExtraTransforms.size(); i < n; ++i) {
if ((1 << i) & mModifiedMatrices) { if ((1 << i) & mPendingTransformChanges) {
auto& dest = mMatrices2[i]; auto& dest = mExtraTransforms[i];
dest = mMatrices[i]; dest = mPendingExtraTransforms[i];
} }
} }
mModifiedMatrices = 0; mPendingTransformChanges = 0;
} }
for (int i = 0, n = mRigidBodies.size(); i < n; ++i) { for (int i = 0, n = mRigidBodies.size(); i < n; ++i) {
@ -207,32 +207,32 @@ void StaticCompoundRigidBodyGroup::restoreMatricesAndUpdateTransform() {
} }
} }
void StaticCompoundRigidBodyGroup::restoreMatrices() { void StaticCompoundRigidBodyGroup::recomputeTransformMatrix() {
if (mModifiedMatrices != 0) { if (mPendingTransformChanges != 0) {
for (int i = 0, n = mMatrices.size(); i < n; ++i) { for (int i = 0, n = mPendingExtraTransforms.size(); i < n; ++i) {
if ((1 << i) & mModifiedMatrices) { if ((1 << i) & mPendingTransformChanges) {
auto& dest = mMatrices2[i]; auto& dest = mExtraTransforms[i];
dest = mMatrices[i]; dest = mPendingExtraTransforms[i];
} }
} }
mModifiedMatrices = 0; mPendingTransformChanges = 0;
mFlags.set(Flag::_2); mFlags.set(Flag::ShouldRecomputeExtraTransform);
mFlags.set(Flag::_4); mFlags.set(Flag::ShouldRecomputeTransform);
} }
mTransform = getTransform(); mTransform = getTransform();
} }
void StaticCompoundRigidBodyGroup::setMatrix(const sead::Matrix34f& matrix, int index) { void StaticCompoundRigidBodyGroup::setExtraTransform(const sead::Matrix34f& matrix, int index) {
if (mMatrices[index] == matrix) if (mPendingExtraTransforms[index] == matrix)
return; return;
mMatrices[index] = matrix; mPendingExtraTransforms[index] = matrix;
mModifiedMatrices |= 1 << index; mPendingTransformChanges |= 1 << index;
mFlags.set(Flag::ShouldMoveBody); mFlags.set(Flag::ShouldMoveBody);
} }
const sead::Matrix34f& StaticCompoundRigidBodyGroup::getMatrix(int index) const { const sead::Matrix34f& StaticCompoundRigidBodyGroup::getExtraTransform(int index) const {
return mMatrices[index]; return mPendingExtraTransforms[index];
} }
sead::Matrix34f sead::Matrix34f
@ -324,17 +324,17 @@ const sead::Matrix34f& StaticCompoundRigidBodyGroup::getTransform() const {
if (!mFlags.isOn(Flag::Initialised)) if (!mFlags.isOn(Flag::Initialised))
return sead::Matrix34f::ident; return sead::Matrix34f::ident;
if (mFlags.isOn(Flag::_2)) { if (mFlags.isOn(Flag::ShouldRecomputeExtraTransform)) {
mMtx0 = mMatrices2[0]; mCombinedExtraTransform = mExtraTransforms[0];
for (int i = 1, n = mMatrices2.size(); i < n; ++i) for (int i = 1, n = mExtraTransforms.size(); i < n; ++i)
mMtx0 = mMatrices2[i] * mMtx0; mCombinedExtraTransform = mExtraTransforms[i] * mCombinedExtraTransform;
mFlags.reset(Flag::_2); mFlags.reset(Flag::ShouldRecomputeExtraTransform);
} }
if (mFlags.isOn(Flag::_4) && mMtxPtr) { if (mFlags.isOn(Flag::ShouldRecomputeTransform) && mMtxPtr) {
mTransform = *mMtxPtr * mMtx0; mTransform = *mMtxPtr * mCombinedExtraTransform;
mFlags.reset(Flag::_4); mFlags.reset(Flag::ShouldRecomputeTransform);
} }
return mTransform; return mTransform;

23
src/KingSystem/Physics/StaticCompound/physStaticCompoundRigidBodyGroup.h
View File

@ -56,13 +56,13 @@ public:
bool setInstanceEnabled(BodyLayerType body_layer_type, int instance_id, bool enabled); bool setInstanceEnabled(BodyLayerType body_layer_type, int instance_id, bool enabled);
void enableAllInstancesAndShapeKeys(); void enableAllInstancesAndShapeKeys();
void resetMatrices(); void resetExtraTransforms();
void resetMatricesAndUpdateTransform(); void resetMatricesAndUpdateTransform();
void restoreMatricesAndUpdateTransform(); void applyExtraTransforms();
void restoreMatrices(); void recomputeTransformMatrix();
void setMatrix(const sead::Matrix34f& matrix, int index); void setExtraTransform(const sead::Matrix34f& matrix, int index);
const sead::Matrix34f& getMatrix(int index) const; const sead::Matrix34f& getExtraTransform(int index) const;
sead::Matrix34f getTransformedMatrix(const sead::Matrix34f& mtx) const; sead::Matrix34f getTransformedMatrix(const sead::Matrix34f& mtx) const;
sead::Matrix34f getInvTransformedMatrix(const sead::Matrix34f& mtx) const; sead::Matrix34f getInvTransformedMatrix(const sead::Matrix34f& mtx) const;
@ -77,8 +77,8 @@ public:
private: private:
enum class Flag { enum class Flag {
Initialised = 1 << 0, Initialised = 1 << 0,
_2 = 1 << 1, ShouldRecomputeExtraTransform = 1 << 1,
_4 = 1 << 2, ShouldRecomputeTransform = 1 << 2,
ShouldMoveBody = 1 << 3, ShouldMoveBody = 1 << 3,
IsMovingBody = 1 << 4, IsMovingBody = 1 << 4,
HasEnabledOrDisabledInstance = 1 << 5, HasEnabledOrDisabledInstance = 1 << 5,
@ -95,13 +95,12 @@ private:
float getVelocityMultiplier() const; float getVelocityMultiplier() const;
mutable sead::TypedBitFlag<Flag, sead::Atomic<u32>> mFlags; mutable sead::TypedBitFlag<Flag, sead::Atomic<u32>> mFlags;
sead::Atomic<u32> mModifiedMatrices; sead::Atomic<u32> mPendingTransformChanges;
sead::Buffer<RigidBody*> mRigidBodiesPerBodyLayerType; sead::Buffer<RigidBody*> mRigidBodiesPerBodyLayerType;
sead::Buffer<hkpStaticCompoundShape*> mShapesPerBodyLayerType; sead::Buffer<hkpStaticCompoundShape*> mShapesPerBodyLayerType;
// TODO: rename sead::Buffer<sead::Matrix34f> mPendingExtraTransforms;
sead::Buffer<sead::Matrix34f> mMatrices; sead::Buffer<sead::Matrix34f> mExtraTransforms;
sead::Buffer<sead::Matrix34f> mMatrices2; mutable sead::Matrix34f mCombinedExtraTransform = sead::Matrix34f::ident;
mutable sead::Matrix34f mMtx0 = sead::Matrix34f::ident;
mutable sead::Matrix34f mTransform = sead::Matrix34f::ident; mutable sead::Matrix34f mTransform = sead::Matrix34f::ident;
sead::Matrix34f* mMtxPtr{}; sead::Matrix34f* mMtxPtr{};
sead::PtrArray<RigidBody> mRigidBodies; sead::PtrArray<RigidBody> mRigidBodies;