@galacean/engine-loader 1.4.11 → 1.4.13

package/dist/module.js

@@ -1,4 +1,4 @@
-import { Utils, ModelMesh, BlendShape, Texture2D, Loader, Entity, Transform, AnimationClip, AnimationEvent, AnimationStringCurve, Keyframe, AnimationBoolCurve, AnimationRefCurve, AnimationQuaternionCurve, AnimationColorCurve, AnimationVector4Curve, AnimationVector3Curve, AnimationVector2Curve, AnimationFloatArrayCurve, AnimationArrayCurve, AnimationFloatCurve, ReferResource, Scene, resourceLoader, AssetPromise, AssetType, AnimatorController, AnimatorControllerLayer, AnimatorStateTransition, AmbientLight, DiffuseMode, TextureCube, TextureFilterMode, TextureCubeFace, request, ContentRestorer, Font, Animator, IndexFormat, VertexElementFormat, GLCapabilityType, Logger, TextureFormat, InterpolationType, SkinnedMeshRenderer, PBRMaterial, BlinnPhongMaterial, PBRSpecularMaterial, TextureCoordinate, RenderFace, VertexElement, Buffer, BufferBindFlag, BufferUsage, Camera, MeshRenderer, Skin, TextureWrapMode as TextureWrapMode$1, AnimatorStateMachine, SystemInfo, Shader, Material, PrimitiveMesh, SpriteAtlas, Sprite, AudioClip, AudioManager, ShaderFactory, ShaderLib, PhysicsMaterial, BackgroundMode, DirectLight, PointLight, SpotLight, UnlitMaterial } from '@galacean/engine-core';
+import { Utils, ModelMesh, BlendShape, Texture2D, Loader, Entity, Transform, AnimationClip, AnimationEvent, AnimationStringCurve, Keyframe, AnimationBoolCurve, AnimationRefCurve, AnimationQuaternionCurve, AnimationColorCurve, AnimationVector4Curve, AnimationVector3Curve, AnimationVector2Curve, AnimationFloatArrayCurve, AnimationArrayCurve, AnimationFloatCurve, ReferResource, Scene, resourceLoader, AssetPromise, AssetType, AnimatorController, AnimatorControllerLayer, AnimatorStateTransition, AmbientLight, DiffuseMode, TextureCube, TextureFilterMode, TextureCubeFace, request, ContentRestorer, Font, Animator, IndexFormat, VertexElementFormat, GLCapabilityType, Logger, TextureFormat, InterpolationType, SkinnedMeshRenderer, PBRMaterial, PBRSpecularMaterial, TextureCoordinate, RenderFace, VertexElement, Buffer, BufferBindFlag, BufferUsage, Camera, MeshRenderer, Skin, TextureWrapMode as TextureWrapMode$1, AnimatorStateMachine, SystemInfo, Shader, Material, PrimitiveMesh, SpriteAtlas, Sprite, AudioClip, AudioManager, ShaderFactory, ShaderLib, PhysicsMaterial, BackgroundMode, DirectLight, PointLight, SpotLight, UnlitMaterial } from '@galacean/engine-core';
 import { Color, Vector4, Vector3, Vector2, Quaternion, SphericalHarmonics3, MathUtil, BoundingBox, Matrix, Rect } from '@galacean/engine-math';
 import { GLCompressedTextureInternalFormat } from '@galacean/engine-rhi-webgl';
 
@@ -4262,17 +4262,14 @@ var GLTFMaterialParser = /*#__PURE__*/ function(GLTFParser1) {
             GLTFMaterialParser._parseStandardProperty(context, material, materialInfo);
         }
         return Promise.resolve(material).then(function(material) {
-            material || (material = GLTFMaterialParser._getDefaultMaterial(engine));
+            // @ts-ignore
+            material || (material = engine._basicResources._getBlinnPhongMaterial());
             GLTFParser.executeExtensionsAdditiveAndParse(materialInfo.extensions, context, material, materialInfo);
             // @ts-ignore
             material._associationSuperResource(glTFResource);
             return material;
         });
     };
-    /** @internal */ GLTFMaterialParser._getDefaultMaterial = function _getDefaultMaterial(engine) {
-        var _GLTFMaterialParser;
-        return (_GLTFMaterialParser = GLTFMaterialParser)._defaultMaterial || (_GLTFMaterialParser._defaultMaterial = new BlinnPhongMaterial(engine));
-    };
     /**
    * @internal
    */ GLTFMaterialParser._checkOtherTextureTransform = function _checkOtherTextureTransform(texture, textureName) {
@@ -4686,7 +4683,7 @@ var GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
             Promise.all(materialPromises)
         ]).then(function(param) {
             var _loop = function(i) {
-                var material = materials[i] || GLTFMaterialParser._getDefaultMaterial(context.glTFResource.engine);
+                var material = materials[i] || basicResources._getBlinnPhongMaterial();
                 var glTFPrimitive = glTFMeshPrimitives[i];
                 var mesh = meshes[i];
                 var renderer = void 0;
@@ -4715,6 +4712,8 @@ var GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
                 GLTFParser.executeExtensionsAdditiveAndParse(glTFPrimitive.extensions, context, renderer, glTFPrimitive);
             };
             var meshes = param[0], skin = param[1], materials = param[2];
+            // @ts-ignore
+            var basicResources = context.glTFResource.engine._basicResources;
             for(var i = 0; i < rendererCount; i++)_loop(i);
         });
     };