Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3.x] Store ObjectID instead of pointer for KinematicCollision owner #90669

Merged
merged 1 commit into from
Apr 16, 2024
Merged

[3.x] Store ObjectID instead of pointer for KinematicCollision owner #90669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions scene/2d/physics_body_2d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,7 @@ Ref<KinematicCollision2D> KinematicBody2D::_move(const Vector2 &p_motion, bool p
// Create a new instance when the cached reference is invalid or still in use in script.
if (motion_cache.is_null() || motion_cache->reference_get_count() > 1) {
motion_cache.instance();
motion_cache->owner = this;
motion_cache->owner_id = get_instance_id();
}

motion_cache->collision = col;
Expand Down Expand Up @@ -1364,7 +1364,7 @@ Ref<KinematicCollision2D> KinematicBody2D::_get_slide_collision(int p_bounce) {
// Create a new instance when the cached reference is invalid or still in use in script.
if (slide_colliders[p_bounce].is_null() || slide_colliders[p_bounce]->reference_get_count() > 1) {
slide_colliders.write[p_bounce].instance();
slide_colliders.write[p_bounce]->owner = this;
slide_colliders.write[p_bounce]->owner_id = get_instance_id();
}

slide_colliders.write[p_bounce]->collision = colliders[p_bounce];
Expand Down Expand Up @@ -1488,17 +1488,6 @@ KinematicBody2D::KinematicBody2D() :
on_wall = false;
sync_to_physics = false;
}
KinematicBody2D::~KinematicBody2D() {
if (motion_cache.is_valid()) {
motion_cache->owner = nullptr;
}

for (int i = 0; i < slide_colliders.size(); i++) {
if (slide_colliders[i].is_valid()) {
slide_colliders.write[i]->owner = nullptr;
}
}
}

////////////////////////

Expand All @@ -1521,6 +1510,7 @@ real_t KinematicCollision2D::get_angle(const Vector2 &p_up_direction) const {
}

Object *KinematicCollision2D::get_local_shape() const {
PhysicsBody2D *owner = Object::cast_to<PhysicsBody2D>(ObjectDB::get_instance(owner_id));
if (!owner) {
return nullptr;
}
Expand Down Expand Up @@ -1596,5 +1586,5 @@ KinematicCollision2D::KinematicCollision2D() {
collision.collider = 0;
collision.collider_shape = 0;
collision.local_shape = 0;
owner = nullptr;
owner_id = 0;
}
3 changes: 1 addition & 2 deletions scene/2d/physics_body_2d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,15 +347,14 @@ class KinematicBody2D : public PhysicsBody2D {
bool is_sync_to_physics_enabled() const;

KinematicBody2D();
~KinematicBody2D();
};

VARIANT_ENUM_CAST(KinematicBody2D::MovingPlatformApplyVelocityOnLeave);

class KinematicCollision2D : public Reference {
GDCLASS(KinematicCollision2D, Reference);

KinematicBody2D *owner;
ObjectID owner_id;
friend class KinematicBody2D;
KinematicBody2D::Collision collision;

Expand Down
19 changes: 4 additions & 15 deletions scene/3d/physics_body.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ Ref<KinematicCollision> KinematicBody::_move(const Vector3 &p_motion, bool p_inf
// Create a new instance when the cached reference is invalid or still in use in script.
if (motion_cache.is_null() || motion_cache->reference_get_count() > 1) {
motion_cache.instance();
motion_cache->owner = this;
motion_cache->owner_id = get_instance_id();
}

motion_cache->collision = col;
Expand Down Expand Up @@ -1369,7 +1369,7 @@ Ref<KinematicCollision> KinematicBody::_get_slide_collision(int p_bounce) {
// Create a new instance when the cached reference is invalid or still in use in script.
if (slide_colliders[p_bounce].is_null() || slide_colliders[p_bounce]->reference_get_count() > 1) {
slide_colliders.write[p_bounce].instance();
slide_colliders.write[p_bounce]->owner = this;
slide_colliders.write[p_bounce]->owner_id = get_instance_id();
}

slide_colliders.write[p_bounce]->collision = colliders[p_bounce];
Expand Down Expand Up @@ -1508,18 +1508,6 @@ KinematicBody::KinematicBody() :
set_safe_margin(0.001);
}

KinematicBody::~KinematicBody() {
if (motion_cache.is_valid()) {
motion_cache->owner = nullptr;
}

for (int i = 0; i < slide_colliders.size(); i++) {
if (slide_colliders[i].is_valid()) {
slide_colliders.write[i]->owner = nullptr;
}
}
}

///////////////////////////////////////

Vector3 KinematicCollision::get_position() const {
Expand All @@ -1541,6 +1529,7 @@ real_t KinematicCollision::get_angle(const Vector3 &p_up_direction) const {
}

Object *KinematicCollision::get_local_shape() const {
PhysicsBody *owner = Object::cast_to<PhysicsBody>(ObjectDB::get_instance(owner_id));
if (!owner) {
return nullptr;
}
Expand Down Expand Up @@ -1616,7 +1605,7 @@ KinematicCollision::KinematicCollision() {
collision.collider = 0;
collision.collider_shape = 0;
collision.local_shape = 0;
owner = nullptr;
owner_id = 0;
}

///////////////////////////////////////
Expand Down
3 changes: 1 addition & 2 deletions scene/3d/physics_body.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,15 +347,14 @@ class KinematicBody : public PhysicsBody {
bool is_sync_to_physics_enabled() const;

KinematicBody();
~KinematicBody();
};

VARIANT_ENUM_CAST(KinematicBody::MovingPlatformApplyVelocityOnLeave);

class KinematicCollision : public Reference {
GDCLASS(KinematicCollision, Reference);

KinematicBody *owner;
ObjectID owner_id;
friend class KinematicBody;
KinematicBody::Collision collision;

Expand Down
Loading