From bc519fb98b212bcec0af8f2d594e4e291cd48428 Mon Sep 17 00:00:00 2001
From: liteng <930372551@qq.com>
Date: Sun, 26 Aug 2018 17:24:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=90=84=E7=A7=8D=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E4=B8=8A=E4=BC=A0=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ShadowEditor.Web/src/editor/window/ModelWindow.js |  2 +-
 ShadowEditor.Web/src/loader/ModelLoader.js        | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ShadowEditor.Web/src/editor/window/ModelWindow.js b/ShadowEditor.Web/src/editor/window/ModelWindow.js
index 11da2c4e..dce8de16 100644
--- a/ShadowEditor.Web/src/editor/window/ModelWindow.js
+++ b/ShadowEditor.Web/src/editor/window/ModelWindow.js
@@ -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;
         }
diff --git a/ShadowEditor.Web/src/loader/ModelLoader.js b/ShadowEditor.Web/src/loader/ModelLoader.js
index 839a6aaa..6abb58b7 100644
--- a/ShadowEditor.Web/src/loader/ModelLoader.js
+++ b/ShadowEditor.Web/src/loader/ModelLoader.js
@@ -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;
         }