xzw 2 years ago
parent
commit
8bdf31e53a

+ 3 - 3
src/ExtendPointCloudOctree.js

@@ -269,8 +269,8 @@ export class ExtendPointCloudOctree extends PointCloudOctree{
 
 		{ // update pick material
 			pickMaterial.pointSizeType = pointSizeType;
-			 pickMaterial.shape = this.material.shape;
-		//	pickMaterial.shape = Potree.PointShape.PARABOLOID;
+			 //pickMaterial.shape = this.material.shape;
+              pickMaterial.shape = Potree.PointShape.PARABOLOID;
 
 			pickMaterial.uniforms.uFilterReturnNumberRange.value = this.material.uniforms.uFilterReturnNumberRange.value;
 			pickMaterial.uniforms.uFilterNumberOfReturnsRange.value = this.material.uniforms.uFilterNumberOfReturnsRange.value;
@@ -346,7 +346,7 @@ export class ExtendPointCloudOctree extends PointCloudOctree{
 
 		let pixels = buffer;
 		let ibuffer = new Uint32Array(buffer.buffer); //四个数整合成一个
-console.log(pixels.join(','))
+        // console.log(pixels.join(','))
 		// find closest hit inside pixelWindow boundaries
 		let min = Number.MAX_VALUE;
 		let hits = [], hits2 = [], rSquare;

+ 8 - 2
src/custom/objects/Magnifier.js

@@ -201,9 +201,15 @@ export default class Magnifier extends THREE.Object3D {//放大镜or望远镜
         
         Potree.Utils.updateVisible(this, "default", false, 0) //默认隐藏 
         
-        viewer.addEventListener("MeasureDragChange",(e)=>{//测量drag 
+       /*  viewer.addEventListener("MeasureDragChange",(e)=>{//测量drag 
             Potree.Utils.updateVisible(this, "measure", e.state, 1,   e.state?'add':'cancel') 
-        })
+        }) */
+        viewer.addEventListener("dragMarker",(e)=>{//测量drag 
+            Potree.Utils.updateVisible(this, "measure", true, 1,   'add' ) 
+        }) 
+        viewer.addEventListener("dropMarker",(e)=>{//测量drag 
+            Potree.Utils.updateVisible(this, "measure", false, 1,   'cancel' ) 
+        }) 
          
         
         viewer.scene.view.addEventListener('flyingDone',()=>{

+ 3 - 1
src/custom/objects/tool/ctrlPolygon.js

@@ -200,6 +200,8 @@ export class ctrlPolygon extends THREE.Object3D {
                 }
             }
             this.editStateChange(true)
+            
+            viewer.dispatchEvent({type:'dragMarker', object:this})
             return true
         }
         
@@ -477,7 +479,7 @@ export class ctrlPolygon extends THREE.Object3D {
         e.drag.endDragFun && e.drag.endDragFun(e)//  addmarker
          
         //if(this.changeCallBack)this.changeCallBack()
-           
+        viewer.dispatchEvent({type:'dropMarker', object:this})
         return true
     };
     

+ 2 - 0
src/materials/shaders/pointcloud_new.fs

@@ -154,6 +154,8 @@ void main() {
 		depth = (pos.z + 1.0) / 2.0;
 		gl_FragDepthEXT = depth;
 		
+        gl_FragDepthEXT = clamp(gl_FragDepthEXT, 0.0, 1.0);
+        
 		#if defined(color_type_depth)
 			color.r = linearDepth;
 			color.g = expDepth;

+ 3 - 2
src/viewer/EDLRendererNew.js

@@ -254,6 +254,7 @@ export class EDLRenderer{//Eye-Dome Lighting 眼罩照明
 		
         //TODO adapt to multiple lights
 		//this.renderShadowMap(visiblePointClouds2, camera, lights);  //???????
+ 
 
 		{  
 			for (let pointcloud of visiblePointClouds2) {
@@ -268,8 +269,8 @@ export class EDLRenderer{//Eye-Dome Lighting 眼罩照明
                 material.uniforms.octreeSize.value = octreeSize
                 
                 
-              
-	//material.shape = Potree.PointShape.PARABOLOID;
+        
+	    //material.shape = Potree.PointShape.PARABOLOID;
 
                 if(useEDL ){  
                     material.useEDL = true;