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

Add a new configuration warning to CollisionShape 

In the case where a ConcavePolygonShape is used as a shape for a RigidBody
in another mode than static, a configuration warning will appear in the
editor.
This commit is contained in:
Pierre Caye 2020-03-03 17:05:10 +01:00
parent e2b66cacf7
commit ad227d9a85
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/3d/collision_shape.cpp
View File

@ -123,6 +123,14 @@ String CollisionShape::get_configuration_warning() const {
return TTR("A shape must be provided for CollisionShape to function. Please create a shape resource for it."); return TTR("A shape must be provided for CollisionShape to function. Please create a shape resource for it.");
} }
if (Object::cast_to<RigidBody>(get_parent())) {
if (Object::cast_to<ConcavePolygonShape>(*shape)) {
if (Object::cast_to<RigidBody>(get_parent())->get_mode() != RigidBody::MODE_STATIC) {
return TTR("ConcavePolygonShape doesn't support RigidBody in another mode than static.");
}
}
}
return String(); return String();
} }

1
scene/3d/physics_body.cpp
View File

@ -518,6 +518,7 @@ void RigidBody::set_mode(Mode p_mode) {
PhysicsServer::get_singleton()->body_set_mode(get_rid(), PhysicsServer::BODY_MODE_KINEMATIC); PhysicsServer::get_singleton()->body_set_mode(get_rid(), PhysicsServer::BODY_MODE_KINEMATIC);
} break; } break;
} }
update_configuration_warning();
} }
RigidBody::Mode RigidBody::get_mode() const { RigidBody::Mode RigidBody::get_mode() const {