Quellcode durchsuchen

fix: 放大镜在正交下的中心点偏移(是放大镜camera位置错误)

xzw vor 2 Jahren
Ursprung
Commit
228f77457d
2 geänderte Dateien mit 9 neuen und 9 gelöschten Zeilen
  1. 8 8
      public/static/lib/potree/potree.js
  2. 1 1
      public/static/lib/potree/potree.js.map

+ 8 - 8
public/static/lib/potree/potree.js

@@ -106155,25 +106155,25 @@ ENDSEC
 	        
 	        const fareast = 300;  
 	        //相机位置
-	        if(playerCamera.type == 'OrthographicCamera'){
-	            
-	            var finalDisToAim = 2;
-	             
+	        if(playerCamera.type == 'OrthographicCamera'){ 
+	            var finalDisToAim = 2; 
 	        }else {  
 	            var finalDisToAim =  dis>magDisMin ? dis > fareast ? magDisMax : (dis-magDisMin) / (fareast-magDisMin) * (magDisMax-magDisMin) + magDisMin :  dis / 2;    //dis>magDistance_ ? magDistance_ : dis / 2;
-	            
 	        }
 	         
-	        this.camera.position.copy(aimPos).add(dirToCamera.multiplyScalar(finalDisToAim));
-	        this.camera.lookAt(aimPos);
+	        
 	        this.camera.fov = playerCamera.type == 'OrthographicCamera' ? 30 : playerCamera.fov / 2;
 	        this.camera.updateProjectionMatrix();
 	        
+	        
 	        if(playerCamera.type == 'OrthographicCamera'){
-	            orthoView.position.copy(this.camera.position);
+	            orthoView.position.copy(aimPos).sub(viewer.mainViewport.view.direction.multiplyScalar(finalDisToAim));
 	            orthoView.yaw = viewer.mainViewport.view.yaw;
 	            orthoView.pitch = viewer.mainViewport.view.pitch;
 	            orthoView.applyToCamera(this.camera);
+	        }else {
+	            this.camera.position.copy(aimPos).add(dirToCamera.multiplyScalar(finalDisToAim));
+	            this.camera.lookAt(aimPos); 
 	        }
 
 	         

Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
public/static/lib/potree/potree.js.map