@galacean/engine-loader 1.3.18 → 1.3.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/main.js +6 -7
- package/dist/main.js.map +1 -1
- package/dist/miniprogram.js +6 -7
- package/dist/module.js +6 -7
- package/dist/module.js.map +1 -1
- package/package.json +4 -4
package/dist/main.js
CHANGED
|
@@ -5833,20 +5833,19 @@ var MaterialLoader = /*#__PURE__*/ function(Loader1) {
|
|
|
5833
5833
|
})).then(function(materialSchema) {
|
|
5834
5834
|
var engine = resourceManager.engine;
|
|
5835
5835
|
var shaderRef = materialSchema.shaderRef, shaderName = materialSchema.shader;
|
|
5836
|
-
|
|
5836
|
+
var shader = engineCore.Shader.find(shaderName);
|
|
5837
|
+
if (shader) {
|
|
5838
|
+
resolve(_this._getMaterialByShader(materialSchema, shader, engine));
|
|
5839
|
+
} else if (shaderRef) {
|
|
5837
5840
|
resolve(resourceManager// @ts-ignore
|
|
5838
5841
|
.getResourceByRef(shaderRef).then(function(shader) {
|
|
5839
|
-
return _this.
|
|
5842
|
+
return _this._getMaterialByShader(materialSchema, shader, engine);
|
|
5840
5843
|
}));
|
|
5841
|
-
} else {
|
|
5842
|
-
// compatible with 1.2-pre version material schema
|
|
5843
|
-
var shader = engineCore.Shader.find(shaderName);
|
|
5844
|
-
resolve(_this.getMaterialByShader(materialSchema, shader, engine));
|
|
5845
5844
|
}
|
|
5846
5845
|
}).catch(reject);
|
|
5847
5846
|
});
|
|
5848
5847
|
};
|
|
5849
|
-
_proto.
|
|
5848
|
+
_proto._getMaterialByShader = function _getMaterialByShader(materialSchema, shader, engine) {
|
|
5850
5849
|
var _loop = function(key) {
|
|
5851
5850
|
var _shaderData_key = shaderData[key], type = _shaderData_key.type, value = _shaderData_key.value;
|
|
5852
5851
|
switch(type){
|