@galacean/engine 1.3.7 → 1.3.9

package/dist/browser.js

@@ -23579,39 +23579,43 @@
             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;
     }();
@@ -24746,6 +24750,7 @@
        */ SystemInfo._initialize = function _initialize() {
             {
                 if (typeof navigator == "undefined") {
+                    SystemInfo._isBrowser = false;
                     return;
                 }
                 var userAgent = navigator.userAgent;
@@ -24857,6 +24862,9 @@
     (function() {
         /** The operating system is running on. */ SystemInfo.operatingSystem = "";
     })();
+    (function() {
+        /** @internal */ SystemInfo._isBrowser = true;
+    })();
     (function() {
         /** Whether the system support SIMD. */ SystemInfo._simdSupported = null;
     })();
@@ -48059,9 +48067,14 @@
             var _this;
             _this = GLTFExtensionParser1.call(this) || this;
             _this._supportWebP = false;
-            var testCanvas = document.createElement("canvas");
-            testCanvas.width = testCanvas.height = 1;
-            _this._supportWebP = testCanvas.toDataURL("image/webp").indexOf("data:image/webp") == 0;
+            // @ts-ignore
+            if (SystemInfo._isBrowser) {
+                var testCanvas = document.createElement("canvas");
+                testCanvas.width = testCanvas.height = 1;
+                _this._supportWebP = testCanvas.toDataURL("image/webp").indexOf("data:image/webp") == 0;
+            } else {
+                _this._supportWebP = false;
+            }
             return _this;
         };
         _inherits(EXT_texture_webp, GLTFExtensionParser1);
@@ -48088,7 +48101,7 @@
     ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "1.3.7";
+    var version = "1.3.9";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);