1 files changed, 4 insertions, 91 deletions

diff --git a/scene/resources/segment_shape_2d.cpp b/scene/resources/segment_shape_2d.cpp
index 814c349784..b1001203a1 100644
--- a/scene/resources/segment_shape_2d.cpp
+++ b/scene/resources/segment_shape_2d.cpp
@@ -30,18 +30,17 @@
 
 #include "segment_shape_2d.h"
 
+#include "core/math/geometry_2d.h"
 #include "servers/physics_server_2d.h"
 #include "servers/rendering_server.h"
 
 bool SegmentShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
-
 	Vector2 l[2] = { a, b };
-	Vector2 closest = Geometry::get_closest_point_to_segment_2d(p_point, l);
+	Vector2 closest = Geometry2D::get_closest_point_to_segment(p_point, l);
 	return p_point.distance_to(closest) < p_tolerance;
 }
 
 void SegmentShape2D::_update_shape() {
-
 	Rect2 r;
 	r.position = a;
 	r.size = b;
@@ -50,32 +49,28 @@ void SegmentShape2D::_update_shape() {
 }
 
 void SegmentShape2D::set_a(const Vector2 &p_a) {
-
 	a = p_a;
 	_update_shape();
 }
-Vector2 SegmentShape2D::get_a() const {
 
+Vector2 SegmentShape2D::get_a() const {
 	return a;
 }
 
 void SegmentShape2D::set_b(const Vector2 &p_b) {
-
 	b = p_b;
 	_update_shape();
 }
-Vector2 SegmentShape2D::get_b() const {
 
+Vector2 SegmentShape2D::get_b() const {
 	return b;
 }
 
 void SegmentShape2D::draw(const RID &p_to_rid, const Color &p_color) {
-
 	RenderingServer::get_singleton()->canvas_item_add_line(p_to_rid, a, b, p_color, 3);
 }
 
 Rect2 SegmentShape2D::get_rect() const {
-
 	Rect2 rect;
 	rect.position = a;
 	rect.expand_to(b);
@@ -87,7 +82,6 @@ real_t SegmentShape2D::get_enclosing_radius() const {
 }
 
 void SegmentShape2D::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_a", "a"), &SegmentShape2D::set_a);
 	ClassDB::bind_method(D_METHOD("get_a"), &SegmentShape2D::get_a);
 
@@ -100,88 +94,7 @@ void SegmentShape2D::_bind_methods() {
 
 SegmentShape2D::SegmentShape2D() :
 		Shape2D(PhysicsServer2D::get_singleton()->segment_shape_create()) {
-
 	a = Vector2();
 	b = Vector2(0, 10);
 	_update_shape();
 }
-
-////////////////////////////////////////////////////////////
-
-void RayShape2D::_update_shape() {
-
-	Dictionary d;
-	d["length"] = length;
-	d["slips_on_slope"] = slips_on_slope;
-	PhysicsServer2D::get_singleton()->shape_set_data(get_rid(), d);
-	emit_changed();
-}
-
-void RayShape2D::draw(const RID &p_to_rid, const Color &p_color) {
-
-	Vector2 tip = Vector2(0, get_length());
-	RS::get_singleton()->canvas_item_add_line(p_to_rid, Vector2(), tip, p_color, 3);
-	Vector<Vector2> pts;
-	float tsize = 4;
-	pts.push_back(tip + Vector2(0, tsize));
-	pts.push_back(tip + Vector2(Math_SQRT12 * tsize, 0));
-	pts.push_back(tip + Vector2(-Math_SQRT12 * tsize, 0));
-	Vector<Color> cols;
-	for (int i = 0; i < 3; i++)
-		cols.push_back(p_color);
-
-	RS::get_singleton()->canvas_item_add_primitive(p_to_rid, pts, cols, Vector<Point2>(), RID());
-}
-
-Rect2 RayShape2D::get_rect() const {
-
-	Rect2 rect;
-	rect.position = Vector2();
-	rect.expand_to(Vector2(0, length));
-	rect = rect.grow(Math_SQRT12 * 4);
-	return rect;
-}
-
-real_t RayShape2D::get_enclosing_radius() const {
-	return length;
-}
-
-void RayShape2D::_bind_methods() {
-
-	ClassDB::bind_method(D_METHOD("set_length", "length"), &RayShape2D::set_length);
-	ClassDB::bind_method(D_METHOD("get_length"), &RayShape2D::get_length);
-
-	ClassDB::bind_method(D_METHOD("set_slips_on_slope", "active"), &RayShape2D::set_slips_on_slope);
-	ClassDB::bind_method(D_METHOD("get_slips_on_slope"), &RayShape2D::get_slips_on_slope);
-
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "length"), "set_length", "get_length");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "slips_on_slope"), "set_slips_on_slope", "get_slips_on_slope");
-}
-
-void RayShape2D::set_length(real_t p_length) {
-
-	length = p_length;
-	_update_shape();
-}
-real_t RayShape2D::get_length() const {
-
-	return length;
-}
-
-void RayShape2D::set_slips_on_slope(bool p_active) {
-
-	slips_on_slope = p_active;
-	_update_shape();
-}
-
-bool RayShape2D::get_slips_on_slope() const {
-	return slips_on_slope;
-}
-
-RayShape2D::RayShape2D() :
-		Shape2D(PhysicsServer2D::get_singleton()->ray_shape_create()) {
-
-	length = 20;
-	slips_on_slope = false;
-	_update_shape();
-}