Fix KTX2 loading without workers

daoshengmu · Sep 3, 2021 · 22441b0 · 22441b0
1 parent 9d85c30
commit 22441b0
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 0 deletions.
diff --git a/ktx2Decoder/src/Transcoders/mscTranscoder.ts b/ktx2Decoder/src/Transcoders/mscTranscoder.ts
@@ -39,6 +39,30 @@ export class MSCTranscoder extends Transcoder {
             if (MSCTranscoder.UseFromWorkerThread) {
                 importScripts(MSCTranscoder.JSModuleURL);
             }
+            // Worker Number = 0 and MSC_TRANSCODER has not been loaded yet.
+            else if (typeof(MSC_TRANSCODER) === "undefined") {
+                return new Promise((resolve, reject) => {
+                    const head = document.getElementsByTagName("head")[0];
+                    const script = document.createElement("script");
+                    script.setAttribute("type", "text/javascript");
+                    script.setAttribute("src", MSCTranscoder.JSModuleURL);
+
+                    script.onload = () => {
+                        MSC_TRANSCODER({ wasmBinary }).then((basisModule: any) => {
+                            basisModule.initTranscoders();
+                            this._mscBasisModule = basisModule;
+                            resolve();
+                        });
+                    };
+
+                    script.onerror = () => {
+                        reject("Can not load MSC_TRANSCODER script.");
+                    };
+
+                    head.appendChild(script);
+                });
+            }
+
             return new Promise((resolve) => {
                 MSC_TRANSCODER({ wasmBinary }).then((basisModule: any) => {
                     basisModule.initTranscoders();

diff --git a/src/Misc/khronosTextureContainer2.ts b/src/Misc/khronosTextureContainer2.ts
@@ -2,6 +2,7 @@ import { InternalTexture } from "../Materials/Textures/internalTexture";
 import { ThinEngine } from "../Engines/thinEngine";
 import { Constants } from '../Engines/constants';
 import { WorkerPool } from './workerPool';
+import { Tools } from "./tools";
 
 declare var KTX2DECODER: any;
 
@@ -10,6 +11,7 @@ declare var KTX2DECODER: any;
  */
 export class KhronosTextureContainer2 {
     private static _WorkerPoolPromise?: Promise<WorkerPool>;
+    private static _NoWorkerPromise?: Promise<void>;
     private static _Initialized: boolean;
     private static _Ktx2Decoder: any; // used when no worker pool is used
 
@@ -95,6 +97,34 @@ export class KhronosTextureContainer2 {
                     resolve(new WorkerPool(workers));
                 });
             });
+        } else if (typeof(KTX2DECODER) === "undefined") {
+            KhronosTextureContainer2._NoWorkerPromise = Tools.LoadScriptAsync(KhronosTextureContainer2.URLConfig.jsDecoderModule).then(() => {
+                KTX2DECODER.MSCTranscoder.UseFromWorkerThread = false;
+                KTX2DECODER.WASMMemoryManager.LoadBinariesFromCurrentThread = true;
+
+                const urls = KhronosTextureContainer2.URLConfig;
+                if (urls.wasmUASTCToASTC !== null) {
+                    KTX2DECODER.LiteTranscoder_UASTC_ASTC.WasmModuleURL = urls.wasmUASTCToASTC;
+                }
+                if (urls.wasmUASTCToBC7 !== null) {
+                    KTX2DECODER.LiteTranscoder_UASTC_BC7.WasmModuleURL = urls.wasmUASTCToBC7;
+                }
+                if (urls.wasmUASTCToRGBA_UNORM !== null) {
+                    KTX2DECODER.LiteTranscoder_UASTC_RGBA_UNORM.WasmModuleURL = urls.wasmUASTCToRGBA_UNORM;
+                }
+                if (urls.wasmUASTCToRGBA_SRGB !== null) {
+                    KTX2DECODER.LiteTranscoder_UASTC_RGBA_SRGB.WasmModuleURL = urls.wasmUASTCToRGBA_SRGB;
+                }
+                if (urls.jsMSCTranscoder !== null) {
+                    KTX2DECODER.MSCTranscoder.JSModuleURL = urls.jsMSCTranscoder;
+                }
+                if (urls.wasmMSCTranscoder !== null) {
+                    KTX2DECODER.MSCTranscoder.WasmModuleURL = urls.wasmMSCTranscoder;
+                }
+                if (urls.wasmZSTDDecoder !== null) {
+                    KTX2DECODER.ZSTDDecoder.WasmModuleURL = urls.wasmZSTDDecoder;
+                }
+            });
         } else {
             KTX2DECODER.MSCTranscoder.UseFromWorkerThread = false;
             KTX2DECODER.WASMMemoryManager.LoadBinariesFromCurrentThread = true;
@@ -165,6 +195,22 @@ export class KhronosTextureContainer2 {
                 });
             });
         }
+        else if (KhronosTextureContainer2._NoWorkerPromise) {
+            return KhronosTextureContainer2._NoWorkerPromise.then(() => {
+                return new Promise((resolve, reject) => {
+                    if (!KhronosTextureContainer2._Ktx2Decoder) {
+                        KhronosTextureContainer2._Ktx2Decoder = new KTX2DECODER.KTX2Decoder();
+                    }
+
+                    KhronosTextureContainer2._Ktx2Decoder.decode(data, caps).then((data: any) => {
+                        this._createTexture(data, internalTexture);
+                        resolve();
+                    }).catch((reason: any) => {
+                        reject({ message: reason });
+                    });
+                });
+            });
+        }
 
         return new Promise((resolve, reject) => {
             if (!KhronosTextureContainer2._Ktx2Decoder) {