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

ksys/phys: Rename flag 0x80 to RigidBody::Flag::HighQualityCollidable

This commit is contained in:
Léo Lam 2022-01-19 00:36:26 +01:00
parent 52e2111ff3
commit c20142ab7b
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ RigidBody::RigidBody(Type type, ContactLayerType layer_type, hkpRigidBody* hk_bo
mHkBody->m_responseModifierFlags |= hkpResponseModifier::Flags::MASS_SCALING;
}
mFlags.change(Flag::IsCharacterController, isCharacterControllerType());
mFlags.change(Flag::HighQualityCollidable, isCharacterControllerType());
mFlags.change(Flag::IsSensor, layer_type == ContactLayerType::Sensor);
mFlags.change(Flag::_10, a7);
mFlags.set(Flag::_100);
@ -370,7 +370,7 @@ void RigidBody::updateCollidableQualityType(bool high_quality) {
if (isCharacterControllerType()) {
setCollidableQualityType(HK_COLLIDABLE_QUALITY_CHARACTER);
mFlags.set(Flag::IsCharacterController);
mFlags.set(Flag::HighQualityCollidable);
return;
}
@ -392,7 +392,7 @@ void RigidBody::updateCollidableQualityType(bool high_quality) {
break;
}
mFlags.change(Flag::IsCharacterController, high_quality);
mFlags.change(Flag::HighQualityCollidable, high_quality);
}
void RigidBody::setCollidableQualityType(hkpCollidableQualityType quality) {

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

@ -54,7 +54,8 @@ public:
_10 = 1 << 4,
_20 = 1 << 5,
_40 = 1 << 6,
IsCharacterController = 1 << 7,
/// Indicates whether the Havok collidable has been configured to use a higher quality type.
HighQualityCollidable = 1 << 7,
_100 = 1 << 8,
_200 = 1 << 9,
_400 = 1 << 10,

4
src/KingSystem/Physics/RigidBody/physRigidBodyMotionEntity.cpp
View File

@ -525,7 +525,7 @@ void RigidBodyMotionEntity::updateRigidBodyMotionExceptState() {
// Fix up pointers and invalidate cached info.
switch (mBody->getMotionType()) {
case MotionType::Dynamic:
getHkBody()->setQualityType(mBody->hasFlag(RigidBody::Flag::IsCharacterController) ?
getHkBody()->setQualityType(mBody->hasFlag(RigidBody::Flag::HighQualityCollidable) ?
HK_COLLIDABLE_QUALITY_BULLET :
HK_COLLIDABLE_QUALITY_DEBRIS);
break;
@ -561,7 +561,7 @@ void RigidBodyMotionEntity::updateRigidBodyMotionExceptStateAndVel() {
*getHkBody()->getMotion()->getMotionState() = state;
getHkBody()->getMotion()->m_linearVelocity = linear_vel;
getHkBody()->getMotion()->m_angularVelocity = angular_vel;
getHkBody()->setQualityType(mBody->hasFlag(RigidBody::Flag::IsCharacterController) ?
getHkBody()->setQualityType(mBody->hasFlag(RigidBody::Flag::HighQualityCollidable) ?
HK_COLLIDABLE_QUALITY_BULLET :
HK_COLLIDABLE_QUALITY_DEBRIS);
getHkBody()->getMotion()->m_deactivationIntegrateCounter = deactivation_counter;