@onerjs/core 8.55.7 → 8.55.9

package/Materials/PBR/pbrBaseMaterial.pure.d.ts

@@ -746,7 +746,7 @@ export declare abstract class PBRBaseMaterial extends PBRBaseMaterialBase {
      */
     private _applyDecalMapAfterDetailMap;
     private _debugMode;
-    private _shadersLoaded;
+    private static readonly _ShaderLoader;
     private _breakShaderLoadedCheck;
     private _vertexPullingMetadata;
     /**

package/Materials/PBR/pbrBaseMaterial.pure.js

@@ -28,6 +28,7 @@ import { DetailMapConfiguration } from "../material.detailMapConfiguration.js";
 import { AddClipPlaneUniforms, BindClipPlane } from "../clipPlaneMaterialHelper.js";
 import { PrepareVertexPullingUniforms, BindVertexPullingUniforms } from "../vertexPullingHelper.functions.js";
 import { BindBonesParameters, BindFogParameters, BindLights, BindLogDepth, BindMorphTargetParameters, BindTextureMatrix, BindIBLParameters, BindIBLSamplers, HandleFallbacksForShadows, PrepareAttributesForBakedVertexAnimation, PrepareAttributesForBones, PrepareAttributesForInstances, PrepareAttributesForMorphTargets, PrepareDefinesForAttributes, PrepareDefinesForFrameBoundValues, PrepareDefinesForLights, PrepareDefinesForIBL, PrepareDefinesForMergedUV, PrepareDefinesForMisc, PrepareDefinesForMultiview, PrepareDefinesForOIT, PrepareDefinesForPrePass, PrepareUniformsAndSamplersList, PrepareUniformsAndSamplersForIBL, PrepareUniformLayoutForIBL, AreLightsTexturesReady, } from "../materialHelper.functions.js";
+import { _ShaderImportLoader } from "../../Misc/shaderImportLoader.js";
 import { MaterialHelperGeometryRendering } from "../materialHelper.geometryrendering.js";
 import { UVDefinesMixin } from "../uv.defines.js";
 import { PrepassDefinesMixin } from "../prepass.defines.js";
@@ -672,7 +673,6 @@ let PBRBaseMaterial = (() => {
                  */
                 this._applyDecalMapAfterDetailMap = false;
                 this._debugMode = 0;
-                this._shadersLoaded = false;
                 this._breakShaderLoadedCheck = false;
                 this._vertexPullingMetadata = null;
                 _PBRBaseMaterial_debugMode_accessor_storage.set(this, __runInitializers(this, _debugMode_initializers, 0));
@@ -1215,17 +1215,7 @@ let PBRBaseMaterial = (() => {
                     processCodeAfterIncludes: this._eventInfo.customCode,
                     multiTarget: defines.PREPASS,
                     shaderLanguage: this._shaderLanguage,
-                    extraInitializationsAsync: this._shadersLoaded
-                        ? undefined
-                        : async () => {
-                            if (this.shaderLanguage === 1 /* ShaderLanguage.WGSL */) {
-                                await Promise.all([import("../../ShadersWGSL/pbr.vertex.js"), import("../../ShadersWGSL/pbr.fragment.js")]);
-                            }
-                            else {
-                                await Promise.all([import("../../Shaders/pbr.vertex.js"), import("../../Shaders/pbr.fragment.js")]);
-                            }
-                            this._shadersLoaded = true;
-                        },
+                    extraInitializationsAsync: _a._ShaderLoader.getLoadCallback(this._shaderLanguage),
                 }, engine);
                 this._eventInfo.customCode = undefined;
                 return effect;
@@ -2068,6 +2058,7 @@ let PBRBaseMaterial = (() => {
          * False by default. This is mostly meant for backward compatibility.
          */
         _a.ForceGLSL = false,
+        _a._ShaderLoader = new _ShaderImportLoader(() => [import("../../Shaders/pbr.vertex.js"), import("../../Shaders/pbr.fragment.js")], () => [import("../../ShadersWGSL/pbr.vertex.js"), import("../../ShadersWGSL/pbr.fragment.js")]),
         _a;
 })();
 export { PBRBaseMaterial };