1 files changed, 6 insertions, 97 deletions

diff --git a/scene/2d/collision_shape_2d.cpp b/scene/2d/collision_shape_2d.cpp
index a0a015a99e..cd89e914fb 100644
--- a/scene/2d/collision_shape_2d.cpp
+++ b/scene/2d/collision_shape_2d.cpp
@@ -109,109 +109,18 @@ void CollisionShape2D::_notification(int p_what) {
 		} break;*/
 		case NOTIFICATION_DRAW: {
 
-			if (!get_tree()->is_editor_hint())
-				return;
+			if (!get_tree()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) {
+				break;
+			}
 
 			rect=Rect2();
 
-			Color draw_col=Color(0,0.6,0.7,0.5);
-
-			if (shape->cast_to<LineShape2D>()) {
-
-				LineShape2D *l = shape->cast_to<LineShape2D>();
-				Vector2 point = l->get_d() * l->get_normal();
-
-				Vector2 l1[2]={point-l->get_normal().tangent()*100,point+l->get_normal().tangent()*100};
-				draw_line(l1[0],l1[1],draw_col,3);
-				Vector2 l2[2]={point,point+l->get_normal()*30};
-				draw_line(l2[0],l2[1],draw_col,3);
-				rect.pos=l1[0];
-				rect.expand_to(l1[1]);
-				rect.expand_to(l2[0]);
-				rect.expand_to(l2[1]);
-
-			} else if (shape->cast_to<SegmentShape2D>()) {
-
-				SegmentShape2D *s = shape->cast_to<SegmentShape2D>();
-				draw_line(s->get_a(),s->get_b(),draw_col,3);
-				rect.pos=s->get_a();
-				rect.expand_to(s->get_b());
-
-			} else if (shape->cast_to<RayShape2D>()) {
-
-				RayShape2D *s = shape->cast_to<RayShape2D>();
-
-				Vector2 tip = Vector2(0,s->get_length());
-				draw_line(Vector2(),tip,draw_col,3);
-				Vector<Vector2> pts;
-				float tsize=4;
-				pts.push_back(tip+Vector2(0,tsize));
-				pts.push_back(tip+Vector2(0.707*tsize,0));
-				pts.push_back(tip+Vector2(-0.707*tsize,0));
-				Vector<Color> cols;
-				for(int i=0;i<3;i++)
-					cols.push_back(draw_col);
-
-				draw_primitive(pts,cols,Vector<Vector2>()); //small arrow
-
-				rect.pos=Vector2();
-				rect.expand_to(tip);
-				rect=rect.grow(0.707*tsize);
-
-			} else if (shape->cast_to<CircleShape2D>()) {
-
-				CircleShape2D *s = shape->cast_to<CircleShape2D>();
-				Vector<Vector2> points;
-				for(int i=0;i<24;i++) {
-
-					points.push_back(Vector2(Math::cos(i*Math_PI*2/24.0),Math::sin(i*Math_PI*2/24.0))*s->get_radius());
-				}
-
-				draw_colored_polygon(points,draw_col);
-				rect.pos=-Point2(s->get_radius(),s->get_radius());
-				rect.size=Point2(s->get_radius(),s->get_radius())*2.0;
-
-			} else if (shape->cast_to<RectangleShape2D>()) {
-
-				RectangleShape2D *s = shape->cast_to<RectangleShape2D>();
-				Vector2 he = s->get_extents();
-				rect=Rect2(-he,he*2.0);
-				draw_rect(rect,draw_col);;
 
-			} else if (shape->cast_to<CapsuleShape2D>()) {
-
-				CapsuleShape2D *s = shape->cast_to<CapsuleShape2D>();
-
-				Vector<Vector2> points;
-				for(int i=0;i<24;i++) {
-					Vector2 ofs = Vector2(0,(i>6 && i<=18) ? -s->get_height()*0.5 : s->get_height()*0.5);
-
-					points.push_back(Vector2(Math::sin(i*Math_PI*2/24.0),Math::cos(i*Math_PI*2/24.0))*s->get_radius() + ofs);
-					if (i==6 || i==18)
-						points.push_back(Vector2(Math::sin(i*Math_PI*2/24.0),Math::cos(i*Math_PI*2/24.0))*s->get_radius() - ofs);
-				}
+			Color draw_col=get_tree()->get_debug_collisions_color();
+			shape->draw(get_canvas_item(),draw_col);
 
-				draw_colored_polygon(points,draw_col);
-				Vector2 he=Point2(s->get_radius(),s->get_radius()+s->get_height()*0.5);
-				rect.pos=-he;
-				rect.size=he*2.0;
-
-			} else if (shape->cast_to<ConvexPolygonShape2D>()) {
-
-				ConvexPolygonShape2D *s = shape->cast_to<ConvexPolygonShape2D>();
-
-				Vector<Vector2> points = s->get_points();
-				for(int i=0;i<points.size();i++) {
-					if (i==0)
-						rect.pos=points[i];
-					else
-						rect.expand_to(points[i]);
-				}
-
-				draw_colored_polygon(points,draw_col);
-
-			}
 
+			rect=shape->get_rect();
 			rect=rect.grow(3);
 
 		} break;