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

ksys/phys: Rename RigidBody::Flag1 to RigidBody::Flag 

There's no flag enum named "Flag"
This commit is contained in:
Léo Lam 2022-01-11 17:27:47 +01:00
parent 625f958622
commit 51c3397965
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/KingSystem/Physics/RigidBody/physRigidBody.cpp
View File

@ -16,14 +16,14 @@ RigidBody::RigidBody(u32 a, u32 mass_scaling, hkpRigidBody* hk_body, const sead:
mHkBody->m_motion.m_motionState.m_timeFactor.setOne();
mHkBody->enableDeactivation(true);
mHkBody->getCollidableRw()->m_allowedPenetrationDepth = 0.1f;
if (mFlags.isOff(Flag1::MassScaling)) {
if (mFlags.isOff(Flag::MassScaling)) {
mHkBody->m_responseModifierFlags |= hkpResponseModifier::Flags::MASS_SCALING;
}
mFlags.change(Flag1::_80, _b4 == 5);
mFlags.change(Flag1::MassScaling, mass_scaling == 1);
mFlags.change(Flag1::_10, a7);
mFlags.set(Flag1::_100);
mFlags.change(Flag::_80, _b4 == 5);
mFlags.change(Flag::MassScaling, mass_scaling == 1);
mFlags.change(Flag::_10, a7);
mFlags.set(Flag::_100);
}
void RigidBody::setMotionFlag(MotionFlag flag) {
@ -31,15 +31,15 @@ void RigidBody::setMotionFlag(MotionFlag flag) {
mMotionFlags.set(flag);
if (mFlags.isOff(Flag1::_20) && mFlags.isOff(Flag1::_2)) {
mFlags.set(Flag1::_2);
if (mFlags.isOff(Flag::_20) && mFlags.isOff(Flag::_2)) {
mFlags.set(Flag::_2);
MemSystem::instance()->getRigidBodyRequestMgr()->sub_7100FA6C8C(
mFlags.isOn(Flag1::MassScaling), this);
mFlags.isOn(Flag::MassScaling), this);
}
}
bool RigidBody::sub_7100F8D1F8() const {
return mFlags.isOn(Flag1::_8);
return mFlags.isOn(Flag::_8);
}
bool RigidBody::sub_7100F8D204() const {
@ -57,7 +57,7 @@ void RigidBody::sub_7100F8D21C() {
if (mMotionFlags.isOn(MotionFlag::_1)) {
mMotionFlags.reset(MotionFlag::_1);
mMotionFlags.set(MotionFlag::_2);
} else if (mFlags.isOn(Flag1::_8)) {
} else if (mFlags.isOn(Flag::_8)) {
setMotionFlag(MotionFlag::_2);
}
}

6
src/KingSystem/Physics/RigidBody/physRigidBody.h
View File

@ -26,7 +26,7 @@ public:
class RigidBody : public sead::IDisposer, public RigidBase {
SEAD_RTTI_BASE(RigidBody)
public:
enum class Flag1 {
enum class Flag {
MassScaling = 1 << 0,
_2 = 1 << 1,
_4 = 1 << 2,
@ -86,13 +86,13 @@ public:
void sub_7100F8FA44(ContactLayer, u32);
hkpMotion* getMotion() const;
bool isMassScaling() const { return mFlags.isOn(Flag1::MassScaling); }
bool isMassScaling() const { return mFlags.isOn(Flag::MassScaling); }
const auto& getMotionFlags() const { return mMotionFlags; }
void resetMotionFlagDirect(const MotionFlag flag) { mMotionFlags.reset(flag); }
private:
sead::CriticalSection mCS;
sead::TypedBitFlag<Flag1, sead::Atomic<u32>> mFlags{};
sead::TypedBitFlag<Flag, sead::Atomic<u32>> mFlags{};
sead::TypedBitFlag<MotionFlag, sead::Atomic<u32>> mMotionFlags{};
sead::BitFlag32 mContactMask{};
hkpRigidBody* mHkBody;