From 6cc9d9d9d12e1092e06da3bda18cd42d625515d7 Mon Sep 17 00:00:00 2001
From: Hector Martin <hector@marcansoft.com>
Date: Sat, 18 Dec 2010 21:23:32 +0100
Subject: [PATCH] Improve object ordering again, reduce some jitter issues

---
 libol/libol.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/libol/libol.c b/libol/libol.c
index 7f595cc..4baa7b9 100644
--- a/libol/libol.c
+++ b/libol/libol.c
@@ -730,7 +730,6 @@ float olRenderFrame(int max_fps)
 
 	if (!(params.render_flags & RENDER_NOREORDER)) {
 		Point closest_to = {-1,-1,0}; // first look for the object nearest the topleft
-		//Point closest_to = last_render_point;
 		while(cnt) {
 			Object *closest = NULL;
 			for (i=0; i<wframe.objcnt; i++) {
@@ -740,11 +739,9 @@ float olRenderFrame(int max_fps)
 					continue;
 				float dx = wframe.objects[i].points[0].x - closest_to.x;
 				float dy = wframe.objects[i].points[0].y - closest_to.y;
-				if (frames[cwbuf].pnext == 0) {
-					dx = wframe.objects[i].points[0].x + 1;
-					dy = wframe.objects[i].points[0].y + 1;
-				}
-				float distance = fmaxf(fabsf(dx),fabsf(dy));
+				dx = wframe.objects[i].points[0].x + 1;
+				dy = wframe.objects[i].points[0].y + 1;
+				float distance = fmaxf(fabsf(dx),fabsf(dy)) + 0.01*(fabsf(dx)+fabsf(dy));
 				if (!closest || distance < dclosest) {
 					closest = &wframe.objects[i];
 					clinv = 0;
@@ -752,7 +749,7 @@ float olRenderFrame(int max_fps)
 				}
 				dx = wframe.objects[i].points[wframe.objects[i].pointcnt-1].x - closest_to.x;
 				dy = wframe.objects[i].points[wframe.objects[i].pointcnt-1].y - closest_to.y;
-				distance = fmaxf(fabsf(dx),fabsf(dy));
+				distance = fmaxf(fabsf(dx),fabsf(dy)) + 0.01*(fabsf(dx)+fabsf(dy));
 				if(!closest || distance < dclosest) {
 					closest = &wframe.objects[i];
 					clinv = 1;
-- 
2.52.0