Browse Source

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

[3.x] Ignore disabled shapes for mass property calculations
Rémi Verschelde 4 years ago
parent
commit
2827d6be19
2 changed files with 12 additions and 0 deletions
  1. 8 0
      servers/physics/body_sw.cpp
  2. 4 0
      servers/physics_2d/body_2d_sw.cpp

+ 8 - 0
servers/physics/body_sw.cpp

@@ -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 - 0
servers/physics_2d/body_2d_sw.cpp

@@ -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();
 			}