From b697aba6741ae3c97020ab1783220eafc8451ea6 Mon Sep 17 00:00:00 2001
From: liteng <930372551@qq.com>
Date: Sat, 22 Sep 2018 15:17:45 +0800
Subject: [PATCH] =?UTF-8?q?lmesh=E6=94=B9=E4=B8=BA=E5=86=AF=E6=B0=8F?=
 =?UTF-8?q?=E6=9D=90=E8=B4=A8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ShadowEditor.Web/src/lol/Model.js   | 31 +----------------------------
 ShadowEditor.Web/src/lol/Texture.js |  3 +--
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/ShadowEditor.Web/src/lol/Model.js b/ShadowEditor.Web/src/lol/Model.js
index a015e731..615d1f19 100644
--- a/ShadowEditor.Web/src/lol/Model.js
+++ b/ShadowEditor.Web/src/lol/Model.js
@@ -64,36 +64,7 @@ function Model(options) {
 
     self.texture = null;
     self.geometry = new THREE.BufferGeometry();
-    self.material = new THREE.RawShaderMaterial({
-        uniforms: {
-            uAmbientColor: {
-                value: new THREE.Vector4().fromArray(self.ambientColor)
-            },
-            uPrimaryColor: {
-                value: new THREE.Vector4().fromArray(self.primaryColor)
-            },
-            uSecondaryColor: {
-                value: new THREE.Vector4().fromArray(self.secondaryColor)
-            },
-            uLightDir1: {
-                value: new THREE.Vector3().fromArray(self.lightDir1)
-            },
-            uLightDir2: {
-                value: new THREE.Vector3().fromArray(self.lightDir2)
-            },
-            uLightDir3: {
-                value: new THREE.Vector3().fromArray(self.lightDir3)
-            },
-            uHasTexture: {
-                value: 0
-            },
-            uTexture: {
-                value: null
-            }
-        },
-        vertexShader: vertShader,
-        fragmentShader: fragShader,
-    });
+    self.material = new THREE.MeshPhongMaterial();
 
     var promise1 = new Promise(resolve => {
         self.dispatch.on('loadMesh.Model', () => {
diff --git a/ShadowEditor.Web/src/lol/Texture.js b/ShadowEditor.Web/src/lol/Texture.js
index e41d030c..0dd40800 100644
--- a/ShadowEditor.Web/src/lol/Texture.js
+++ b/ShadowEditor.Web/src/lol/Texture.js
@@ -21,8 +21,7 @@ Texture.prototype.load = function () {
 Texture.prototype.onLoad = function (texture) {
     var self = this;
     texture.flipY = false;
-    self.model.material.uniforms.uHasTexture.value = 1;
-    self.model.material.uniforms.uTexture.value = texture;
+    self.model.material.map = texture;
     self.model.material.needsUpdate = true;
 
     self.model.dispatch.call('loadTexture');