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/area_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/area_2d.h')
| -rw-r--r-- | scene/2d/area_2d.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/scene/2d/area_2d.h b/scene/2d/area_2d.h index 39b022fd2c..d6fcb2c2a5 100644 --- a/scene/2d/area_2d.h +++ b/scene/2d/area_2d.h @@ -54,8 +54,6 @@ private: real_t gravity_distance_scale = 0.0; real_t linear_damp = 0.1; real_t angular_damp = 1.0; - uint32_t collision_mask = 1; - uint32_t collision_layer = 1; int priority = 0; bool monitoring = false; bool monitorable = false; @@ -163,18 +161,6 @@ public: void set_monitorable(bool p_enable); bool is_monitorable() const; - void set_collision_mask(uint32_t p_mask); - uint32_t get_collision_mask() const; - - void set_collision_layer(uint32_t p_layer); - uint32_t get_collision_layer() 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<Node2D> get_overlapping_bodies() const; //function for script TypedArray<Area2D> get_overlapping_areas() const; //function for script |