godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #42374 from madmiraal/fix-32776 

Trigger RigidBodyBullet space override updates when Area properties change.
This commit is contained in:
Camille Mohr-Daurat 2021-11-18 12:22:02 -07:00 committed by GitHub
parent 756eab200b 41d85ed5a9
commit 0deccc550c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/bullet/area_bullet.cpp
View File

@ -85,8 +85,14 @@ void AreaBullet::dispatch_callbacks() {
otherObj.object->on_exit_area(this); otherObj.object->on_exit_area(this);
overlappingObjects.remove(i); // Remove after callback overlappingObjects.remove(i); // Remove after callback
break; break;
case OVERLAP_STATE_INSIDE: {
if (otherObj.object->getType() == TYPE_RIGID_BODY) {
RigidBodyBullet *body = static_cast<RigidBodyBullet *>(otherObj.object);
body->scratch_space_override_modificator();
}
break;
}
case OVERLAP_STATE_DIRTY: case OVERLAP_STATE_DIRTY:
case OVERLAP_STATE_INSIDE:
break; break;
} }
} }
@ -244,6 +250,7 @@ void AreaBullet::set_param(PhysicsServer3D::AreaParameter p_param, const Variant
default: default:
WARN_PRINT("Area doesn't support this parameter in the Bullet backend: " + itos(p_param)); WARN_PRINT("Area doesn't support this parameter in the Bullet backend: " + itos(p_param));
} }
scratch();
} }
Variant AreaBullet::get_param(PhysicsServer3D::AreaParameter p_param) const { Variant AreaBullet::get_param(PhysicsServer3D::AreaParameter p_param) const {