@galacean/engine-core 1.3.7 → 1.3.8

package/dist/miniprogram.js

@@ -18840,39 +18840,43 @@ var ObjectPool = /*#__PURE__*/ function() {
         return null;
     };
     _proto._freeArea = function _freeArea(area) {
-        var areas = this.vertexFreeAreas;
-        var areaLen = areas.length;
-        if (areaLen === 0) {
-            areas.push(area);
-            return;
-        }
+        var start = area.start, size = area.size;
+        var freeAreas = this.vertexFreeAreas;
+        var end = start + size;
         var pool = PrimitiveChunk.areaPool;
-        var preArea = area;
-        var notMerge = true;
-        for(var i = 0; i < areaLen; ++i){
-            var curArea = areas[i];
-            var preStart = preArea.start, size = preArea.size;
-            var curStart = curArea.start;
-            var preEnd = preStart + size;
-            var curEnd = curStart + curArea.size;
-            if (preEnd < curStart) {
-                notMerge && areas.splice(i, 0, preArea);
+        for(var i = 0, areaLen = freeAreas.length; i < areaLen; ++i){
+            var curFreeArea = freeAreas[i];
+            var curStart = curFreeArea.start;
+            var curEnd = curStart + curFreeArea.size;
+            if (end < curStart) {
+                // The area to be freed is to the left of the current free area and is not connected
+                freeAreas.splice(i, 0, area);
+                return;
+            } else if (end === curStart) {
+                // The area to be freed is to the left of the current free area and is connected
+                curFreeArea.start = start;
+                curFreeArea.size += size;
+                pool.return(area);
+                return;
+            } else if (start === curEnd) {
+                // The area to be freed is to the right of the current free area and is connected
+                curFreeArea.size += size;
+                pool.return(area);
+                var nextIndex = i + 1;
+                if (nextIndex < areaLen) {
+                    var nextFreeArea = freeAreas[nextIndex];
+                    if (end === nextFreeArea.start) {
+                        // The cur free area after merge is to the left of the next free area and is connected
+                        curFreeArea.size += nextFreeArea.size;
+                        freeAreas.splice(nextIndex, 1);
+                        pool.return(nextFreeArea);
+                    }
+                }
                 return;
-            } else if (preEnd === curStart) {
-                curArea.start = preStart;
-                curArea.size += size;
-                pool.return(preArea);
-                preArea = curArea;
-                notMerge = false;
-            } else if (preStart === curEnd) {
-                curArea.size += size;
-                pool.return(preArea);
-                preArea = curArea;
-                notMerge = false;
-            } else if (preStart > curEnd) {
-                i + 1 === areaLen && areas.push(preArea);
             }
         }
+        // The area to be freed is to the right of the last free area and is not connected or free areas is empty
+        freeAreas.push(area);
     };
     return PrimitiveChunk;
 }();

package/dist/module.js

@@ -18835,39 +18835,43 @@ var ObjectPool = /*#__PURE__*/ function() {
         return null;
     };
     _proto._freeArea = function _freeArea(area) {
-        var areas = this.vertexFreeAreas;
-        var areaLen = areas.length;
-        if (areaLen === 0) {
-            areas.push(area);
-            return;
-        }
+        var start = area.start, size = area.size;
+        var freeAreas = this.vertexFreeAreas;
+        var end = start + size;
         var pool = PrimitiveChunk.areaPool;
-        var preArea = area;
-        var notMerge = true;
-        for(var i = 0; i < areaLen; ++i){
-            var curArea = areas[i];
-            var preStart = preArea.start, size = preArea.size;
-            var curStart = curArea.start;
-            var preEnd = preStart + size;
-            var curEnd = curStart + curArea.size;
-            if (preEnd < curStart) {
-                notMerge && areas.splice(i, 0, preArea);
+        for(var i = 0, areaLen = freeAreas.length; i < areaLen; ++i){
+            var curFreeArea = freeAreas[i];
+            var curStart = curFreeArea.start;
+            var curEnd = curStart + curFreeArea.size;
+            if (end < curStart) {
+                // The area to be freed is to the left of the current free area and is not connected
+                freeAreas.splice(i, 0, area);
+                return;
+            } else if (end === curStart) {
+                // The area to be freed is to the left of the current free area and is connected
+                curFreeArea.start = start;
+                curFreeArea.size += size;
+                pool.return(area);
+                return;
+            } else if (start === curEnd) {
+                // The area to be freed is to the right of the current free area and is connected
+                curFreeArea.size += size;
+                pool.return(area);
+                var nextIndex = i + 1;
+                if (nextIndex < areaLen) {
+                    var nextFreeArea = freeAreas[nextIndex];
+                    if (end === nextFreeArea.start) {
+                        // The cur free area after merge is to the left of the next free area and is connected
+                        curFreeArea.size += nextFreeArea.size;
+                        freeAreas.splice(nextIndex, 1);
+                        pool.return(nextFreeArea);
+                    }
+                }
                 return;
-            } else if (preEnd === curStart) {
-                curArea.start = preStart;
-                curArea.size += size;
-                pool.return(preArea);
-                preArea = curArea;
-                notMerge = false;
-            } else if (preStart === curEnd) {
-                curArea.size += size;
-                pool.return(preArea);
-                preArea = curArea;
-                notMerge = false;
-            } else if (preStart > curEnd) {
-                i + 1 === areaLen && areas.push(preArea);
             }
         }
+        // The area to be freed is to the right of the last free area and is not connected or free areas is empty
+        freeAreas.push(area);
     };
     return PrimitiveChunk;
 }();