@galacean/engine 1.3.17 → 1.3.19

package/dist/browser.js

@@ -47123,20 +47123,19 @@
                 })).then(function(materialSchema) {
                     var engine = resourceManager.engine;
                     var shaderRef = materialSchema.shaderRef, shaderName = materialSchema.shader;
-                    if (shaderRef) {
+                    var shader = 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 = 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 _loop(key) {
                 var _shaderData_key = shaderData[key], type = _shaderData_key.type, value = _shaderData_key.value;
                 switch(type){
@@ -47194,6 +47193,31 @@
             "json"
         ])
     ], MaterialLoader);
+    var MeshLoader = /*#__PURE__*/ function(Loader1) {
+        var MeshLoader = function MeshLoader() {
+            return Loader1.apply(this, arguments);
+        };
+        _inherits(MeshLoader, Loader1);
+        var _proto = MeshLoader.prototype;
+        _proto.load = function load(item, resourceManager) {
+            var _this = this;
+            return new 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;
+    }(Loader);
+    MeshLoader = __decorate([
+        resourceLoader(exports.AssetType.Mesh, [
+            "mesh"
+        ])
+    ], MeshLoader);
     var PrimitiveMeshLoader = /*#__PURE__*/ function(Loader1) {
         var PrimitiveMeshLoader = function PrimitiveMeshLoader() {
             return Loader1.apply(this, arguments);
@@ -48244,7 +48268,7 @@
     ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "1.3.17";
+    var version = "1.3.19";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);