xzw 2 years ago
parent
commit
f565f74f25
2 changed files with 6 additions and 5 deletions
  1. 5 4
      public/lib/potree/potree.js
  2. 1 1
      public/lib/potree/potree.js.map

+ 5 - 4
public/lib/potree/potree.js

@@ -78348,7 +78348,7 @@ void main() {
             let click = (e)=>{//一旦点击就立刻增加两marker  
             
                 if(ifAtWrongPlace(e))return  
-                
+                if(e.clickElement)return  //如点击label时focusOnObject
                  
                 
                 if(e.button === MOUSE.RIGHT)return 
@@ -80112,7 +80112,7 @@ void main() {
                 this.dom = $('<div name="compass"></div>');
                 $(viewer.renderArea).append(this.dom);
             } 
-            this.dom.css({ display:"none",  position:"absolute",right:"2%",top: "4%",width:width+"px",height:height+"px", "z-index":100,"pointer-events":"none" });
+            this.dom.css({ display:"none",  position:"absolute",right:"1%",top: "60px",width:width+"px",height:height+"px", "z-index":100,"pointer-events":"none" });
 
             let child = $("<div class='dirText north'><span>"+/* (config.lang=='zh'? */'北'/* :'N') */+"</span></div><div class='center'></div>");
             this.dom.append(child);  
@@ -80174,7 +80174,7 @@ void main() {
             }
             
             this.dom.find(".center")[0].appendChild(this.renderer.domElement);
-            
+            this.renderer.domElement.style.width = this.renderer.domElement.style.height = '100%';
             
             
             this.camera = new PerspectiveCamera;
@@ -80356,7 +80356,7 @@ void main() {
         setDomPos(){
             if(!this.viewport)return
             let right = this.viewport.left + this.viewport.width;
-            this.dom.css({'right':((1-right)*100 + 2) + '%'});
+            this.dom.css({'right':((1-right)*100 + 1) + '%'});
             
             //this.dom.css({'right':'none','left':config.isMobile? "1%" : "2%"})
         }
@@ -118162,6 +118162,7 @@ ENDSEC
             viewer.setObjectLayers(this.transformControls, 'sceneObjects' );  //恢复
             
             viewer.compass.viewport = viewer.viewports[0];//恢复
+            viewer.compass.setDomPos();
             this.secondCompass.setDisplay(false);
             
              

File diff suppressed because it is too large
+ 1 - 1
public/lib/potree/potree.js.map