fix: Merge branch 'master' of http://face3d.4dage.com:7005/chenzhiguang/nj_museum

# Conflicts:
#	src/views/Home_pc.vue

public/package/js/label.js

@@ -26,6 +26,7 @@ class Label2D extends THREE.EventDispatcher {
 
         $(".widgets-doll-labels").append(this.elem)
         this.pos2d = new THREE.Vector3
+        this.wenli = o.imgsrc
 
         this.elem.css({ position: 'absolute', 'z-index': 999 })
         this.clickFun = o.clickFun;

public/package/js/objViewer.js

@@ -22,7 +22,7 @@ var Viewer = function (index, dom) {
     this.camera = new THREE.PerspectiveCamera();
     this.camera.position.set(0, 0, 0.78);
     this.control = new THREE.OrbitControls(this.camera, this.dom)
-    this.control.enableDamping = false;
+    this.control.enableDamping = true;
     this.control.dampingFactor = 0.4;
     this.control.minDistance = 0.3;
     this.control.maxDistance = 2;
@@ -244,13 +244,12 @@ Viewer.prototype.animate = function () {
                                 console.log(child);
                                 if (child.name == "WL48_ping") {
                                     let textrueLoader = new THREE.TextureLoader();
-                                    var emissiveTexture = textrueLoader.load("model/shadow.jpg");
+                                    // var emissiveTexture = textrueLoader.load("model/shadow.jpg");
                                     // emissiveTexture.encoding = THREE.LinearEncoding;
-                                    child.material.emissiveMap = emissiveTexture;
+                                    // child.material.emissiveMap = emissiveTexture;
                                     child.material.emissiveIntensity = 0;
                                     let step = 1
                                     setInterval(() => {
-
                                         if (window.activetab == 'pic') {
                                             if (child.material.emissiveIntensity > 0.3) {
                                                 step = -1
@@ -260,7 +259,6 @@ Viewer.prototype.animate = function () {
                                             }
                                             child.material.emissiveIntensity += 0.01 * step;
                                         }
-                                        
                                     }, 50);
                                     child.material.emissive = new THREE.Color(0xffffff);
                                     child.material.dispose();

src/views/Home_pc.vue

@@ -333,9 +333,9 @@ export default {
     let textrueLoader = new window.THREE.TextureLoader();
 
 
-    window.viewer.addEventListener("delayUpdate", (e) => {
-      //if (e.changeSlightly) {
-        setTimeout(() => {
+ 
+    window.viewer.addEventListener("delayUpdate", (e) => { 
+        setTimeout(() => { 
           if (this.currentItem == 'pic') {
             let centerLabel = window.viewer.getCLabel()
             if (centerLabel) {
@@ -348,15 +348,15 @@ export default {
                 }
               })
             }
-          }
-        });
-      //}
+          } 
+        }); 
     })
 
     window.viewer.addEventListener("onPointerUp", () => {
       if (this.currentItem == 'pic') {
         if (this.centerLabel) {
-          let emissiveTexture = textrueLoader.load("model/shadow.jpg");
+          console.log(this.centerLabel);
+          let emissiveTexture = textrueLoader.load(`model/${this.centerLabel.wenli}.jpg`);
           let wlmesh = window.viewer.model.getObjectByName("WL48_ping")
           setTimeout(() => {
             wlmesh.material.emissiveMap = emissiveTexture;