Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #57355 from akien-mga/method-bindings-clearer-types

Browse source
This commit is contained in:
Rémi Verschelde 2022-02-01 14:24:35 +01:00 • committed by GitHub
commit f1bff648f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 54 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

20
scene/2d/ray_cast_2d.cpp
View file

@ -263,26 +263,18 @@ void RayCast2D::add_exception_rid(const RID &p_rid) {
exclude.insert(p_rid);
}
void RayCast2D::add_exception(const Object *p_object) {
ERR_FAIL_NULL(p_object);
const CollisionObject2D *co = Object::cast_to<CollisionObject2D>(p_object);
if (!co) {
return;
}
add_exception_rid(co->get_rid());
void RayCast2D::add_exception(const CollisionObject2D *p_node) {
ERR_FAIL_NULL_MSG(p_node, "The passed Node must be an instance of CollisionObject2D.");
add_exception_rid(p_node->get_rid());
}
void RayCast2D::remove_exception_rid(const RID &p_rid) {
exclude.erase(p_rid);
}
void RayCast2D::remove_exception(const Object *p_object) {
ERR_FAIL_NULL(p_object);
const CollisionObject2D *co = Object::cast_to<CollisionObject2D>(p_object);
if (!co) {
return;
}
remove_exception_rid(co->get_rid());
void RayCast2D::remove_exception(const CollisionObject2D *p_node) {
ERR_FAIL_NULL_MSG(p_node, "The passed Node must be an instance of CollisionObject2D.");
remove_exception_rid(p_node->get_rid());
}
void RayCast2D::clear_exceptions() {

6
scene/2d/ray_cast_2d.h
View file

@ -33,6 +33,8 @@
#include "scene/2d/node_2d.h"
class CollisionObject2D;
class RayCast2D : public Node2D {
GDCLASS(RayCast2D, Node2D);
@ -94,9 +96,9 @@ public:
Vector2 get_collision_normal() const;
void add_exception_rid(const RID &p_rid);
void add_exception(const Object *p_object);
void add_exception(const CollisionObject2D *p_node);
void remove_exception_rid(const RID &p_rid);
void remove_exception(const Object *p_object);
void remove_exception(const CollisionObject2D *p_node);
void clear_exceptions();
RayCast2D();

20
scene/2d/shape_cast_2d.cpp
View file

@ -322,26 +322,18 @@ void ShapeCast2D::add_exception_rid(const RID &p_rid) {
exclude.insert(p_rid);
}
void ShapeCast2D::add_exception(const Object *p_object) {
ERR_FAIL_NULL(p_object);
const CollisionObject2D *co = Object::cast_to<CollisionObject2D>(p_object);
if (!co) {
return;
}
add_exception_rid(co->get_rid());
void ShapeCast2D::add_exception(const CollisionObject2D *p_node) {
ERR_FAIL_NULL_MSG(p_node, "The passed Node must be an instance of CollisionObject2D.");
add_exception_rid(p_node->get_rid());
}
void ShapeCast2D::remove_exception_rid(const RID &p_rid) {
exclude.erase(p_rid);
}
void ShapeCast2D::remove_exception(const Object *p_object) {
ERR_FAIL_NULL(p_object);
const CollisionObject2D *co = Object::cast_to<CollisionObject2D>(p_object);
if (!co) {
return;
}
remove_exception_rid(co->get_rid());
void ShapeCast2D::remove_exception(const CollisionObject2D *p_node) {
ERR_FAIL_NULL_MSG(p_node, "The passed Node must be an instance of CollisionObject2D.");
remove_exception_rid(p_node->get_rid());
}
void ShapeCast2D::clear_exceptions() {

6
scene/2d/shape_cast_2d.h
View file

@ -34,6 +34,8 @@
#include "scene/2d/node_2d.h"
#include "scene/resources/shape_2d.h"
class CollisionObject2D;
class ShapeCast2D : public Node2D {
GDCLASS(ShapeCast2D, Node2D);
@ -109,9 +111,9 @@ public:
real_t get_closest_collision_unsafe_fraction() const;
void add_exception_rid(const RID &p_rid);
void add_exception(const Object *p_object);
void add_exception(const CollisionObject2D *p_node);
void remove_exception_rid(const RID &p_rid);
void remove_exception(const Object *p_object);
void remove_exception(const CollisionObject2D *p_node);
void clear_exceptions();
TypedArray<String> get_configuration_warnings() const override;