summaryrefslogtreecommitdiff
path: root/src/KingSystem/Physics/System
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2022-03-22 22:41:04 +0100
committerLéo Lam <leo@leolam.fr>2022-03-22 23:14:19 +0100
commitf3308d7bee2ba3a4d64a142e7a29a575243b3e4a (patch)
tree8a6eec8ab659e74bcc2efbfe167df01630fd0378 /src/KingSystem/Physics/System
parentc97cf995efbcee49cdda4f4b4cb4921f63670f3f (diff)
ksys/phys: Rename some RigidBody flags (add/remove from world)
Diffstat (limited to 'src/KingSystem/Physics/System')
-rw-r--r--src/KingSystem/Physics/System/physContactListener.cpp2
-rw-r--r--src/KingSystem/Physics/System/physInstanceSet.cpp4
-rw-r--r--src/KingSystem/Physics/System/physSensorContactListener.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/KingSystem/Physics/System/physContactListener.cpp b/src/KingSystem/Physics/System/physContactListener.cpp
index 8e436f4b..3bf79d9e 100644
--- a/src/KingSystem/Physics/System/physContactListener.cpp
+++ b/src/KingSystem/Physics/System/physContactListener.cpp
@@ -368,7 +368,7 @@ void ContactListener::handleCollisionAdded(const hkpCollisionEvent& event, Rigid
const auto j = int(layer_b - mLayerBase);
if (areContactsTrackedForLayerPair(i, j)) {
auto* layer_col_info = getContactLayerCollisionInfo(i, j);
- if (body_a->isFlag8Set() && body_b->isFlag8Set()) {
+ if (body_a->isAddedToWorld() && body_b->isAddedToWorld()) {
const auto layer_a_ = int(layer_a);
const auto tracked_layer = layer_col_info->getLayer();
const bool body_a_first = layer_a_ == tracked_layer;
diff --git a/src/KingSystem/Physics/System/physInstanceSet.cpp b/src/KingSystem/Physics/System/physInstanceSet.cpp
index 6be16311..37ca09db 100644
--- a/src/KingSystem/Physics/System/physInstanceSet.cpp
+++ b/src/KingSystem/Physics/System/physInstanceSet.cpp
@@ -81,11 +81,11 @@ u32 InstanceSet::sub_7100FB9C2C() const {
void InstanceSet::sub_7100FBA9BC() {
for (auto& rb : mRigidBodySets) {
- rb.callRigidBody_x_0();
+ rb.addToWorld();
}
for (auto& body : mList) {
- body->x_0();
+ body->addToWorld();
}
if (mCollisionController != nullptr)
diff --git a/src/KingSystem/Physics/System/physSensorContactListener.cpp b/src/KingSystem/Physics/System/physSensorContactListener.cpp
index bf6f35c1..c0af4c2d 100644
--- a/src/KingSystem/Physics/System/physSensorContactListener.cpp
+++ b/src/KingSystem/Physics/System/physSensorContactListener.cpp
@@ -40,7 +40,7 @@ void SensorContactListener::handleCollisionAdded(const hkpCollisionEvent& event,
if (areContactsTrackedForLayerPair(rlayer_a, rlayer_b)) {
auto* layer_col_info = getContactLayerCollisionInfo(rlayer_a, rlayer_b);
- if (body_a->isFlag8Set() && body_b->isFlag8Set()) {
+ if (body_a->isAddedToWorld() && body_b->isAddedToWorld()) {
const auto layer_a_ = int(layer_a);
const auto tracked_layer = layer_col_info->getLayer();
const bool body_a_first = layer_a_ == tracked_layer;