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

ksys/phys: Fix misleading name for StaticCompound::disableCollision

This commit is contained in:
Léo Lam 2022-03-25 22:20:19 +01:00
parent 82a5319200
commit a63b816ffc
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/uking_functions.csv
View File

@ -84217,7 +84217,7 @@ Address,Quality,Size,Name
0x0000007100fcaa60,O,000136,_ZN4ksys4phys14StaticCompound26removeFromWorldImmediatelyEv 0x0000007100fcaa60,O,000136,_ZN4ksys4phys14StaticCompound26removeFromWorldImmediatelyEv
0x0000007100fcaae8,O,000076,_ZN4ksys4phys14StaticCompound12setMapObjectEjjPNS_3map6ObjectE 0x0000007100fcaae8,O,000076,_ZN4ksys4phys14StaticCompound12setMapObjectEjjPNS_3map6ObjectE
0x0000007100fcab34,O,000072,_ZNK4ksys4phys14StaticCompound12getMapObjectEi 0x0000007100fcab34,O,000072,_ZNK4ksys4phys14StaticCompound12getMapObjectEi
0x0000007100fcab7c,O,000176,_ZN4ksys4phys14StaticCompound16disableCollisionEib 0x0000007100fcab7c,O,000176,_ZN4ksys4phys14StaticCompound18setInstanceEnabledEib
0x0000007100fcac2c,O,000112,_ZN4ksys4phys14StaticCompound14processUpdatesEv 0x0000007100fcac2c,O,000112,_ZN4ksys4phys14StaticCompound14processUpdatesEv
0x0000007100fcac9c,O,000112,_ZN4ksys4phys14StaticCompound24recomputeTransformMatrixEv 0x0000007100fcac9c,O,000112,_ZN4ksys4phys14StaticCompound24recomputeTransformMatrixEv
0x0000007100fcad0c,O,000328,_ZN4ksys4phys14StaticCompound20applyExtraTransformsERKN4sead8Matrix34IfEE 0x0000007100fcad0c,O,000328,_ZN4ksys4phys14StaticCompound20applyExtraTransformsERKN4sead8Matrix34IfEE

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

4
src/KingSystem/Map/mapPlacementMap.cpp
View File

@ -105,7 +105,7 @@ void PlacementMap::updateObjectCollisionAndId(int index, Object* obj) {
obj->setFlags0(Object::Flag0::_200000); obj->setFlags0(Object::Flag0::_200000);
disable = true; disable = true;
} }
sc->disableCollision(idx, disable); sc->setInstanceEnabled(idx, disable);
} }
bool PlacementMap::parseStaticMap_(sead::Heap* heap, u8* data) { bool PlacementMap::parseStaticMap_(sead::Heap* heap, u8* data) {
@ -255,7 +255,7 @@ void PlacementMap::doDisableObjStaticCompound(Object* obj, bool disable) {
auto* resource = mRes[idx].mRes.getResource(); auto* resource = mRes[idx].mRes.getResource();
if (auto* sc = sead::DynamicCast<ksys::phys::StaticCompound>(resource)) { if (auto* sc = sead::DynamicCast<ksys::phys::StaticCompound>(resource)) {
s16 sc_id = obj->getStaticCompoundActorId(); s16 sc_id = obj->getStaticCompoundActorId();
sc->disableCollision(sc_id, disable); sc->setInstanceEnabled(sc_id, disable);
} }
} }

4
src/KingSystem/Physics/StaticCompound/physStaticCompound.cpp
View File

@ -177,7 +177,7 @@ map::Object* StaticCompound::getMapObject(int shape_idx) const {
return mMapObjects[idx]; return mMapObjects[idx];
} }
bool StaticCompound::disableCollision(int actor_idx, bool x) { bool StaticCompound::setInstanceEnabled(int actor_idx, bool enabled) {
const int start = mStaticCompoundInfo->getShapeInfoStart(actor_idx); const int start = mStaticCompoundInfo->getShapeInfoStart(actor_idx);
const int end = mStaticCompoundInfo->getShapeInfoEnd(actor_idx); const int end = mStaticCompoundInfo->getShapeInfoEnd(actor_idx);
for (int i = start; i <= end; ++i) { for (int i = start; i <= end; ++i) {
@ -189,7 +189,7 @@ bool StaticCompound::disableCollision(int actor_idx, bool x) {
const auto type = static_cast<BodyLayerType>(info->m_BodyLayerType); const auto type = static_cast<BodyLayerType>(info->m_BodyLayerType);
const auto instance_id = info->m_InstanceId; const auto instance_id = info->m_InstanceId;
mFieldBodyGroups[group].setInstanceEnabled(type, instance_id, x); mFieldBodyGroups[group].setInstanceEnabled(type, instance_id, enabled);
} }
return true; return true;
} }

2
src/KingSystem/Physics/StaticCompound/physStaticCompound.h
View File

@ -36,7 +36,7 @@ public:
int setMapObject(u32 hash_id, u32 srt_hash, map::Object* object); int setMapObject(u32 hash_id, u32 srt_hash, map::Object* object);
map::Object* getMapObject(int shape_idx) const; map::Object* getMapObject(int shape_idx) const;
bool disableCollision(int actor_idx, bool x); bool setInstanceEnabled(int actor_idx, bool enabled);
void processUpdates(); void processUpdates();
void recomputeTransformMatrix(); void recomputeTransformMatrix();