mirror/botw
1
0
Fork 0
mirror of https://github.com/zeldaret/botw synced 2026-07-10 06:16:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

ksys/phys: Add ScopedWorldLock to simplify world locking/unlocking

Browse Source
This commit is contained in:
Léo Lam
2022-03-20 15:08:26 +01:00
parent cc270ee3ff
commit a98e5f6557
3 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/KingSystem/Physics/System/physShapeCast.cpp
+12 -12
View File
@@ -86,22 +86,22 @@ bool ShapeCast::doExecuteQuery(hkpCdPointCollector& cast_collector,
OnlyLockIfNeeded only_lock_if_needed) {
const auto layer_type = mBody->getLayerType();
System::instance()->lockWorld(layer_type, "shape_cast", 0, only_lock_if_needed);
{
ScopedWorldLock lock{layer_type, "shape_cast", 0, only_lock_if_needed};
hkpLinearCastInput input;
loadFromVec3(&input.m_to, mTo);
hkpLinearCastInput input;
loadFromVec3(&input.m_to, mTo);
// Reset internal state.
cast_collector.reset();
if (_44 == 1)
reset();
// Reset internal state.
cast_collector.reset();
if (_44 == 1)
reset();
System::instance()->getHavokWorld(layer_type)->m_collisionInput->m_weldClosestPoints =
bool(weld_closest_points);
System::instance()->getHavokWorld(layer_type)->m_collisionInput->m_weldClosestPoints =
bool(weld_closest_points);
doCast(input, cast_collector, start_collector);
System::instance()->unlockWorld(layer_type, "shape_cast", 0, only_lock_if_needed);
doCast(input, cast_collector, start_collector);
}
// Register every point that is in start_collector.
auto* body = mBody;