@galacean/engine-loader 1.1.0-beta.0 → 1.1.0-beta.10

package/dist/main.js

@@ -527,12 +527,12 @@ function _construct(Parent, args, Class) {
 }
 
 var ReflectionParser = /*#__PURE__*/ function() {
-    function ReflectionParser() {}
-    ReflectionParser.registerCustomParseComponent = function registerCustomParseComponent(componentType, handle) {
-        this.customParseComponentHandles[componentType] = handle;
-    };
-    ReflectionParser.parseEntity = function parseEntity(entityConfig, engine) {
-        return ReflectionParser.getEntityByConfig(entityConfig, engine).then(function(entity) {
+    function ReflectionParser(_context) {
+        this._context = _context;
+    }
+    var _proto = ReflectionParser.prototype;
+    _proto.parseEntity = function parseEntity(entityConfig) {
+        return this._getEntityByConfig(entityConfig).then(function(entity) {
             var _entityConfig_isActive;
             entity.isActive = (_entityConfig_isActive = entityConfig.isActive) != null ? _entityConfig_isActive : true;
             var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale;
@@ -542,72 +542,29 @@ var ReflectionParser = /*#__PURE__*/ function() {
             return entity;
         });
     };
-    ReflectionParser.getEntityByConfig = function getEntityByConfig(entityConfig, engine) {
-        // @ts-ignore
-        var assetRefId = entityConfig.assetRefId;
-        if (assetRefId) {
-            return engine.resourceManager// @ts-ignore
-            .getResourceByRef({
-                refId: assetRefId,
-                key: entityConfig.key,
-                isClone: entityConfig.isClone
-            }).then(function(entity) {
-                entity.name = entityConfig.name;
-                return entity;
-            });
-        } else {
-            var entity = new engineCore.Entity(engine, entityConfig.name);
-            return Promise.resolve(entity);
-        }
-    };
-    ReflectionParser.parseClassObject = function parseClassObject(item, engine, resourceManager) {
-        if (resourceManager === void 0) resourceManager = engine.resourceManager;
+    _proto.parseClassObject = function parseClassObject(item) {
         var Class = engineCore.Loader.getClass(item.class);
         var _item_constructParams;
         var params = (_item_constructParams = item.constructParams) != null ? _item_constructParams : [];
         var instance = _construct(Class, [].concat(params));
-        return this.parsePropsAndMethods(instance, item, engine, resourceManager);
-    };
-    ReflectionParser.parseBasicType = function parseBasicType(value, engine, resourceManager) {
-        if (resourceManager === void 0) resourceManager = engine.resourceManager;
-        var _this = this;
-        if (Array.isArray(value)) {
-            return Promise.all(value.map(function(item) {
-                return _this.parseBasicType(item, engine, resourceManager);
-            }));
-        } else if (typeof value === "object" && value != null) {
-            if (this._isClass(value)) {
-                // class object
-                return this.parseClassObject(value, engine, resourceManager);
-            } else if (this._isRef(value)) {
-                // reference object
-                return resourceManager.getResourceByRef(value);
-            } else {
-                // basic type
-                return Promise.resolve(value);
-            }
-        } else {
-            return Promise.resolve(value);
-        }
+        return this.parsePropsAndMethods(instance, item);
     };
-    ReflectionParser.parsePropsAndMethods = function parsePropsAndMethods(instance, item, engine, resourceManager) {
-        if (resourceManager === void 0) resourceManager = engine.resourceManager;
-        var _this = this;
+    _proto.parsePropsAndMethods = function parsePropsAndMethods(instance, item) {
         var promises = [];
         if (item.methods) {
             for(var methodName in item.methods){
                 var methodParams = item.methods[methodName];
                 for(var i = 0, count = methodParams.length; i < count; i++){
                     var params = methodParams[i];
-                    var promise = this.parseMethod(instance, methodName, params, engine, resourceManager);
+                    var promise = this.parseMethod(instance, methodName, params);
                     promises.push(promise);
                 }
             }
         }
         if (item.props) {
-            var _this1 = this, _loop = function(key) {
+            var _this = this, _loop = function(key) {
                 var value = item.props[key];
-                var promise = _this1.parseBasicType(value, engine).then(function(v) {
+                var promise = _this.parseBasicType(value).then(function(v) {
                     return instance[key] = v;
                 });
                 promises.push(promise);
@@ -615,27 +572,76 @@ var ReflectionParser = /*#__PURE__*/ function() {
             for(var key in item.props)_loop(key);
         }
         return Promise.all(promises).then(function() {
-            var handle = _this.customParseComponentHandles[instance.constructor.name];
-            if (handle) return handle(instance, item, engine);
+            var handle = ReflectionParser.customParseComponentHandles[instance.constructor.name];
+            if (handle) return handle(instance, item);
             else return instance;
         });
     };
-    ReflectionParser.parseMethod = function parseMethod(instance, methodName, methodParams, engine, resourceManager) {
-        if (resourceManager === void 0) resourceManager = engine.resourceManager;
+    _proto.parseMethod = function parseMethod(instance, methodName, methodParams) {
         var _this = this;
         return Promise.all(methodParams.map(function(param) {
-            return _this.parseBasicType(param, engine, resourceManager);
+            return _this.parseBasicType(param);
         })).then(function(result) {
             var _instance;
             return (_instance = instance)[methodName].apply(_instance, [].concat(result));
         });
     };
+    _proto.parseBasicType = function parseBasicType(value) {
+        var _this = this;
+        if (Array.isArray(value)) {
+            return Promise.all(value.map(function(item) {
+                return _this.parseBasicType(item);
+            }));
+        } else if (typeof value === "object" && value != null) {
+            if (ReflectionParser._isClass(value)) {
+                // class object
+                return this.parseClassObject(value);
+            } else if (ReflectionParser._isAssetRef(value)) {
+                // reference object
+                // @ts-ignore
+                return this._context.resourceManager.getResourceByRef(value);
+            } else if (ReflectionParser._isEntityRef(value)) {
+                // entity reference
+                return Promise.resolve(this._context.entityMap.get(value.entityId));
+            } else {
+                // basic type
+                return Promise.resolve(value);
+            }
+        } else {
+            return Promise.resolve(value);
+        }
+    };
+    _proto._getEntityByConfig = function _getEntityByConfig(entityConfig) {
+        // @ts-ignore
+        var assetRefId = entityConfig.assetRefId;
+        var engine = this._context.engine;
+        if (assetRefId) {
+            return engine.resourceManager// @ts-ignore
+            .getResourceByRef({
+                refId: assetRefId,
+                key: entityConfig.key,
+                isClone: entityConfig.isClone
+            }).then(function(entity) {
+                entity.name = entityConfig.name;
+                return entity;
+            });
+        } else {
+            var entity = new engineCore.Entity(engine, entityConfig.name);
+            return Promise.resolve(entity);
+        }
+    };
+    ReflectionParser.registerCustomParseComponent = function registerCustomParseComponent(componentType, handle) {
+        this.customParseComponentHandles[componentType] = handle;
+    };
     ReflectionParser._isClass = function _isClass(value) {
         return value["class"] != undefined;
     };
-    ReflectionParser._isRef = function _isRef(value) {
+    ReflectionParser._isAssetRef = function _isAssetRef(value) {
         return value["refId"] != undefined;
     };
+    ReflectionParser._isEntityRef = function _isEntityRef(value) {
+        return value["entityId"] != undefined;
+    };
     return ReflectionParser;
 }();
 (function() {
@@ -903,6 +909,8 @@ var SceneParserContext = /*#__PURE__*/ function() {
         this.assets = new Map();
         this.entityConfigMap = new Map();
         this.rootIds = [];
+        this.engine = scene.engine;
+        this.resourceManager = scene.engine.resourceManager;
     }
     var _proto = SceneParserContext.prototype;
     _proto.destroy = function destroy() {
@@ -919,7 +927,7 @@ var SceneParserContext = /*#__PURE__*/ function() {
     function SceneParser(context) {
         var _this = this;
         this.context = context;
-        this._engine = this.context.scene.engine;
+        this._engine = context.scene.engine;
         this._organizeEntities = this._organizeEntities.bind(this);
         this._parseComponents = this._parseComponents.bind(this);
         this._clearAndResolveScene = this._clearAndResolveScene.bind(this);
@@ -927,22 +935,24 @@ var SceneParserContext = /*#__PURE__*/ function() {
             _this._reject = reject;
             _this._resolve = resolve;
         });
+        this._reflectionParser = new ReflectionParser(context);
     }
     var _proto = SceneParser.prototype;
     /** start parse the scene */ _proto.start = function start() {
         this._parseEntities().then(this._organizeEntities).then(this._parseComponents).then(this._clearAndResolveScene).then(this._resolve).catch(this._reject);
     };
     _proto._parseEntities = function _parseEntities() {
+        var _this = this;
         var entitiesConfig = this.context.originalData.entities;
         var entityConfigMap = this.context.entityConfigMap;
         var entitiesMap = this.context.entityMap;
         var rootIds = this.context.rootIds;
-        var engine = this._engine;
+        this._engine;
         var promises = entitiesConfig.map(function(entityConfig) {
             entityConfigMap.set(entityConfig.id, entityConfig);
             // record root entities
             if (!entityConfig.parent) rootIds.push(entityConfig.id);
-            return ReflectionParser.parseEntity(entityConfig, engine);
+            return _this._reflectionParser.parseEntity(entityConfig);
         });
         return Promise.all(promises).then(function(entities) {
             for(var i = 0, l = entities.length; i < l; i++){
@@ -980,7 +990,7 @@ var SceneParserContext = /*#__PURE__*/ function() {
                     component = entity.getComponent(engineCore.Loader.getClass(key));
                 }
                 component = component || entity.addComponent(engineCore.Loader.getClass(key));
-                var promise = ReflectionParser.parsePropsAndMethods(component, componentConfig, entity.engine);
+                var promise = this._reflectionParser.parsePropsAndMethods(component, componentConfig);
                 promises.push(promise);
             }
         }
@@ -2429,20 +2439,56 @@ var AbstractTranscoder = /*#__PURE__*/ function() {
 }();
 
 /** @internal */ function TranscodeWorkerCode$1() {
-    var concat = function concat(arrays) {
-        if (arrays.length === 1) return arrays[0];
-        var totalByteLength = 0;
-        for(var i = 0; i < arrays.length; i++){
-            totalByteLength += arrays[i].byteLength;
+    self.onmessage = function onmessage(event) {
+        var message = event.data;
+        switch(message.type){
+            case "init":
+                init(message.transcoderWasm).then(function() {
+                    self.postMessage("init-completed");
+                }).catch(function(e) {
+                    return self.postMessage({
+                        error: e
+                    });
+                });
+                break;
+            case "transcode":
+                init().then(function(KTX2File) {
+                    var result = transcode(message.buffer, message.format, KTX2File);
+                    // @ts-ignore
+                    result.type = "transcoded";
+                    self.postMessage(result);
+                }).catch(function(e) {
+                    return self.postMessage({
+                        error: e
+                    });
+                });
+                break;
         }
-        var result = new Uint8Array(totalByteLength);
-        var byteOffset = 0;
-        for(var i1 = 0; i1 < arrays.length; i1++){
-            result.set(arrays[i1], byteOffset);
-            byteOffset += arrays[i1].byteLength;
+    };
+}
+var _init = function init() {
+    var initPromise;
+    return function init(wasmBinary) {
+        if (!initPromise) {
+            initPromise = new Promise(function(resolve, reject) {
+                var BasisModule = {
+                    wasmBinary: wasmBinary,
+                    onRuntimeInitialized: function() {
+                        return resolve(BasisModule);
+                    },
+                    onAbort: reject
+                };
+                self["BASIS"](BasisModule);
+            }).then(function(BasisModule) {
+                BasisModule.initializeBasis();
+                return BasisModule.KTX2File;
+            });
         }
-        return result;
+        return initPromise;
     };
+};
+var init = _init();
+function transcode(buffer, targetFormat, KTX2File) {
     var getTranscodeFormatFromTarget = function getTranscodeFormatFromTarget(target, hasAlpha) {
         switch(target){
             case 2:
@@ -2459,76 +2505,24 @@ var AbstractTranscoder = /*#__PURE__*/ function() {
                 return 7;
         }
     };
-    var init = function init(wasmBinary) {
-        transcodePromise = new Promise(function(resolve, reject) {
-            var BasisModule = {
-                wasmBinary: wasmBinary,
-                onRuntimeInitialized: function() {
-                    return resolve(BasisModule);
-                },
-                onAbort: reject
-            };
-            self["BASIS"](BasisModule);
-        }).then(function(BasisModule) {
-            BasisModule.initializeBasis();
-            return BasisModule.KTX2File;
-        });
-        return transcodePromise;
-    };
-    var transcode = function transcode(buffer, targetFormat, KTX2File) {
-        var ktx2File = new KTX2File(new Uint8Array(buffer));
-        function cleanup() {
-            ktx2File.close();
-            ktx2File.delete();
-        }
-        if (!ktx2File.isValid()) {
-            cleanup();
-            throw new Error("Invalid or unsupported .ktx2 file");
-        }
-        var width = ktx2File.getWidth();
-        var height = ktx2File.getHeight();
-        var layerCount = ktx2File.getLayers() || 1;
-        var levelCount = ktx2File.getLevels();
-        var hasAlpha = ktx2File.getHasAlpha();
-        var faceCount = ktx2File.getFaces();
-        var format = getTranscodeFormatFromTarget(targetFormat, hasAlpha);
-        var faces = new Array(faceCount);
-        for(var face = 0; face < faceCount; face++){
-            var mipmaps = new Array(levelCount);
-            for(var mip = 0; mip < levelCount; mip++){
-                var layerMips = new Array(layerCount);
-                var mipWidth = void 0, mipHeight = void 0;
-                for(var layer = 0; layer < layerCount; layer++){
-                    var levelInfo = ktx2File.getImageLevelInfo(mip, layer, face);
-                    mipWidth = levelInfo.origWidth;
-                    mipHeight = levelInfo.origHeight;
-                    var dst = new Uint8Array(ktx2File.getImageTranscodedSizeInBytes(mip, layer, 0, format));
-                    var status = ktx2File.transcodeImage(dst, mip, layer, face, format, 0, -1, -1);
-                    if (!status) {
-                        cleanup();
-                        throw new Error("transcodeImage failed.");
-                    }
-                    layerMips[layer] = dst;
-                }
-                mipmaps[mip] = {
-                    data: concat(layerMips),
-                    width: mipWidth,
-                    height: mipHeight
-                };
-            }
-            faces[face] = mipmaps;
+    var concat = function concat(arrays) {
+        if (arrays.length === 1) return arrays[0];
+        var totalByteLength = 0;
+        for(var i = 0; i < arrays.length; i++){
+            totalByteLength += arrays[i].byteLength;
         }
-        cleanup();
-        return {
-            faces: faces,
-            width: width,
-            height: height,
-            hasAlpha: hasAlpha,
-            faceCount: faceCount,
-            format: format
-        };
+        var result = new Uint8Array(totalByteLength);
+        var byteOffset = 0;
+        for(var i1 = 0; i1 < arrays.length; i1++){
+            result.set(arrays[i1], byteOffset);
+            byteOffset += arrays[i1].byteLength;
+        }
+        return result;
+    };
+    var cleanup = function cleanup() {
+        ktx2File.close();
+        ktx2File.delete();
     };
-    var transcodePromise;
     var BasisFormat;
     (function(BasisFormat) {
         BasisFormat[BasisFormat["ETC1"] = 0] = "ETC1";
@@ -2554,31 +2548,56 @@ var AbstractTranscoder = /*#__PURE__*/ function() {
         TargetFormat[TargetFormat["RG8"] = 6] = "RG8";
         TargetFormat[TargetFormat["RGBA8"] = 7] = "RGBA8";
     })(TargetFormat || (TargetFormat = {}));
-    self.onmessage = function onmessage(event) {
-        var message = event.data;
-        switch(message.type){
-            case "init":
-                init(message.transcoderWasm).then(function() {
-                    return self.postMessage("init-completed");
-                }).catch(function(e) {
-                    return self.postMessage({
-                        error: e
-                    });
-                });
-                break;
-            case "transcode":
-                transcodePromise.then(function(KTX2File) {
-                    var result = transcode(message.buffer, message.format, KTX2File);
-                    // @ts-ignore
-                    result.type = "transcoded";
-                    self.postMessage(result);
-                }).catch(function(e) {
-                    return self.postMessage({
-                        error: e
-                    });
-                });
-                break;
+    var ktx2File = new KTX2File(new Uint8Array(buffer));
+    if (!ktx2File.isValid()) {
+        cleanup();
+        throw new Error("Invalid or unsupported .ktx2 file");
+    }
+    if (!ktx2File.startTranscoding()) {
+        cleanup();
+        throw new Error("KTX2 startTranscoding failed");
+    }
+    var width = ktx2File.getWidth();
+    var height = ktx2File.getHeight();
+    var layerCount = ktx2File.getLayers() || 1;
+    var levelCount = ktx2File.getLevels();
+    var hasAlpha = ktx2File.getHasAlpha();
+    var faceCount = ktx2File.getFaces();
+    var format = getTranscodeFormatFromTarget(targetFormat, hasAlpha);
+    var faces = new Array(faceCount);
+    for(var face = 0; face < faceCount; face++){
+        var mipmaps = new Array(levelCount);
+        for(var mip = 0; mip < levelCount; mip++){
+            var layerMips = new Array(layerCount);
+            var mipWidth = void 0, mipHeight = void 0;
+            for(var layer = 0; layer < layerCount; layer++){
+                var levelInfo = ktx2File.getImageLevelInfo(mip, layer, face);
+                mipWidth = levelInfo.origWidth;
+                mipHeight = levelInfo.origHeight;
+                var dst = new Uint8Array(ktx2File.getImageTranscodedSizeInBytes(mip, layer, 0, format));
+                var status = ktx2File.transcodeImage(dst, mip, layer, face, format, 0, -1, -1);
+                if (!status) {
+                    cleanup();
+                    throw new Error("transcodeImage failed.");
+                }
+                layerMips[layer] = dst;
+            }
+            mipmaps[mip] = {
+                data: concat(layerMips),
+                width: mipWidth,
+                height: mipHeight
+            };
         }
+        faces[face] = mipmaps;
+    }
+    cleanup();
+    return {
+        faces: faces,
+        width: width,
+        height: height,
+        hasAlpha: hasAlpha,
+        faceCount: faceCount,
+        format: format
     };
 }
 
@@ -2599,23 +2618,49 @@ var AbstractTranscoder = /*#__PURE__*/ function() {
             })
         ]).then(function(param) {
             var jsCode = param[0], wasmBuffer = param[1];
-            var funcCode = TranscodeWorkerCode$1.toString();
-            var transcodeString = funcCode.substring(funcCode.indexOf("{"), funcCode.lastIndexOf("}") + 1);
-            var workerCode = "\n      " + jsCode + "\n      " + transcodeString + "\n      ";
-            var workerURL = URL.createObjectURL(new Blob([
-                workerCode
-            ], {
-                type: "application/javascript"
-            }));
-            return _this._createTranscodePool(workerURL, wasmBuffer);
+            if (_this.workerLimitCount === 0) {
+                return new Promise(function(resolve, reject) {
+                    var scriptDom = document.createElement("script");
+                    scriptDom.src = URL.createObjectURL(new Blob([
+                        jsCode
+                    ], {
+                        type: "application/javascript"
+                    }));
+                    document.body.appendChild(scriptDom);
+                    scriptDom.onload = function() {
+                        init(wasmBuffer).then(function() {
+                            resolve(null);
+                        });
+                    };
+                    scriptDom.onerror = function() {
+                        reject();
+                    };
+                });
+            } else {
+                var funcCode = TranscodeWorkerCode$1.toString();
+                var transcodeString = funcCode.substring(funcCode.indexOf("{"), funcCode.lastIndexOf("}") + 1);
+                var workerCode = "\n        " + jsCode + "\n        var init = (" + _init.toString() + ")();\n        " + transcode.toString() + "\n        " + transcodeString + "\n        ";
+                var workerURL = URL.createObjectURL(new Blob([
+                    workerCode
+                ], {
+                    type: "application/javascript"
+                }));
+                return _this._createTranscodePool(workerURL, wasmBuffer);
+            }
         });
     };
-    _proto.transcode = function transcode(buffer, format) {
-        return this._transcodeWorkerPool.postMessage({
-            buffer: buffer,
-            format: format,
-            type: "transcode"
-        });
+    _proto.transcode = function transcode1(buffer, format) {
+        if (this.workerLimitCount === 0) {
+            return init().then(function(KTX2File) {
+                return transcode(buffer, format, KTX2File);
+            });
+        } else {
+            return this._transcodeWorkerPool.postMessage({
+                buffer: buffer,
+                format: format,
+                type: "transcode"
+            });
+        }
     };
     return BinomialLLCTranscoder;
 }(AbstractTranscoder);
@@ -2843,7 +2888,7 @@ exports.KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
     _proto.initialize = function initialize(engine, configuration) {
         if (configuration.ktx2Loader) {
             var options = configuration.ktx2Loader;
-            if (this._isKhronosSupported(options.priorityFormats, engine)) {
+            if (this._isKhronosSupported(options.priorityFormats, engine) && options.workerCount !== 0) {
                 return exports.KTX2Loader._getKhronosTranscoder(options.workerCount).init();
             } else {
                 return exports.KTX2Loader._getBinomialLLCTranscoder(options.workerCount).init();
@@ -3564,12 +3609,12 @@ exports.GLTFAnimationParser = /*#__PURE__*/ function(GLTFParser1) {
                         if (curve2.interpolation === engineCore.InterpolationType.CubicSpine) {
                             keyframe2.inTangent = Array.from(output.subarray(offset2, offset2 + outputSize));
                             offset2 += outputSize;
-                            keyframe2.value = output.subarray(offset2, offset2 + outputSize);
+                            keyframe2.value = output.slice(offset2, offset2 + outputSize);
                             offset2 += outputSize;
                             keyframe2.outTangent = Array.from(output.subarray(offset2, offset2 + outputSize));
                             offset2 += outputSize;
                         } else {
-                            keyframe2.value = output.subarray(offset2, offset2 + outputSize);
+                            keyframe2.value = output.slice(offset2, offset2 + outputSize);
                             offset2 += outputSize;
                         }
                         curve2.addKey(keyframe2);
@@ -4320,8 +4365,7 @@ exports.GLTFTextureParser = (_GLTFTextureParser = /*#__PURE__*/ function(GLTFPar
                         mipmap: (_samplerInfo = samplerInfo) == null ? void 0 : _samplerInfo.mipmap
                     }
                 }).then(function(texture) {
-                    var _texture;
-                    (_texture = texture).name || (_texture.name = textureName || imageName || "texture_" + index);
+                    texture.name = textureName || imageName || texture.name || "texture_" + index;
                     useSampler && GLTFUtils.parseSampler(texture, samplerInfo);
                     return texture;
                 });
@@ -5428,6 +5472,39 @@ TextureCubeLoader = __decorate([
     ])
 ], TextureCubeLoader);
 
+var ProjectLoader = /*#__PURE__*/ function(Loader1) {
+    _inherits(ProjectLoader, Loader1);
+    function ProjectLoader() {
+        return Loader1.apply(this, arguments);
+    }
+    var _proto = ProjectLoader.prototype;
+    _proto.load = function load(item, resourceManager) {
+        var _this = this;
+        var engine = resourceManager.engine;
+        return new engineCore.AssetPromise(function(resolve, reject) {
+            _this.request(item.url, {
+                type: "json"
+            }).then(function(data) {
+                // @ts-ignore
+                engine.resourceManager.initVirtualResources(data.files);
+                return resourceManager.load({
+                    type: engineCore.AssetType.Scene,
+                    url: data.scene
+                }).then(function(scene) {
+                    engine.sceneManager.activeScene = scene;
+                    resolve();
+                });
+            }).catch(reject);
+        });
+    };
+    return ProjectLoader;
+}(engineCore.Loader);
+ProjectLoader = __decorate([
+    engineCore.resourceLoader(engineCore.AssetType.Project, [
+        "proj"
+    ], false)
+], ProjectLoader);
+
 var SceneLoader = /*#__PURE__*/ function(Loader1) {
     _inherits(SceneLoader, Loader1);
     function SceneLoader() {
@@ -5446,32 +5523,28 @@ var SceneLoader = /*#__PURE__*/ function(Loader1) {
                     // parse ambient light
                     var ambient = data.scene.ambient;
                     var useCustomAmbient = ambient.specularMode === "Custom";
+                    var useSH = ambient.diffuseMode === engineCore.DiffuseMode.SphericalHarmonics;
+                    scene.ambientLight.diffuseIntensity = ambient.diffuseIntensity;
+                    scene.ambientLight.specularIntensity = ambient.specularIntensity;
+                    scene.ambientLight.diffuseMode = ambient.diffuseMode;
+                    scene.ambientLight.diffuseSolidColor.copyFrom(ambient.diffuseSolidColor);
+                    scene.ambientLight.specularTextureDecodeRGBM = true;
                     if (useCustomAmbient && ambient.customAmbientLight) {
-                        // @ts-ignore
-                        // prettier-ignore
-                        var customAmbientPromise = resourceManager.getResourceByRef(ambient.customAmbientLight).then(function(ambientLight) {
-                            scene.ambientLight = ambientLight;
-                            scene.ambientLight.diffuseIntensity = ambient.diffuseIntensity;
-                            scene.ambientLight.specularIntensity = ambient.specularIntensity;
-                            scene.ambientLight.diffuseMode = ambient.diffuseMode;
-                            scene.ambientLight.diffuseSolidColor.copyFrom(ambient.diffuseSolidColor);
-                        });
-                        promises.push(customAmbientPromise);
-                    } else if (!useCustomAmbient && ambient.ambientLight) {
-                        // @ts-ignore
-                        // prettier-ignore
-                        var ambientLightPromise = resourceManager.getResourceByRef(ambient.ambientLight).then(function(ambientLight) {
-                            scene.ambientLight = ambientLight;
-                            scene.ambientLight.diffuseIntensity = ambient.diffuseIntensity;
-                            scene.ambientLight.specularIntensity = ambient.specularIntensity;
-                            scene.ambientLight.diffuseMode = ambient.diffuseMode;
-                            scene.ambientLight.diffuseSolidColor.copyFrom(ambient.diffuseSolidColor);
-                        });
-                        promises.push(ambientLightPromise);
-                    } else {
-                        scene.ambientLight.diffuseIntensity = ambient.diffuseIntensity;
-                        scene.ambientLight.specularIntensity = ambient.specularIntensity;
-                        scene.ambientLight.diffuseSolidColor.copyFrom(ambient.diffuseSolidColor);
+                        promises.push(// @ts-ignore
+                        resourceManager.getResourceByRef(ambient.customAmbientLight).then(function(ambientLight) {
+                            scene.ambientLight.specularTexture = ambientLight.specularTexture;
+                        }));
+                    }
+                    if (ambient.ambientLight && (!useCustomAmbient || useSH)) {
+                        promises.push(// @ts-ignore
+                        resourceManager.getResourceByRef(ambient.ambientLight).then(function(ambientLight) {
+                            if (!useCustomAmbient) {
+                                scene.ambientLight.specularTexture = ambientLight.specularTexture;
+                            }
+                            if (useSH) {
+                                scene.ambientLight.diffuseSphericalHarmonics = ambientLight.diffuseSphericalHarmonics;
+                            }
+                        }));
                     }
                     var background = data.scene.background;
                     scene.background.mode = background.mode;