@galacean/engine-loader 2.0.0-alpha.1 → 2.0.0-alpha.5

package/dist/module.js

@@ -1,4 +1,4 @@
-import { Utils, AssetPromise, AnimationClip, AnimationEvent, Loader, AnimationStringCurve, Keyframe, AnimationBoolCurve, AnimationRefCurve, AnimationQuaternionCurve, AnimationColorCurve, AnimationVector4Curve, AnimationVector3Curve, AnimationVector2Curve, AnimationFloatArrayCurve, AnimationArrayCurve, AnimationFloatCurve, ModelMesh, BlendShape, Entity, Transform, Texture2D, ReferResource, resourceLoader, ContentRestorer, DiffuseMode, BackgroundMode, AssetType, AnimatorController, AnimatorControllerLayer, AnimatorStateTransition, AmbientLight, TextureCube, TextureFilterMode, TextureCubeFace, Font, SystemInfo, Animator, Logger, IndexFormat, VertexElementFormat, GLCapabilityType, TextureFormat, request, InterpolationType, SkinnedMeshRenderer, PBRMaterial, TextureCoordinate, RenderFace, VertexElement, Buffer, BufferBindFlag, BufferUsage, Camera, MeshRenderer, Skin, TextureWrapMode as TextureWrapMode$1, TextureUtils, AnimatorStateMachine, Shader, Material, PrimitiveMesh, SpriteAtlas, Sprite, AudioClip, AudioManager, ShaderFactory, ShaderLib, PhysicsMaterial, Scene, DirectLight, PointLight, SpotLight, UnlitMaterial } from '@galacean/engine-core';
+import { Utils, AssetPromise, AnimationClip, AnimationEvent, Loader, AnimationStringCurve, Keyframe, AnimationBoolCurve, AnimationRefCurve, AnimationQuaternionCurve, AnimationColorCurve, AnimationVector4Curve, AnimationVector3Curve, AnimationVector2Curve, AnimationFloatArrayCurve, AnimationArrayCurve, AnimationFloatCurve, ModelMesh, BlendShape, Entity, Transform, Texture2D, ReferResource, resourceLoader, ContentRestorer, DiffuseMode, BackgroundMode, AssetType, AnimatorController, AnimatorControllerLayer, AnimatorStateTransition, BufferAsset, AmbientLight, TextureCube, TextureFilterMode, TextureCubeFace, Font, SystemInfo, Animator, Logger, IndexFormat, VertexElementFormat, GLCapabilityType, TextureFormat, request, InterpolationType, SkinnedMeshRenderer, PBRMaterial, TextureCoordinate, RenderFace, VertexElement, Buffer, BufferBindFlag, BufferUsage, Camera, MeshRenderer, Skin, TextureWrapMode as TextureWrapMode$1, TextureUtils, AnimatorStateMachine, JSONAsset, Shader, Material, PrimitiveMesh, SpriteAtlas, Sprite, TextAsset, AudioClip, AudioManager, ShaderFactory, ShaderLib, PhysicsMaterial, Scene, DirectLight, PointLight, SpotLight, UnlitMaterial } from '@galacean/engine-core';
 import { Quaternion, Vector4, Color, Vector3, Vector2, SphericalHarmonics3, MathUtil, BoundingBox, Matrix, Rect } from '@galacean/engine-math';
 import { GLCompressedTextureInternalFormat } from '@galacean/engine-rhi-webgl';
 
@@ -1702,9 +1702,7 @@ AnimatorControllerLoader = __decorate([
     ], false)
 ], AnimatorControllerLoader);
 
-function isBase64(url) {
-    return /^data:(.+?);base64,/.test(url);
-}
+var base64Regex = /^data:(.+?);base64,/;
 var BufferLoader = /*#__PURE__*/ function(Loader) {
     _inherits(BufferLoader, Loader);
     function BufferLoader() {
@@ -1713,19 +1711,17 @@ var BufferLoader = /*#__PURE__*/ function(Loader) {
     var _proto = BufferLoader.prototype;
     _proto.load = function load(item, resourceManager) {
         var url = item.url;
-        if (isBase64(url)) {
-            return new AssetPromise(function(resolve) {
-                var base64Str = url.slice(13 + RegExp.$1.length);
-                var result = Uint8Array.from(atob(base64Str), function(c) {
-                    return c.charCodeAt(0);
-                });
-                resolve(result.buffer);
-            });
-        }
-        // @ts-ignore
-        return resourceManager._request(url, _extends({}, item, {
+        var base64Match = base64Regex.exec(url);
+        var bufferPromise = base64Match ? Promise.resolve(Uint8Array.from(atob(url.slice(13 + base64Match[1].length)), function(c) {
+            return c.charCodeAt(0);
+        }).buffer) : resourceManager._request(url, _extends({}, item, {
             type: "arraybuffer"
         }));
+        return AssetPromise.resolve(bufferPromise).then(function(buffer) {
+            var asset = new BufferAsset(resourceManager.engine);
+            asset.buffer = buffer;
+            return asset;
+        });
     };
     return BufferLoader;
 }(Loader);
@@ -1733,7 +1729,7 @@ BufferLoader = __decorate([
     resourceLoader(AssetType.Buffer, [
         "bin",
         "r3bin"
-    ], false)
+    ])
 ], BufferLoader);
 
 var EnvLoader = /*#__PURE__*/ function(Loader) {
@@ -5655,14 +5651,18 @@ var JSONLoader = /*#__PURE__*/ function(Loader) {
         // @ts-ignore
         return resourceManager._request(item.url, _extends({}, item, {
             type: "json"
-        }));
+        })).then(function(data) {
+            var asset = new JSONAsset(resourceManager.engine);
+            asset.data = data;
+            return asset;
+        });
     };
     return JSONLoader;
 }(Loader);
 JSONLoader = __decorate([
     resourceLoader(AssetType.JSON, [
         "json"
-    ], false)
+    ])
 ], JSONLoader);
 
 var HEADER_LEN = 12 + 13 * 4; // identifier + header elements (not including key value meta-data pairs)
@@ -6363,6 +6363,30 @@ SpriteLoader = __decorate([
     ])
 ], SpriteLoader);
 
+var TextLoader = /*#__PURE__*/ function(Loader) {
+    _inherits(TextLoader, Loader);
+    function TextLoader() {
+        return Loader.apply(this, arguments) || this;
+    }
+    var _proto = TextLoader.prototype;
+    _proto.load = function load(item, resourceManager) {
+        // @ts-ignore
+        return resourceManager._request(item.url, _extends({}, item, {
+            type: "text"
+        })).then(function(text) {
+            var asset = new TextAsset(resourceManager.engine);
+            asset.text = text;
+            return asset;
+        });
+    };
+    return TextLoader;
+}(Loader);
+TextLoader = __decorate([
+    resourceLoader(AssetType.Text, [
+        "txt"
+    ])
+], TextLoader);
+
 /**
  * @internal
  */ var Texture2DContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
@@ -6583,6 +6607,7 @@ var ShaderChunkLoader = /*#__PURE__*/ function(Loader) {
             }
         }
         return Promise.all(shaderChunkPaths.map(function(chunkPath) {
+            // @ts-ignore
             return resourceManager.load({
                 type: "ShaderChunk",
                 url: chunkPath