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

Improve collision exception error messages for easier understanding

This commit is contained in:
Hugo Locurcio 2022-11-19 17:37:42 +01:00
parent 0803b4168d
commit 4c26cac0e6
No known key found for this signature in database
GPG Key ID: 39E8F8BE30B0A49C
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/2d/physics_body_2d.cpp
View File

@ -83,14 +83,14 @@ Array PhysicsBody2D::get_collision_exceptions() {
void PhysicsBody2D::add_collision_exception_with(Node *p_node) { void PhysicsBody2D::add_collision_exception_with(Node *p_node) {
ERR_FAIL_NULL(p_node); ERR_FAIL_NULL(p_node);
PhysicsBody2D *physics_body = Object::cast_to<PhysicsBody2D>(p_node); PhysicsBody2D *physics_body = Object::cast_to<PhysicsBody2D>(p_node);
ERR_FAIL_COND_MSG(!physics_body, "Collision exception only works between two objects of PhysicsBody type."); ERR_FAIL_COND_MSG(!physics_body, "Collision exception only works between two nodes that inherit from PhysicsBody2D.");
Physics2DServer::get_singleton()->body_add_collision_exception(get_rid(), physics_body->get_rid()); Physics2DServer::get_singleton()->body_add_collision_exception(get_rid(), physics_body->get_rid());
} }
void PhysicsBody2D::remove_collision_exception_with(Node *p_node) { void PhysicsBody2D::remove_collision_exception_with(Node *p_node) {
ERR_FAIL_NULL(p_node); ERR_FAIL_NULL(p_node);
PhysicsBody2D *physics_body = Object::cast_to<PhysicsBody2D>(p_node); PhysicsBody2D *physics_body = Object::cast_to<PhysicsBody2D>(p_node);
ERR_FAIL_COND_MSG(!physics_body, "Collision exception only works between two objects of PhysicsBody type."); ERR_FAIL_COND_MSG(!physics_body, "Collision exception only works between two nodes that inherit from PhysicsBody2D.");
Physics2DServer::get_singleton()->body_remove_collision_exception(get_rid(), physics_body->get_rid()); Physics2DServer::get_singleton()->body_remove_collision_exception(get_rid(), physics_body->get_rid());
} }

4
scene/3d/physics_body.cpp
View File

@ -73,14 +73,14 @@ Array PhysicsBody::get_collision_exceptions() {
void PhysicsBody::add_collision_exception_with(Node *p_node) { void PhysicsBody::add_collision_exception_with(Node *p_node) {
ERR_FAIL_NULL(p_node); ERR_FAIL_NULL(p_node);
CollisionObject *collision_object = Object::cast_to<CollisionObject>(p_node); CollisionObject *collision_object = Object::cast_to<CollisionObject>(p_node);
ERR_FAIL_COND_MSG(!collision_object, "Collision exception only works between two CollisionObject."); ERR_FAIL_COND_MSG(!collision_object, "Collision exception only works between two nodes that inherit from CollisionObject (such as Area or PhysicsBody).");
PhysicsServer::get_singleton()->body_add_collision_exception(get_rid(), collision_object->get_rid()); PhysicsServer::get_singleton()->body_add_collision_exception(get_rid(), collision_object->get_rid());
} }
void PhysicsBody::remove_collision_exception_with(Node *p_node) { void PhysicsBody::remove_collision_exception_with(Node *p_node) {
ERR_FAIL_NULL(p_node); ERR_FAIL_NULL(p_node);
CollisionObject *collision_object = Object::cast_to<CollisionObject>(p_node); CollisionObject *collision_object = Object::cast_to<CollisionObject>(p_node);
ERR_FAIL_COND_MSG(!collision_object, "Collision exception only works between two CollisionObject."); ERR_FAIL_COND_MSG(!collision_object, "Collision exception only works between two nodes that inherit from CollisionObject (such as Area or PhysicsBody).");
PhysicsServer::get_singleton()->body_remove_collision_exception(get_rid(), collision_object->get_rid()); PhysicsServer::get_singleton()->body_remove_collision_exception(get_rid(), collision_object->get_rid());
} }

4
scene/3d/soft_body.cpp
View File

@ -618,14 +618,14 @@ Array SoftBody::get_collision_exceptions() {
void SoftBody::add_collision_exception_with(Node *p_node) { void SoftBody::add_collision_exception_with(Node *p_node) {
ERR_FAIL_NULL(p_node); ERR_FAIL_NULL(p_node);
CollisionObject *collision_object = Object::cast_to<CollisionObject>(p_node); CollisionObject *collision_object = Object::cast_to<CollisionObject>(p_node);
ERR_FAIL_COND_MSG(!collision_object, "Collision exception only works between two CollisionObject."); ERR_FAIL_COND_MSG(!collision_object, "Collision exception only works between two nodes that inherit from CollisionObject (such as Area or PhysicsBody).");
PhysicsServer::get_singleton()->soft_body_add_collision_exception(physics_rid, collision_object->get_rid()); PhysicsServer::get_singleton()->soft_body_add_collision_exception(physics_rid, collision_object->get_rid());
} }
void SoftBody::remove_collision_exception_with(Node *p_node) { void SoftBody::remove_collision_exception_with(Node *p_node) {
ERR_FAIL_NULL(p_node); ERR_FAIL_NULL(p_node);
CollisionObject *collision_object = Object::cast_to<CollisionObject>(p_node); CollisionObject *collision_object = Object::cast_to<CollisionObject>(p_node);
ERR_FAIL_COND_MSG(!collision_object, "Collision exception only works between two CollisionObject."); ERR_FAIL_COND_MSG(!collision_object, "Collision exception only works between two nodes that inherit from CollisionObject (such as Area or PhysicsBody).");
PhysicsServer::get_singleton()->soft_body_remove_collision_exception(physics_rid, collision_object->get_rid()); PhysicsServer::get_singleton()->soft_body_remove_collision_exception(physics_rid, collision_object->get_rid());
} }