@galacean/engine 1.1.0-beta.11 → 1.1.0-beta.13

package/dist/browser.js

@@ -21269,7 +21269,7 @@
      * @internal
      */ var ShaderProgramPool = /*#__PURE__*/ function() {
         var ShaderProgramPool = function ShaderProgramPool() {
-            this._cacheHierarchy = 1;
+            this._cacheHierarchyDepth = 1;
             this._cacheMap = Object.create(null);
         };
         var _proto = ShaderProgramPool.prototype;
@@ -21280,12 +21280,14 @@
        */ _proto.get = function get(macros) {
             var cacheMap = this._cacheMap;
             var maskLength = macros._length;
-            if (maskLength > this._cacheHierarchy) {
-                this._resizeCacheMapHierarchy(cacheMap, 0, maskLength);
+            var cacheHierarchyDepth = this._cacheHierarchyDepth;
+            if (maskLength > cacheHierarchyDepth) {
+                this._resizeCacheMapHierarchy(cacheMap, 0, cacheHierarchyDepth, maskLength - cacheHierarchyDepth);
+                this._cacheHierarchyDepth = maskLength;
             }
             var mask = macros._mask;
             var endIndex = macros._length - 1;
-            var maxEndIndex = this._cacheHierarchy - 1;
+            var maxEndIndex = this._cacheHierarchyDepth - 1;
             for(var i = 0; i < maxEndIndex; i++){
                 var subMask = endIndex < i ? 0 : mask[i];
                 var subCacheShaders = cacheMap[subMask];
@@ -21310,25 +21312,21 @@
        */ _proto.cache = function cache(shaderProgram) {
             this._lastQueryMap[this._lastQueryKey] = shaderProgram;
         };
-        _proto._resizeCacheMapHierarchy = function _resizeCacheMapHierarchy(cacheMap, hierarchy, resizeLength) {
-            // only expand but not shrink.
-            var end = this._cacheHierarchy - 1;
-            if (hierarchy == end) {
+        _proto._resizeCacheMapHierarchy = function _resizeCacheMapHierarchy(cacheMap, hierarchy, currentHierarchy, increaseHierarchy) {
+            // Only expand but not shrink
+            if (hierarchy == currentHierarchy - 1) {
                 for(var k in cacheMap){
                     var shader = cacheMap[k];
                     var subCacheMap = cacheMap;
-                    for(var i = 0, n = resizeLength - end; i < n; i++){
-                        if (i == n - 1) {
-                            subCacheMap[0] = shader;
-                        } else {
-                            subCacheMap = subCacheMap[i == 0 ? k : 0] = Object.create(null);
-                        }
+                    for(var i = 0; i < increaseHierarchy; i++){
+                        subCacheMap[i == 0 ? k : 0] = subCacheMap = Object.create(null);
                     }
+                    subCacheMap[0] = shader;
                 }
-                this._cacheHierarchy = resizeLength;
             } else {
+                hierarchy++;
                 for(var k1 in cacheMap){
-                    this._resizeCacheMapHierarchy(cacheMap[k1], ++hierarchy, resizeLength);
+                    this._resizeCacheMapHierarchy(cacheMap[k1], hierarchy, currentHierarchy, increaseHierarchy);
                 }
             }
         };
@@ -38772,10 +38770,10 @@
     /**
      * @internal
      */ var GLTFParserContext = /*#__PURE__*/ function() {
-        var GLTFParserContext = function GLTFParserContext(glTFResource, resourceManager, keepMeshData) {
+        var GLTFParserContext = function GLTFParserContext(glTFResource, resourceManager, params) {
             this.glTFResource = glTFResource;
             this.resourceManager = resourceManager;
-            this.keepMeshData = keepMeshData;
+            this.params = params;
             this.accessorBufferCache = {};
             this._resourceCache = new Map();
             this.contentRestorer = new GLTFContentRestorer(glTFResource);
@@ -41089,7 +41087,7 @@
                             return context.get(exports.GLTFParserType.Buffer).then(function(buffers) {
                                 return GLTFUtils.getAccessorData(glTF, indexAccessor, buffers);
                             });
-                        }, context.keepMeshData).then(resolve);
+                        }, context.params.keepMeshData).then(resolve);
                     }
                 });
             };
@@ -41269,6 +41267,7 @@
             var _this = this;
             var _context_glTF = context.glTF, scenes = _context_glTF.scenes, _context_glTF_scene = _context_glTF.scene, scene = _context_glTF_scene === void 0 ? 0 : _context_glTF_scene, glTFResource = context.glTFResource;
             var sceneInfo = scenes[index];
+            var sceneExtensions = sceneInfo.extensions;
             var engine = glTFResource.engine;
             var isDefaultScene = scene === index;
             var sceneNodes = sceneInfo.nodes;
@@ -41294,6 +41293,7 @@
                 promises.push(this._parseEntityComponent(context, sceneNodes[i1]));
             }
             return Promise.all(promises).then(function() {
+                GLTFParser.executeExtensionsAdditiveAndParse(sceneExtensions, context, sceneRoot, sceneInfo);
                 if (isDefaultScene) {
                     return Promise.all([
                         context.get(exports.GLTFParserType.Skin),
@@ -41666,11 +41666,12 @@
         _inherits(GLTFLoader, Loader1);
         var _proto = GLTFLoader.prototype;
         _proto.load = function load(item, resourceManager) {
-            var _params;
             var url = item.url;
             var params = item.params;
             var glTFResource = new GLTFResource(resourceManager.engine, url);
-            var context = new GLTFParserContext(glTFResource, resourceManager, !!((_params = params) == null ? void 0 : _params.keepMeshData));
+            var context = new GLTFParserContext(glTFResource, resourceManager, _extends({
+                keepMeshData: false
+            }, params));
             return context.parse();
         };
         return GLTFLoader;
@@ -42861,7 +42862,7 @@
                         throw "BlendShape animation is not supported when using draco.";
                     }, function() {
                         return decodedGeometry.index.array;
-                    }, context.keepMeshData);
+                    }, context.params.keepMeshData);
                 });
             });
         };
@@ -43296,7 +43297,7 @@
     ], GALACEAN_animation_event);
 
     //@ts-ignore
-    var version = "1.1.0-beta.11";
+    var version = "1.1.0-beta.13";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);