xzw 2 年之前
父節點
當前提交
b149feeeaa
共有 3 個文件被更改,包括 13 次插入12 次删除
  1. 1 1
      src/custom/viewer/ViewerNew.js
  2. 11 10
      src/custom/viewer/viewerBase.js
  3. 1 1
      src/viewer/NavigationCube.js

+ 1 - 1
src/custom/viewer/ViewerNew.js

@@ -2884,7 +2884,7 @@ export class Viewer extends ViewerBase{
             } 
             
             if(needSResize){
-                this.emitResizeMsg( { viewport:view} )
+                this.ifEmitResize( { viewport:view} )
             } 
              
             viewer.dispatchEvent({type: "render.begin",  viewer: viewer, viewport:view, params });

+ 11 - 10
src/custom/viewer/viewerBase.js

@@ -10,6 +10,7 @@ export class ViewerBase extends THREE.EventDispatcher{
         this.name = args.name
         this.renderArea = domElement 
         this.oldResolution = new THREE.Vector2()
+        this.oldResolution2 = new THREE.Vector2()
         
         this.screenSizeInfo = {
             W:0, H:0, pixelRatio:1 , windowWidth:0, windowHeight:0
@@ -190,18 +191,18 @@ export class ViewerBase extends THREE.EventDispatcher{
         }
         
         
-        /* if(!onlyForTarget){//因为onlyForTarget不传递devicePixelRatio所以不发送了
-            this.emitResizeMsg({viewport:this.viewports[0],  deviceRatio:devicePixelRatio})
-        } */
+        if(!onlyForTarget){//因为onlyForTarget不传递devicePixelRatio所以不发送了
+            this.ifEmitResize({viewport:this.viewports[0],  deviceRatio:devicePixelRatio})
+        }  
          
     } 
     
-    emitResizeMsg(e){//切换viewport渲染时就发送一次, 通知一些材质更新resolution。  
-        //if(!e.viewport.resolution.equals(this.oldResolution)||!e.viewport.resolution2.equals(this.oldResolution2)){ 
-        this.dispatchEvent($.extend(e, {type:'resize'})) 
-        /* this.oldResolution.copy(e.viewport.resolution)
-        this.oldResolution2.copy(e.viewport.resolution2) */
-        //} 
+    ifEmitResize(e){//切换viewport渲染时, 若这些viewport大小不同就发送一次, 通知一些材质更新resolution。  
+        if(!e.viewport.resolution.equals(this.oldResolution)||!e.viewport.resolution2.equals(this.oldResolution2)){ 
+            this.dispatchEvent($.extend(e, {type:'resize'})) 
+            this.oldResolution.copy(e.viewport.resolution)
+            this.oldResolution2.copy(e.viewport.resolution2)  
+         } 
     }
     
     
@@ -230,7 +231,7 @@ export class ViewerBase extends THREE.EventDispatcher{
                 //}
                 viewport.needRender = true  //直接写这咯  
                 if(changeInfo.resolutionChanged){
-                    this.emitResizeMsg({viewport})
+                    this.dispatchEvent( {type:'resize', viewport})  
                 } 
                   
             }                

+ 1 - 1
src/viewer/NavigationCube.js

@@ -340,7 +340,7 @@ class Face extends base{
         }
         for (var u = h.getCenter(new THREE.Vector3).normalize(), g = [], p = 0; p < e.length; p++) {
             var m = e[p];
-            g.push(m.clone()/* .add(u) */)
+            g.push(m.clone().add(u))
         }
         /*  this.highlightMesh = this.createMesh(g) 
         this.highlightMesh.visible = !1