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

ksys/phys: Add isSensorLayer and makeContactLayerMask

This commit is contained in:
Léo Lam 2021-04-24 11:17:43 +02:00
parent 2fe382fb1a
commit 6deecbee61
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/uking_functions.csv
View File

@ -79375,8 +79375,8 @@
0x0000007100e93db0,sub_7100E93DB0,492, 0x0000007100e93db0,sub_7100E93DB0,492,
0x0000007100e93f9c,NPCBase::m2,288, 0x0000007100e93f9c,NPCBase::m2,288,
0x0000007100e940bc,NPCBase::m3,92, 0x0000007100e940bc,NPCBase::m3,92,
0x0000007100e94118,isGreaterThan0x1F,28, 0x0000007100e94118,isGreaterThan0x1F,28,_ZN4ksys4phys13isSensorLayerENS0_12ContactLayerE
0x0000007100e94134,getPowerOfTwo,44, 0x0000007100e94134,getPowerOfTwo,44,_ZN4ksys4phys20makeContactLayerMaskENS0_12ContactLayerE
0x0000007100e94160,sub_7100E94160,16, 0x0000007100e94160,sub_7100E94160,16,
0x0000007100e94170,sub_7100E94170,40, 0x0000007100e94170,sub_7100E94170,40,
0x0000007100e94198,sub_7100E94198,4,_ZN4ksys4phys18contactLayerToTextENS0_12ContactLayerE 0x0000007100e94198,sub_7100E94198,4,_ZN4ksys4phys18contactLayerToTextENS0_12ContactLayerE

Can't render this file because it is too large.

10
src/KingSystem/Physics/System/physDefines.cpp
View File

@ -2,6 +2,16 @@
namespace ksys::phys { namespace ksys::phys {
bool isSensorLayer(ContactLayer layer) {
return layer > ContactLayer::EntityEnd;
}
u32 makeContactLayerMask(ContactLayer layer) {
if (layer < ContactLayer::SensorObject)
return 1 << layer;
return 1 << (layer - ContactLayer::SensorObject);
}
const char* contactLayerToText(ContactLayer layer) { const char* contactLayerToText(ContactLayer layer) {
return layer.text(); return layer.text();
} }

3
src/KingSystem/Physics/System/physDefines.h
View File

@ -159,6 +159,9 @@ enum class MotionType {
Unknown = 3, Unknown = 3,
}; };
bool isSensorLayer(ContactLayer layer);
u32 makeContactLayerMask(ContactLayer layer);
const char* contactLayerToText(ContactLayer layer); const char* contactLayerToText(ContactLayer layer);
ContactLayer contactLayerFromText(const sead::SafeString& text); ContactLayer contactLayerFromText(const sead::SafeString& text);