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

ksys/phys: Make MotionAccessor's getMotion less ambiguous 

RigidBodyMotion has its own hkpMotion so we should make it clearer that
getMotion returns the rigid body's own internal motion.
This commit is contained in:
Léo Lam 2022-01-13 18:00:28 +01:00
parent 2b83356056
commit 5831b9581d
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/KingSystem/Physics/RigidBody/physMotionAccessor.cpp
View File

@ -11,7 +11,7 @@ MotionType MotionAccessor::getMotionInfo() const {
return mBody->getMotionInfo();
}
hkpMotion* MotionAccessor::getMotion() const {
hkpMotion* MotionAccessor::getRigidBodyMotion() const {
return mBody->getMotion();
}

2
src/KingSystem/Physics/RigidBody/physMotionAccessor.h
View File

@ -20,7 +20,7 @@ public:
explicit MotionAccessor(RigidBody* body);
MotionType getMotionInfo() const;
hkpMotion* getMotion() const;
hkpMotion* getRigidBodyMotion() const;
void setMotionFlag(RigidBody::MotionFlag flag);
bool hasMotionFlagSet(RigidBody::MotionFlag flag) const;
bool hasMotionFlagDisabled(RigidBody::MotionFlag flag) const;

16
src/KingSystem/Physics/RigidBody/physRigidBodyMotionProxy.cpp
View File

@ -43,7 +43,7 @@ void RigidBodyMotionProxy::getPosition(sead::Vector3f* position) {
if (hasMotionFlagSet(RigidBody::MotionFlag::_20)) {
mTransform.getTranslation(*position);
} else {
const auto hk_position = getMotion()->getPosition();
const auto hk_position = getRigidBodyMotion()->getPosition();
storeToVec3(position, hk_position);
}
}
@ -52,7 +52,7 @@ void RigidBodyMotionProxy::getRotation(sead::Quatf* rotation) {
if (hasMotionFlagSet(RigidBody::MotionFlag::_20)) {
mTransform.toQuat(*rotation);
} else {
toQuat(rotation, getMotion()->getRotation());
toQuat(rotation, getRigidBodyMotion()->getRotation());
}
rotation->normalize();
@ -62,7 +62,7 @@ void RigidBodyMotionProxy::getTransform(sead::Matrix34f* mtx) {
if (hasMotionFlagSet(RigidBody::MotionFlag::_20)) {
*mtx = mTransform;
} else {
const auto& transform = getMotion()->getTransform();
const auto& transform = getRigidBodyMotion()->getTransform();
setMtxRotation(mtx, transform.getRotation());
setMtxTranslation(mtx, transform.getTranslation());
}
@ -83,7 +83,7 @@ void RigidBodyMotionProxy::getCenterOfMassInLocal(sead::Vector3f* center) {
if (hasMotionFlagSet(RigidBody::MotionFlag::_800)) {
center->e = mCenterOfMassInLocal.e;
} else {
const auto hk_center = getMotion()->getCenterOfMassLocal();
const auto hk_center = getRigidBodyMotion()->getCenterOfMassLocal();
storeToVec3(center, hk_center);
}
}
@ -107,7 +107,7 @@ void RigidBodyMotionProxy::getLinearVelocity(sead::Vector3f* velocity) {
if (hasMotionFlagSet(RigidBody::MotionFlag::_40)) {
velocity->e = mLinearVelocity.e;
} else {
const auto hk_velocity = getMotion()->getLinearVelocity();
const auto hk_velocity = getRigidBodyMotion()->getLinearVelocity();
storeToVec3(velocity, hk_velocity);
}
}
@ -131,7 +131,7 @@ void RigidBodyMotionProxy::getAngularVelocity(sead::Vector3f* velocity) {
if (hasMotionFlagSet(RigidBody::MotionFlag::_80)) {
velocity->e = mAngularVelocity.e;
} else {
const auto hk_velocity = getMotion()->getAngularVelocity();
const auto hk_velocity = getRigidBodyMotion()->getAngularVelocity();
storeToVec3(velocity, hk_velocity);
}
}
@ -145,7 +145,7 @@ float RigidBodyMotionProxy::getMaxLinearVelocity() {
if (hasMotionFlagSet(RigidBody::MotionFlag::_100))
return mMaxLinearVelocity;
return getMotion()->getMotionState()->m_maxLinearVelocity;
return getRigidBodyMotion()->getMotionState()->m_maxLinearVelocity;
}
void RigidBodyMotionProxy::setMaxAngularVelocity(float max) {
@ -157,7 +157,7 @@ float RigidBodyMotionProxy::getMaxAngularVelocity() {
if (hasMotionFlagSet(RigidBody::MotionFlag::_100))
return mMaxAngularVelocity;
return getMotion()->getMotionState()->m_maxAngularVelocity;
return getRigidBodyMotion()->getMotionState()->m_maxAngularVelocity;
}
RigidBody* RigidBodyMotionProxy::getLinkedRigidBody() const {