From eb62ca5dbefc190538035c14eeee2f5c18971ff0 Mon Sep 17 00:00:00 2001
From: liteng <930372551@qq.com>
Date: Mon, 10 Dec 2018 20:43:35 +0800
Subject: [PATCH] =?UTF-8?q?amf=E6=87=92=E5=8A=A0=E8=BD=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ShadowEditor.Web/index.html                 |  6 ------
 ShadowEditor.Web/src/loader/AMFLoader.js    | 12 +++++++-----
 ShadowEditor.Web/src/package/PackageList.js |  5 +++++
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ShadowEditor.Web/index.html b/ShadowEditor.Web/index.html
index e63afc49..e3196527 100644
--- a/ShadowEditor.Web/index.html
+++ b/ShadowEditor.Web/index.html
@@ -109,8 +109,6 @@
     <script src="assets/js/curves/NURBSUtils.js"></script>
 
     <!-- loaders -->
-    <!--<script src="assets/js/loaders/LoaderSupport.js"></script>-->
-    <script src="assets/js/loaders/AMFLoader.js"></script>
     <script src="assets/js/loaders/AssimpLoader.js"></script>
     <script src="assets/js/loaders/AWDLoader.js"></script>
     <script src="assets/js/loaders/BabylonLoader.js"></script>
@@ -123,10 +121,7 @@
     <script src="assets/js/loaders/GLTFLoader.js"></script>
     <script src="assets/js/loaders/KMZLoader.js"></script>
     <script src="assets/js/loaders/MD2Loader.js"></script>
-    <!--<script src="assets/js/nodes/THREE.Nodes.js" type="module"></script>-->
-    <!--<script src="assets/js/loaders/NodeMaterialLoader.js"></script>-->
     <script src="assets/js/loaders/OBJLoader.js"></script>
-    <!--<script src="assets/js/loaders/OBJLoader2.js"></script>-->
     <script src="assets/js/loaders/PCDLoader.js"></script>
     <script src="assets/js/loaders/PDBLoader.js"></script>
     <script src="assets/js/loaders/PLYLoader.js"></script>
@@ -134,7 +129,6 @@
     <script src="assets/js/loaders/STLLoader.js"></script>
     <script src="assets/js/loaders/TDSLoader.js"></script>
     <script src="assets/js/loaders/TGALoader.js"></script>
-    <!--<script src="assets/js/loaders/TTFLoader.js"></script>-->
     <script src="assets/js/loaders/VRMLoader.js"></script>
     <script src="assets/js/loaders/VRMLLoader.js"></script>
     <script src="assets/js/loaders/VTKLoader.js"></script>
diff --git a/ShadowEditor.Web/src/loader/AMFLoader.js b/ShadowEditor.Web/src/loader/AMFLoader.js
index 49fcdf97..3f41651e 100644
--- a/ShadowEditor.Web/src/loader/AMFLoader.js
+++ b/ShadowEditor.Web/src/loader/AMFLoader.js
@@ -13,11 +13,13 @@ AMFLoader.prototype.constructor = AMFLoader;
 
 AMFLoader.prototype.load = function (url) {
     return new Promise(resolve => {
-        var loader = new THREE.AMFLoader();
-        loader.load(url, group => {
-            resolve(group);
-        }, undefined, () => {
-            resolve(null);
+        this.require('AMFLoader').then(() => {
+            var loader = new THREE.AMFLoader();
+            loader.load(url, group => {
+                resolve(group);
+            }, undefined, () => {
+                resolve(null);
+            });
         });
     });
 };
diff --git a/ShadowEditor.Web/src/package/PackageList.js b/ShadowEditor.Web/src/package/PackageList.js
index fe2bcf24..9efe67f5 100644
--- a/ShadowEditor.Web/src/package/PackageList.js
+++ b/ShadowEditor.Web/src/package/PackageList.js
@@ -10,6 +10,11 @@ const PackageList = [{
     assets: [
         'assets/js/loaders/3MFLoader.js'
     ]
+}, {
+    name: 'AMFLoader',
+    assets: [
+        'assets/js/loaders/AMFLoader.js'
+    ]
 }];
 
 export default PackageList
\ No newline at end of file