Merge remote-tracking branch 'upstream/master'

1 files changed, 24 insertions, 1 deletions

diff --git a/scene/resources/convex_polygon_shape_2d.cpp b/scene/resources/convex_polygon_shape_2d.cpp
index 74506f8600..dac39fc846 100644
--- a/scene/resources/convex_polygon_shape_2d.cpp
+++ b/scene/resources/convex_polygon_shape_2d.cpp
@@ -29,7 +29,7 @@
 #include "convex_polygon_shape_2d.h"
 
 #include "servers/physics_2d_server.h"
-
+#include "servers/visual_server.h"
 void ConvexPolygonShape2D::_update_shape() {
 
 	Physics2DServer::get_singleton()->shape_set_data(get_rid(),points);
@@ -66,6 +66,29 @@ void ConvexPolygonShape2D::_bind_methods() {
 
 }
 
+void ConvexPolygonShape2D::draw(const RID& p_to_rid,const Color& p_color) {
+
+
+	Vector<Color> col;
+	col.push_back(p_color);
+	VisualServer::get_singleton()->canvas_item_add_polygon(p_to_rid,points,col);
+}
+
+Rect2 ConvexPolygonShape2D::get_rect() const  {
+
+
+	Rect2 rect;
+	for(int i=0;i<points.size();i++) {
+		if (i==0)
+			rect.pos=points[i];
+		else
+			rect.expand_to(points[i]);
+	}
+
+	return rect;
+
+}
+
 ConvexPolygonShape2D::ConvexPolygonShape2D() : Shape2D( Physics2DServer::get_singleton()->shape_create(Physics2DServer::SHAPE_CONVEX_POLYGON)) {