From 474d616204efd9b60bacd48497462865adaac0b2 Mon Sep 17 00:00:00 2001
From: Tom Conkling <tim@threerings.net>
Date: Tue, 19 Feb 2008 00:33:16 +0000
Subject: [PATCH] DisplayUtil.sortDisplayChildren takes a comparison function
 returning -1, 0, or 1, rather than a Boolean lessEqual function

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@422 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 src/as/com/threerings/flash/DisplayUtil.as | 28 ++++++++++++----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/as/com/threerings/flash/DisplayUtil.as b/src/as/com/threerings/flash/DisplayUtil.as
index 6b3f6c7d..c4060ba8 100644
--- a/src/as/com/threerings/flash/DisplayUtil.as
+++ b/src/as/com/threerings/flash/DisplayUtil.as
@@ -35,39 +35,41 @@ public class DisplayUtil
     /**
      * Quicksorts container's children.
      * 
-     * lessEqualComp is a function that takes two DisplayObjects, and returns Boolean 'true' if the
-     * first object is less than or equal to the second.
+     * comp is a function that takes two DisplayObjects, and returns int -1 if the first
+     * object should appear before the second in the container, 1 if it should appear after,
+     * and 0 if the order does not matter. (Since quicksort is not a stable sort algorithm,
+     * returning 0 in the compare function is equivalent to returning -1).
      * 
-     * If lessEqualComp is null, sortDisplayChildren will sort container so that objects with smaller
+     * If comp is null, sortDisplayChildren will sort container so that objects with smaller
      * y-values appear before objects with larger y-values.
      */ 
-    public static function sortDisplayChildren (container :DisplayObjectContainer, lessEqualComp :Function = null) :void
+    public static function sortDisplayChildren (container :DisplayObjectContainer, comp :Function = null) :void
     {
-        qsortDisplayChildren(container, 0, container.numChildren - 1, (null != lessEqualComp ? lessEqualComp : displayObjectYLessEqual));
+        qsortDisplayChildren(container, 0, container.numChildren - 1, (null != comp ? comp : displayObjectYLessEqual));
     }
     
-    private static function displayObjectYLessEqual (a :DisplayObject, b :DisplayObject) :Boolean
+    private static function displayObjectYLessEqual (a :DisplayObject, b :DisplayObject) :int
     {
-        return (a.y <= b.y);
+        return (a.y <= b.y ? -1 : 1);
     }
     
     /** Helper function for sortDisplayChildren. */
-    private static function qsortDisplayChildren (container :DisplayObjectContainer, left :int, right :int, lessEqualComp :Function) :void
+    private static function qsortDisplayChildren (container :DisplayObjectContainer, left :int, right :int, comp :Function) :void
     {
         if (right - left > 1) { // containers of size 0 or 1 are already sorted
             
             // arbitrarily choose the element in the middle of the sort list as the pivot element
             var pivotIndex :int = left + ((right - left) * 0.5);
             
-            pivotIndex = partitionDisplayChildren(container, left, right, pivotIndex, lessEqualComp);
-            qsortDisplayChildren(container, left, pivotIndex - 1, lessEqualComp);
-            qsortDisplayChildren(container, pivotIndex + 1, right, lessEqualComp);
+            pivotIndex = partitionDisplayChildren(container, left, right, pivotIndex, comp);
+            qsortDisplayChildren(container, left, pivotIndex - 1, comp);
+            qsortDisplayChildren(container, pivotIndex + 1, right, comp);
         }
     }
     
     /** Helper function for qsortDisplayChildren. */
     private static function partitionDisplayChildren (
-        container :DisplayObjectContainer, left :int, right :int, pivotIndex :int, lessEqualComp :Function) :int
+        container :DisplayObjectContainer, left :int, right :int, pivotIndex :int, comp :Function) :int
     {
         var pivotObj :DisplayObject = container.getChildAt(pivotIndex);
         
@@ -77,7 +79,7 @@ public class DisplayUtil
         
         for (var i :int = left; i < right; ++i) {
             var thisObj :DisplayObject = container.getChildAt(i);
-            if (lessEqualComp(thisObj, pivotObj)) {
+            if (1 != comp(thisObj, pivotObj)) {
                 container.swapChildrenAt(i, storeIndex);
                 storeIndex += 1;
             }