-Trigger shapes removed in 2D, they became obsolete long ago when areas could detect their own overlap

-Added ability to disable individual collisionshape/polygon
-Moved One Way Collision to shape, allowing more flexibility
-Changed internals of CollisionObject, shapes are generated from child nodes on the fly, not stored inside any longer.
-Modifying a CollisionPolygon2D on the fly now works, it can even be animated.

Will port this to 3D once well tested. Have fun!

1 files changed, 14 insertions, 18 deletions

diff --git a/scene/2d/collision_polygon_2d.h b/scene/2d/collision_polygon_2d.h
index b1a4a4822d..f0666ba9de 100644
--- a/scene/2d/collision_polygon_2d.h
+++ b/scene/2d/collision_polygon_2d.h
@@ -33,6 +33,8 @@
 #include "scene/2d/node_2d.h"
 #include "scene/resources/shape_2d.h"
 
+class CollisionObject2D;
+
 class CollisionPolygon2D : public Node2D {
 
 	GDCLASS(CollisionPolygon2D, Node2D);
@@ -47,29 +49,20 @@ protected:
 	Rect2 aabb;
 	BuildMode build_mode;
 	Vector<Point2> polygon;
-	bool trigger;
-	bool unparenting;
-
-	void _add_to_collision_object(Object *p_obj);
-	void _update_parent();
-
-	bool can_update_body;
-	int shape_from;
-	int shape_to;
-
-	void _set_shape_range(const Vector2 &p_range);
-	Vector2 _get_shape_range() const;
+	uint32_t owner_id;
+	CollisionObject2D *parent;
+	bool disabled;
+	bool one_way_collision;
 
 	Vector<Vector<Vector2> > _decompose_in_convex();
 
+	void _build_polygon();
+
 protected:
 	void _notification(int p_what);
 	static void _bind_methods();
 
 public:
-	void set_trigger(bool p_trigger);
-	bool is_trigger() const;
-
 	void set_build_mode(BuildMode p_mode);
 	BuildMode get_build_mode() const;
 
@@ -78,11 +71,14 @@ public:
 
 	virtual Rect2 get_item_rect() const;
 
-	int get_collision_object_first_shape() const { return shape_from; }
-	int get_collision_object_last_shape() const { return shape_to; }
-
 	virtual String get_configuration_warning() const;
 
+	void set_disabled(bool p_disabled);
+	bool is_disabled() const;
+
+	void set_one_way_collision(bool p_enable);
+	bool is_one_way_collision_enabled() const;
+
 	CollisionPolygon2D();
 };