asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix collision shape update when changing shape properties

Browse source 
This change does two things:

1. Properly update the internal shape data using _update_in_shape_owner
when updating a shape (in 2D it was resetting one way collision)

2. Avoid unnecessary updates when calling set_shape with the same shape,
which happens each time a shape property is modified
(e.g shape.extents.x = ...)

Fixes #45090

(cherry picked from commit 4b43cd17c5)
This commit is contained in:
PouleyKetchoupp 2021-01-11 09:04:08 -07:00 committed by Rémi Verschelde
parent 8f19d50e27
commit a994bb4ad3
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scene/2d/collision_polygon_2d.cpp
View file

@ -205,6 +205,7 @@ void CollisionPolygon2D::set_polygon(const Vector<Point2> &p_polygon) {
if (parent) { if (parent) {
_build_polygon(); _build_polygon();
_update_in_shape_owner();
} }
update(); update();
update_configuration_warning(); update_configuration_warning();
@ -221,6 +222,7 @@ void CollisionPolygon2D::set_build_mode(BuildMode p_mode) {
build_mode = p_mode; build_mode = p_mode;
if (parent) { if (parent) {
_build_polygon(); _build_polygon();
_update_in_shape_owner();
} }
} }

5
scene/2d/collision_shape_2d.cpp
View file

@ -147,7 +147,9 @@ void CollisionShape2D::_notification(int p_what) {
} }
void CollisionShape2D::set_shape(const Ref<Shape2D> &p_shape) { void CollisionShape2D::set_shape(const Ref<Shape2D> &p_shape) {
if (p_shape == shape) {
return;
}
if (shape.is_valid()) if (shape.is_valid())
shape->disconnect("changed", this, "_shape_changed"); shape->disconnect("changed", this, "_shape_changed");
shape = p_shape; shape = p_shape;
@ -157,6 +159,7 @@ void CollisionShape2D::set_shape(const Ref<Shape2D> &p_shape) {
if (shape.is_valid()) { if (shape.is_valid()) {
parent->shape_owner_add_shape(owner_id, shape); parent->shape_owner_add_shape(owner_id, shape);
} }
_update_in_shape_owner();
} }
if (shape.is_valid()) if (shape.is_valid())

5
scene/3d/collision_shape.cpp
View file

@ -83,7 +83,6 @@ void CollisionShape::_notification(int p_what) {
if (shape.is_valid()) { if (shape.is_valid()) {
parent->shape_owner_add_shape(owner_id, shape); parent->shape_owner_add_shape(owner_id, shape);
} }
_update_in_shape_owner();
} }
} break; } break;
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {
@ -170,7 +169,9 @@ void CollisionShape::_bind_methods() {
} }
void CollisionShape::set_shape(const Ref<Shape> &p_shape) { void CollisionShape::set_shape(const Ref<Shape> &p_shape) {
if (p_shape == shape) {
return;
}
if (!shape.is_null()) { if (!shape.is_null()) {
shape->unregister_owner(this); shape->unregister_owner(this);
shape->disconnect("changed", this, "_shape_changed"); shape->disconnect("changed", this, "_shape_changed");