@galacean/engine 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/browser.js +7 -8
- package/dist/browser.js.map +1 -1
- package/dist/browser.min.js +1 -1
- package/dist/browser.min.js.map +1 -1
- package/dist/main.js +1 -1
- package/dist/miniprogram.js +1 -1
- package/dist/module.js +1 -1
- package/package.json +5 -5
package/dist/browser.js
CHANGED
|
@@ -47123,20 +47123,19 @@
|
|
|
47123
47123
|
})).then(function(materialSchema) {
|
|
47124
47124
|
var engine = resourceManager.engine;
|
|
47125
47125
|
var shaderRef = materialSchema.shaderRef, shaderName = materialSchema.shader;
|
|
47126
|
-
|
|
47126
|
+
var shader = Shader.find(shaderName);
|
|
47127
|
+
if (shader) {
|
|
47128
|
+
resolve(_this._getMaterialByShader(materialSchema, shader, engine));
|
|
47129
|
+
} else if (shaderRef) {
|
|
47127
47130
|
resolve(resourceManager // @ts-ignore
|
|
47128
47131
|
.getResourceByRef(shaderRef).then(function(shader) {
|
|
47129
|
-
return _this.
|
|
47132
|
+
return _this._getMaterialByShader(materialSchema, shader, engine);
|
|
47130
47133
|
}));
|
|
47131
|
-
} else {
|
|
47132
|
-
// compatible with 1.2-pre version material schema
|
|
47133
|
-
var shader = Shader.find(shaderName);
|
|
47134
|
-
resolve(_this.getMaterialByShader(materialSchema, shader, engine));
|
|
47135
47134
|
}
|
|
47136
47135
|
}).catch(reject);
|
|
47137
47136
|
});
|
|
47138
47137
|
};
|
|
47139
|
-
_proto.
|
|
47138
|
+
_proto._getMaterialByShader = function _getMaterialByShader(materialSchema, shader, engine) {
|
|
47140
47139
|
var _loop = function _loop(key) {
|
|
47141
47140
|
var _shaderData_key = shaderData[key], type = _shaderData_key.type, value = _shaderData_key.value;
|
|
47142
47141
|
switch(type){
|
|
@@ -48269,7 +48268,7 @@
|
|
|
48269
48268
|
], EXT_texture_webp);
|
|
48270
48269
|
|
|
48271
48270
|
//@ts-ignore
|
|
48272
|
-
var version = "1.3.
|
|
48271
|
+
var version = "1.3.19";
|
|
48273
48272
|
console.log("Galacean engine version: " + version);
|
|
48274
48273
|
for(var key in CoreObjects){
|
|
48275
48274
|
Loader.registerClass(key, CoreObjects[key]);
|