1 files changed, 47 insertions, 3 deletions

diff --git a/scene/2d/collision_object_2d.h b/scene/2d/collision_object_2d.h
index e82b61d441..19abacb201 100644
--- a/scene/2d/collision_object_2d.h
+++ b/scene/2d/collision_object_2d.h
@@ -32,15 +32,32 @@
 #define COLLISION_OBJECT_2D_H
 
 #include "scene/2d/node_2d.h"
+#include "scene/main/viewport.h"
 #include "scene/resources/shape_2d.h"
+#include "servers/physics_server_2d.h"
 
 class CollisionObject2D : public Node2D {
 	GDCLASS(CollisionObject2D, Node2D);
 
+public:
+	enum DisableMode {
+		DISABLE_MODE_REMOVE,
+		DISABLE_MODE_MAKE_STATIC,
+		DISABLE_MODE_KEEP_ACTIVE,
+	};
+
+private:
+	uint32_t collision_layer = 1;
+	uint32_t collision_mask = 1;
+
 	bool area = false;
 	RID rid;
 	bool pickable = false;
 
+	DisableMode disable_mode = DISABLE_MODE_REMOVE;
+
+	PhysicsServer2D::BodyMode body_mode = PhysicsServer2D::BODY_MODE_STATIC;
+
 	struct ShapeData {
 		Object *owner = nullptr;
 		Transform2D xform;
@@ -59,7 +76,10 @@ class CollisionObject2D : public Node2D {
 	int total_subshapes = 0;
 
 	Map<uint32_t, ShapeData> shapes;
-	bool only_update_transform_changes = false; //this is used for sync physics in KinematicBody
+	bool only_update_transform_changes = false; // This is used for sync to physics.
+
+	void _apply_disabled();
+	void _apply_enabled();
 
 protected:
 	CollisionObject2D(RID p_rid, bool p_area);
@@ -69,13 +89,35 @@ protected:
 
 	void _update_pickable();
 	friend class Viewport;
-	void _input_event(Node *p_viewport, const Ref<InputEvent> &p_input_event, int p_shape);
+	void _input_event_call(Viewport *p_viewport, const Ref<InputEvent> &p_input_event, int p_shape);
 	void _mouse_enter();
 	void _mouse_exit();
 
+	void _mouse_shape_enter(int p_shape);
+	void _mouse_shape_exit(int p_shape);
+
 	void set_only_update_transform_changes(bool p_enable);
+	bool is_only_update_transform_changes_enabled() const;
 
+	void set_body_mode(PhysicsServer2D::BodyMode p_mode);
+
+	GDVIRTUAL3(_input_event, Viewport *, Ref<InputEvent>, int)
 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_value(int p_layer_number, bool p_value);
+	bool get_collision_layer_value(int p_layer_number) const;
+
+	void set_collision_mask_value(int p_layer_number, bool p_value);
+	bool get_collision_mask_value(int p_layer_number) const;
+
+	void set_disable_mode(DisableMode p_mode);
+	DisableMode get_disable_mode() 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);
@@ -107,7 +149,7 @@ public:
 	void set_pickable(bool p_enabled);
 	bool is_pickable() const;
 
-	String get_configuration_warning() const override;
+	TypedArray<String> get_configuration_warnings() const override;
 
 	_FORCE_INLINE_ RID get_rid() const { return rid; }
 
@@ -115,4 +157,6 @@ public:
 	~CollisionObject2D();
 };
 
+VARIANT_ENUM_CAST(CollisionObject2D::DisableMode);
+
 #endif // COLLISION_OBJECT_2D_H