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

Merge pull request #49699 from nekomatata/mass-properties-disabled-shapes-3.x 

[3.x] Ignore disabled shapes for mass property calculations
This commit is contained in:
Rémi Verschelde 2021-06-18 18:37:56 +02:00 committed by GitHub
parent efee3534f9 c3107349a4
commit 2827d6be19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/physics/body_sw.cpp
View File

@ -59,6 +59,10 @@ void BodySW::update_inertias() {
real_t total_area = 0;
for (int i = 0; i < get_shape_count(); i++) {
if (is_shape_disabled(i)) {
continue;
}
total_area += get_shape_area(i);
}
@ -67,6 +71,10 @@ void BodySW::update_inertias() {
if (total_area != 0.0) {
for (int i = 0; i < get_shape_count(); i++) {
if (is_shape_disabled(i)) {
continue;
}
real_t area = get_shape_area(i);
real_t mass = area * this->mass / total_area;

4
servers/physics_2d/body_2d_sw.cpp
View File

@ -52,6 +52,10 @@ void Body2DSW::update_inertias() {
real_t total_area = 0;
for (int i = 0; i < get_shape_count(); i++) {
if (is_shape_disabled(i)) {
continue;
}
total_area += get_shape_aabb(i).get_area();
}