archive-gh-me/ShadowEditor
1
0
Fork 0
mirror of https://github.com/tengge1/ShadowEditor.git synced 2026-01-25 15:08:11 +00:00
Code Issues Projects Releases Wiki Activity

测试各种文件类型上传加载。

Browse Source
This commit is contained in:
liteng 2018-08-26 17:24:10 +08:00
parent df3132e79a
commit bc519fb98b
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ShadowEditor.Web/src/editor/window/ModelWindow.js
View File

@ -192,7 +192,7 @@ ModelWindow.prototype.onClickImage = function (imgs, index, btn) {
ModelWindow.prototype.onLoadModel = function (model) {
var loader = new ModelLoader(this.app);
loader.load(this.app.options.server + model.Url).then(obj => {
loader.load(this.app.options.server + model.Url, { type: model.Type }).then(obj => {
if (!obj) {
return;
}

14
ShadowEditor.Web/src/loader/ModelLoader.js
View File

@ -45,13 +45,19 @@ ModelLoader.prototype = Object.create(BaseLoader.prototype);
ModelLoader.prototype.constructor = ModelLoader;
ModelLoader.prototype.load = function (url, options) {
var paths = url.split('.');
var ext = paths[paths.length - 1].toLowerCase();
options = options || {};
var type = options.type;
if (type === undefined) {
console.warn(`ModelLoader: 未传递type参数，则使用文件后缀判断文件类型。`);
var paths = url.split('.');
type = paths[paths.length - 1].toLowerCase();
}
return new Promise(resolve => {
var loader = Loaders[ext];
var loader = Loaders[type];
if (loader === undefined) {
console.warn(`ModelLoader: 不存在加载${ext}后缀模型的加载器。`);
console.warn(`ModelLoader: 不存在加载${type}后缀模型的加载器。`);
resolve(null);
return;
}