@galacean/engine-loader 1.3.17 → 1.3.19

package/dist/main.js

@@ -5833,20 +5833,19 @@ var MaterialLoader = /*#__PURE__*/ function(Loader1) {
             })).then(function(materialSchema) {
                 var engine = resourceManager.engine;
                 var shaderRef = materialSchema.shaderRef, shaderName = materialSchema.shader;
-                if (shaderRef) {
+                var shader = engineCore.Shader.find(shaderName);
+                if (shader) {
+                    resolve(_this._getMaterialByShader(materialSchema, shader, engine));
+                } else if (shaderRef) {
                     resolve(resourceManager// @ts-ignore
                     .getResourceByRef(shaderRef).then(function(shader) {
-                        return _this.getMaterialByShader(materialSchema, shader, engine);
+                        return _this._getMaterialByShader(materialSchema, shader, engine);
                     }));
-                } else {
-                    // compatible with 1.2-pre version material schema
-                    var shader = engineCore.Shader.find(shaderName);
-                    resolve(_this.getMaterialByShader(materialSchema, shader, engine));
                 }
             }).catch(reject);
         });
     };
-    _proto.getMaterialByShader = function getMaterialByShader(materialSchema, shader, engine) {
+    _proto._getMaterialByShader = function _getMaterialByShader(materialSchema, shader, engine) {
         var _loop = function(key) {
             var _shaderData_key = shaderData[key], type = _shaderData_key.type, value = _shaderData_key.value;
             switch(type){
@@ -5906,6 +5905,32 @@ MaterialLoader = __decorate([
     ])
 ], MaterialLoader);
 
+var MeshLoader = /*#__PURE__*/ function(Loader1) {
+    _inherits(MeshLoader, Loader1);
+    function MeshLoader() {
+        return Loader1.apply(this, arguments);
+    }
+    var _proto = MeshLoader.prototype;
+    _proto.load = function load(item, resourceManager) {
+        var _this = this;
+        return new engineCore.AssetPromise(function(resolve, reject) {
+            _this.request(item.url, resourceManager, _extends({}, item, {
+                type: "arraybuffer"
+            })).then(function(data) {
+                return decode(data, resourceManager.engine);
+            }).then(function(mesh) {
+                resolve(mesh);
+            }).catch(reject);
+        });
+    };
+    return MeshLoader;
+}(engineCore.Loader);
+MeshLoader = __decorate([
+    engineCore.resourceLoader(engineCore.AssetType.Mesh, [
+        "mesh"
+    ])
+], MeshLoader);
+
 var PrimitiveMeshLoader = /*#__PURE__*/ function(Loader1) {
     _inherits(PrimitiveMeshLoader, Loader1);
     function PrimitiveMeshLoader() {