diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-04-20 21:07:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-20 21:07:32 +0200 |
commit | b06116d62ff514a6b03247660ddcccff78ccd0e3 (patch) | |
tree | cc9b6936918727a2edb95d878f0d537b419b9755 /scene/2d/physics_body_2d.h | |
parent | c395b9c4ac5f1c279a0e8ee471e7d26cd48a0adb (diff) | |
parent | 071871b787684d03fd924f69603107860c8bdb99 (diff) |
Merge pull request #42770 from madmiraal/fix-26680
Move collision layer and mask into CollisionObject.
Diffstat (limited to 'scene/2d/physics_body_2d.h')
-rw-r--r-- | scene/2d/physics_body_2d.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/scene/2d/physics_body_2d.h b/scene/2d/physics_body_2d.h index aeec662e5c..e0fc0766bc 100644 --- a/scene/2d/physics_body_2d.h +++ b/scene/2d/physics_body_2d.h @@ -41,9 +41,6 @@ class KinematicCollision2D; class PhysicsBody2D : public CollisionObject2D { GDCLASS(PhysicsBody2D, CollisionObject2D); - uint32_t collision_layer = 1; - uint32_t collision_mask = 1; - protected: void _notification(int p_what); PhysicsBody2D(PhysicsServer2D::BodyMode p_mode); @@ -51,18 +48,6 @@ protected: static void _bind_methods(); public: - void set_collision_layer(uint32_t p_layer); - uint32_t get_collision_layer() const; - - void set_collision_mask(uint32_t p_mask); - uint32_t get_collision_mask() const; - - void set_collision_mask_bit(int p_bit, bool p_value); - bool get_collision_mask_bit(int p_bit) const; - - void set_collision_layer_bit(int p_bit, bool p_value); - bool get_collision_layer_bit(int p_bit) const; - TypedArray<PhysicsBody2D> get_collision_exceptions(); void add_collision_exception_with(Node *p_node); //must be physicsbody void remove_collision_exception_with(Node *p_node); |