Merge pull request #7422 from lonesurvivor/master

Improvement to y_sort: make clear which item has to be drawn first

Merge pull request #7422 from lonesurvivor/master
f2e99826 · Rémi Verschelde · GitHub · 8acd0583 · 8b8807e3 · f2e99826
Commit f2e99826 authored Jan 03, 2017 by Rémi Verschelde Committed by GitHub Jan 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

visual_server_canvas.h servers/visual/visual_server_canvas.h +4 -1

No files found.
--- a/servers/visual/visual_server_canvas.h
+++ b/servers/visual/visual_server_canvas.h
@@ -44,7 +44,10 @@ public:

 		_FORCE_INLINE_ bool operator()(const Item* p_left,const Item* p_right) const {

-			return p_left->xform.elements[2].y < p_right->xform.elements[2].y;
+			if(Math::abs(p_left->xform.elements[2].y - p_right->xform.elements[2].y) < CMP_EPSILON )
+				return p_left->xform.elements[2].x < p_right->xform.elements[2].x;
+			else
+				return p_left->xform.elements[2].y < p_right->xform.elements[2].y;
 		}
 	};