@onerjs/core 8.55.7 → 8.55.9

package/Materials/standardMaterial.pure.d.ts

@@ -486,7 +486,7 @@ export declare class StandardMaterial extends StandardMaterialBase {
      * If sets to true, the decal map will be applied after the detail map. Else, it is applied before (default: false)
      */
     accessor applyDecalMapAfterDetailMap: boolean;
-    private _shadersLoaded;
+    private static readonly _ShaderLoader;
     private _vertexPullingMetadata;
     /**
      * Defines additional PrePass parameters for the material.

package/Materials/standardMaterial.pure.js

@@ -19,6 +19,7 @@ import { AddClipPlaneUniforms, BindClipPlane } from "./clipPlaneMaterialHelper.j
 import { PrepareVertexPullingUniforms, BindVertexPullingUniforms } from "./vertexPullingHelper.functions.js";
 import { BindBonesParameters, BindFogParameters, BindLights, BindLogDepth, BindMorphTargetParameters, BindTextureMatrix, BindIBLParameters, HandleFallbacksForShadows, PrepareAttributesForBakedVertexAnimation, PrepareAttributesForBones, PrepareAttributesForInstances, PrepareAttributesForMorphTargets, PrepareDefinesForAttributes, PrepareDefinesForFrameBoundValues, PrepareDefinesForLights, PrepareDefinesForIBL, PrepareDefinesForMergedUV, PrepareDefinesForMisc, PrepareDefinesForMultiview, PrepareDefinesForOIT, PrepareDefinesForPrePass, PrepareUniformsAndSamplersForIBL, PrepareUniformsAndSamplersList, PrepareUniformLayoutForIBL, AreLightsTexturesReady, } from "./materialHelper.functions.js";
 import { SerializationHelper } from "../Misc/decorators.serialization.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";
@@ -705,8 +706,7 @@ let StandardMaterial = (() => {
                 _StandardMaterial_twoSidedLighting_accessor_storage.set(this, (__runInitializers(this, __twoSidedLighting_extraInitializers), __runInitializers(this, _twoSidedLighting_initializers, void 0)));
                 this._applyDecalMapAfterDetailMap = (__runInitializers(this, _twoSidedLighting_extraInitializers), __runInitializers(this, __applyDecalMapAfterDetailMap_initializers, false));
                 _StandardMaterial_applyDecalMapAfterDetailMap_accessor_storage.set(this, (__runInitializers(this, __applyDecalMapAfterDetailMap_extraInitializers), __runInitializers(this, _applyDecalMapAfterDetailMap_initializers, void 0)));
-                this._shadersLoaded = (__runInitializers(this, _applyDecalMapAfterDetailMap_extraInitializers), false);
-                this._vertexPullingMetadata = null;
+                this._vertexPullingMetadata = (__runInitializers(this, _applyDecalMapAfterDetailMap_extraInitializers), null);
                 this._renderTargets = new SmartArray(16);
                 this._globalAmbientColor = new Color3(0, 0, 0);
                 this._cacheHasRenderTargetTextures = false;
@@ -1260,17 +1260,7 @@ let StandardMaterial = (() => {
                         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/default.vertex.js"), import("../ShadersWGSL/default.fragment.js")]);
-                                }
-                                else {
-                                    await Promise.all([import("../Shaders/default.vertex.js"), import("../Shaders/default.fragment.js")]);
-                                }
-                                this._shadersLoaded = true;
-                            },
+                        extraInitializationsAsync: _a._ShaderLoader.getLoadCallback(this._shaderLanguage),
                     }, engine);
                     this._eventInfo.customCode = undefined;
                     if (effect) {
@@ -2041,6 +2031,7 @@ let StandardMaterial = (() => {
          * False by default. This is mostly meant for backward compatibility.
          */
         _a.ForceGLSL = false,
+        _a._ShaderLoader = new _ShaderImportLoader(() => [import("../Shaders/default.vertex.js"), import("../Shaders/default.fragment.js")], () => [import("../ShadersWGSL/default.vertex.js"), import("../ShadersWGSL/default.fragment.js")]),
         _a;
 })();
 export { StandardMaterial };