From 071871b787684d03fd924f69603107860c8bdb99 Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Tue, 13 Oct 2020 14:09:31 +0100 Subject: Move collision layer and mask into CollisionObject. --- scene/2d/area_2d.h | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'scene/2d/area_2d.h') 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 get_overlapping_bodies() const; //function for script TypedArray get_overlapping_areas() const; //function for script -- cgit v1.2.3