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/collision_object_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/collision_object_2d.h')
| -rw-r--r-- | scene/2d/collision_object_2d.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/scene/2d/collision_object_2d.h b/scene/2d/collision_object_2d.h index 7a1fd23e72..bb1a9dfcf5 100644 --- a/scene/2d/collision_object_2d.h +++ b/scene/2d/collision_object_2d.h @@ -37,6 +37,9 @@ class CollisionObject2D : public Node2D { GDCLASS(CollisionObject2D, Node2D); + uint32_t collision_layer = 1; + uint32_t collision_mask = 1; + bool area = false; RID rid; bool pickable = false; @@ -76,6 +79,18 @@ protected: void set_only_update_transform_changes(bool p_enable); 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_layer_bit(int p_bit, bool p_value); + bool get_collision_layer_bit(int p_bit) const; + + void set_collision_mask_bit(int p_bit, bool p_value); + bool get_collision_mask_bit(int p_bit) const; + uint32_t create_shape_owner(Object *p_owner); void remove_shape_owner(uint32_t owner); void get_shape_owners(List<uint32_t> *r_owners); |