@galacean/engine-loader 0.0.0-experimental-double11.6 → 0.0.0-experimental-double11.8

package/dist/main.js

@@ -2441,6 +2441,28 @@ var AbstractTranscoder = /*#__PURE__*/ function() {
 /** @internal */ function TranscodeWorkerCode$1() {
     self.onmessage = function onmessage(event) {
         var message = event.data;
+        var _init = function _init() {
+            var initPromise;
+            return function(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 initPromise;
+            };
+        };
+        var init = _init();
         switch(message.type){
             case "init":
                 init(message.transcoderWasm).then(function() {
@@ -2553,6 +2575,10 @@ function transcode(buffer, targetFormat, KTX2File) {
         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;
@@ -5519,32 +5545,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;
@@ -5601,13 +5623,13 @@ SceneLoader = __decorate([
         "scene"
     ], true)
 ], SceneLoader);
-ReflectionParser.registerCustomParseComponent("TextRenderer", /*#__PURE__*/ _async_to_generator(function(instance, item, engine) {
+ReflectionParser.registerCustomParseComponent("TextRenderer", /*#__PURE__*/ _async_to_generator(function(instance, item) {
     var props;
     return __generator(this, function(_state) {
         props = item.props;
         if (!props.font) {
             // @ts-ignore
-            instance.font = engineCore.Font.createFromOS(engine, props.fontFamily || "Arial");
+            instance.font = engineCore.Font.createFromOS(instance.engine, props.fontFamily || "Arial");
         }
         return [
             2,