mirror/botw
1
0
Fork 0
mirror of https://github.com/zeldaret/botw synced 2026-07-08 21:55:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

ksys/phys: Rename some RigidBody flags (add/remove from world)

Browse Source
This commit is contained in:
Léo Lam
2022-03-22 22:41:04 +01:00
parent c97cf995ef
commit f3308d7bee
10 changed files with 91 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/KingSystem/Physics/RigidBody/physRigidBodyMotionSensor.cpp
+5 -5
View File
@@ -21,7 +21,7 @@ bool RigidBodyMotionSensor::init(const RigidBodyInstanceParam& params, sead::Hea
}
KSYS_ALWAYS_INLINE void RigidBodyMotionSensor::setTransformImpl(const sead::Matrix34f& mtx) {
if (mBody->isFlag8Set()) { // flag 8 = block updates?
if (mBody->isAddedToWorld()) {
setMotionFlag(RigidBody::MotionFlag::DirtyTransform);
return;
}
@@ -183,7 +183,7 @@ void RigidBodyMotionSensor::getTransform(sead::Matrix34f* mtx) {
void RigidBodyMotionSensor::setCenterOfMassInLocal(const sead::Vector3f& center) {
mCenterOfMassInLocal.e = center.e;
if (mBody->isFlag8Set()) {
if (mBody->isAddedToWorld()) {
setMotionFlag(RigidBody::MotionFlag::DirtyCenterOfMassLocal);
return;
}
@@ -270,7 +270,7 @@ float RigidBodyMotionSensor::getMaxAngularVelocity() {
}
void RigidBodyMotionSensor::setLinkedRigidBody(RigidBody* body) {
auto lock = mBody->makeScopedLock(mBody->isFlag8Set());
auto lock = mBody->makeScopedLock(mBody->isAddedToWorld());
if (mLinkedRigidBody == body)
return;
@@ -302,7 +302,7 @@ void RigidBodyMotionSensor::resetLinkedRigidBody() {
if (!mLinkedRigidBody)
return;
auto lock = mBody->makeScopedLock(mBody->isFlag8Set());
auto lock = mBody->makeScopedLock(mBody->isAddedToWorld());
if (mLinkedRigidBody) {
mLinkedRigidBody->getEntityMotionAccessorForSensor()->deregisterAccessor(this);
mLinkedRigidBody = nullptr;
@@ -319,7 +319,7 @@ bool RigidBodyMotionSensor::isFlag40000Set() const {
}
void RigidBodyMotionSensor::copyMotionFromLinkedRigidBody() {
auto lock = mBody->makeScopedLock(mBody->isFlag8Set());
auto lock = mBody->makeScopedLock(mBody->isAddedToWorld());
auto* accessor = mLinkedRigidBody->getEntityMotionAccessorForSensor();
auto* linked_hk_body = mLinkedRigidBody->getHkBody();