mirror/botw
1
0
Fork 0
mirror of https://github.com/zeldaret/botw synced 2026-08-17 05:01:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

ksys/phys: SensorCollisionMask layer2 -> ignored_layer

Browse Source
This commit is contained in:
Léo Lam
2022-03-01 13:21:53 +01:00
parent f852073fd4
commit 7f52270cdd
7 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/KingSystem/Physics/System/physInstanceSet.cpp
+1 -1
View File
@@ -140,7 +140,7 @@ void InstanceSet::sub_7100FBB00C(phys::RigidBody* body, phys::RigidBodyParam* pa
}
body->enableGroundCollision(instance_params.no_hit_ground == 0);
body->enableWaterCollision(instance_params.no_hit_water == 0);
body->clearSensorReceiverLayer2();
body->clearSensorReceiverIgnoredLayer();
}
void* InstanceSet::sub_7100FBBC28(const sead::SafeString& name) const {
src/KingSystem/Physics/System/physSensorGroupFilter.cpp
+8 -8
View File
@@ -82,9 +82,9 @@ hkBool SensorGroupFilter::testCollisionForSensors(u32 infoA, u32 infoB) const {
return false;
}
if (a.data.has_layer2 && b.data.layer == a.data.layer2)
if (a.data.has_ignored_layer && b.data.layer == a.data.ignored_layer)
return false;
if (b.data.has_layer2 && a.data.layer == b.data.layer2)
if (b.data.has_ignored_layer && a.data.layer == b.data.ignored_layer)
return false;
return m_collisionLookupTable[a.data.layer] & (1 << b.data.layer);
@@ -241,7 +241,7 @@ u32 sensorCollisionMaskSetLayer(ContactLayer layer, u32 mask) {
clearBitFields(&info.raw, info.is_custom_receiver, info.custom_receiver_data.layer);
} else {
clearBitFields(&info.raw, info.is_custom_receiver, info.data.layer,
info.data.has_layer2, info.data.layer2);
info.data.has_ignored_layer, info.data.ignored_layer);
}
if (info.is_custom_receiver) {
@@ -254,7 +254,7 @@ u32 sensorCollisionMaskSetLayer(ContactLayer layer, u32 mask) {
return info.raw;
}
u32 sensorCollisionMaskSetLayer2(bool set, ContactLayer layer, u32 mask) {
u32 sensorCollisionMaskSetIgnoredLayer(bool set, ContactLayer layer, u32 mask) {
SEAD_ASSERT(getContactLayerType(layer) == ContactLayerType::Sensor);
SensorCollisionMask info{mask};
@@ -262,12 +262,12 @@ u32 sensorCollisionMaskSetLayer2(bool set, ContactLayer layer, u32 mask) {
return info.raw;
info.is_custom_receiver = false;
info.data.has_layer2 = false;
info.data.layer2 = {};
info.data.has_ignored_layer = false;
info.data.ignored_layer = {};
if (set) {
info.data.has_layer2 = true;
info.data.layer2.SetUnsafe(layer - FirstSensor);
info.data.has_ignored_layer = true;
info.data.ignored_layer.SetUnsafe(layer - FirstSensor);
}
return info.raw;
src/KingSystem/Physics/System/physSensorGroupFilter.h
+3 -4
View File
@@ -64,13 +64,12 @@ protected:
/// @param mask An existing sensor collision mask
u32 sensorCollisionMaskSetLayer(ContactLayer layer, u32 mask);
/// Set or clear a second contact layer in a sensor collision mask.
/// Set or clear a contact layer to ignore during collision detection in a sensor collision mask.
/// This function does nothing when using a custom receiver.
/// @param set If true, set the specified layer. Clear it otherwise
/// @param layer A sensor contact layer
/// @param layer A sensor contact layer to be ignored
/// @param mask An existing sensor collision mask
// TODO: rename once we figure out what this layer is used for
u32 sensorCollisionMaskSetLayer2(bool set, ContactLayer layer, u32 mask);
u32 sensorCollisionMaskSetIgnoredLayer(bool set, ContactLayer layer, u32 mask);
inline u32 SensorSystemGroupHandler::makeCollisionFilterInfo(u32 info, ContactLayer layer,
GroundHit ground_hit) {