xzw %!s(int64=2) %!d(string=hai) anos
pai
achega
8d48f378cb
Modificáronse 2 ficheiros con 11 adicións e 11 borrados
  1. 10 10
      public/lib/potree/potree.js
  2. 1 1
      public/lib/potree/potree.js.map

+ 10 - 10
public/lib/potree/potree.js

@@ -80109,8 +80109,8 @@ void main() {
         init(){ 
             var width = 100, height = 100;
             if(!this.dom){ 
-                this.dom = $('<div id="compass"></div>');
-                $("#potree_render_area").append(this.dom);
+                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" });
 
@@ -80355,8 +80355,8 @@ void main() {
         
         setDomPos(){
             if(!this.viewport)return
-            let right = (1-this.viewport.left + this.viewport.width);
-            this.dom.css({'right':(right*100 + 2) + '%'});
+            let right = this.viewport.left + this.viewport.width;
+            this.dom.css({'right':((1-right)*100 + 2) + '%'});
             
             //this.dom.css({'right':'none','left':config.isMobile? "1%" : "2%"})
         }
@@ -118138,8 +118138,9 @@ ENDSEC
             this.transformControls2.view = viewer.viewports[1].view;
             this.transformControls2.camera = viewer.viewports[1].camera;
             this.transformControls2._gizmo.hideAxis = {translate:['x','y'], rotate:['x','y','z'] };
-            
-
+                
+            viewer.compass.viewport = viewer.viewports[0];
+            viewer.compass.setDomPos();
             this.secondCompass.viewport = viewer.viewports[1];
             this.secondCompass.setDomPos();
             this.secondCompass.setDisplay(true);
@@ -118160,7 +118161,7 @@ ENDSEC
             this.transformControls._gizmo.hideAxis = {};
             viewer.setObjectLayers(this.transformControls, 'sceneObjects' );  //恢复
             
-            
+            viewer.compass.viewport = viewer.viewports[0];//恢复
             this.secondCompass.setDisplay(false);
             
              
@@ -125917,9 +125918,7 @@ ENDSEC
     	render: function (scenes, camera, viewports,  renderer, writeBuffer, readBuffer,  maskActive, renderFun ) {
             if(!(scenes instanceof Array))scenes = [scenes];
             
-            if(this.edgeStrength == 0){
-                console.log('this.edgeStrength == 0');
-            }
+            
             
     		if ( this.selectedObjects.length > 0 && this.edgeStrength > 0) {
                 
@@ -129141,6 +129140,7 @@ ENDSEC
 
                 //先渲染不透明的model:
                 if(this.objs.children.length){
+                    this.renderer.setRenderTarget(params.target||null);
                     this.setCameraLayers(params.camera,  ['model'] );//先渲染模型后渲染点云,否则半透明的点云的blend没有混合模型的部分(但模型为何可以混合点云的部分?估计还是PotreeRenderer有问题)
                     /* this.objs.children.forEach(e=>{
                         this.updateVisible(e, 'renderOpa', e.opacity == 1)  

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
public/lib/potree/potree.js.map