diff --git a/prop_instance.cpp b/prop_instance.cpp index fcce675..29ef749 100644 --- a/prop_instance.cpp +++ b/prop_instance.cpp @@ -51,14 +51,18 @@ void PropInstance::set_material(const Ref &material) { _material = material; } +uint32_t PropInstance::get_collision_layer() const { + return _collision_layer; +} + void PropInstance::set_collision_layer(uint32_t p_layer) { _collision_layer = p_layer; collision_layer_changed(); } -uint32_t PropInstance::get_collision_layer() const { - return _collision_layer; +uint32_t PropInstance::get_collision_mask() const { + return _collision_mask; } void PropInstance::set_collision_mask(uint32_t p_mask) { @@ -67,10 +71,6 @@ void PropInstance::set_collision_mask(uint32_t p_mask) { collision_mask_changed(); } -uint32_t PropInstance::get_collision_mask() const { - return _collision_mask; -} - void PropInstance::collision_layer_changed() { } diff --git a/prop_instance.h b/prop_instance.h index 7bf5b88..95c2f28 100644 --- a/prop_instance.h +++ b/prop_instance.h @@ -49,11 +49,11 @@ public: Ref get_material(); void set_material(const Ref &material); - void set_collision_layer(uint32_t p_layer); uint32_t get_collision_layer() const; + void set_collision_layer(uint32_t p_layer); - void set_collision_mask(uint32_t p_mask); uint32_t get_collision_mask() const; + void set_collision_mask(uint32_t p_mask); virtual void collision_layer_changed(); virtual void collision_mask_changed();