|
@@ -71293,7 +71293,7 @@ void main()
|
|
|
constructor( options={}){
|
|
|
super();
|
|
|
let map = new Texture();
|
|
|
-
|
|
|
+
|
|
|
this.sprite = new Sprite$2( Object.assign({
|
|
|
root:this
|
|
|
}
|
|
@@ -71418,14 +71418,10 @@ void main()
|
|
|
context.fillText(this.text , this.rectBorderThick + margin.x, y /* spriteHeight/2 + expand */);//x,y
|
|
|
|
|
|
let texture = new Texture(canvas);
|
|
|
- texture.minFilter = LinearMipMapLinearFilter;
|
|
|
+ texture.minFilter = LinearFilter; //LinearMipMapLinearFilter会缩放到power of 2
|
|
|
texture.magFilter = LinearFilter;
|
|
|
- texture.anisotropy = 4;
|
|
|
- texture.generateMipmaps = true;
|
|
|
texture.needsUpdate = true;
|
|
|
|
|
|
- //this.material.needsUpdate = true;
|
|
|
-
|
|
|
if(this.sprite.material.map){
|
|
|
this.sprite.material.map.dispose();
|
|
|
}
|
|
@@ -91958,13 +91954,15 @@ void main()
|
|
|
let halfHeight = Math.abs(dis) * Math.tan( MathUtils$1.degToRad(viewer.scene.cameraP.fov/2));
|
|
|
viewer.scene.cameraO.zoom = viewer.scene.cameraO.top / halfHeight;
|
|
|
viewer.scene.cameraO.updateProjectionMatrix();
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
console.log('变成正交');
|
|
|
viewer.focusOnObject(viewer.bound, 'boundingBox', 1000, {
|
|
|
endPitch: pitch, endYaw: yaw , dir, startCamera, endCamera
|
|
|
}).promise.done(()=>{
|
|
|
-
|
|
|
+ let baseLine = viewer.scene.measurements.find(e=>e.isBaseLine && e.points.length == 2);
|
|
|
+ baseLine && Potree.Utils.updateVisible(baseLine,'enterOrthoView',true);//基准线仅在正交视图可见
|
|
|
|
|
|
done && done();
|
|
|
navCubeViewer.dispatchEvent('content_changed');
|
|
@@ -92044,7 +92042,12 @@ void main()
|
|
|
if(viewer.mainViewport.camera == viewer.scene.cameraO){
|
|
|
startCamera = viewer.scene.cameraO;
|
|
|
endCamera = viewer.scene.cameraP;
|
|
|
+
|
|
|
+ let baseLine = viewer.scene.measurements.find(e=>e.isBaseLine && e.points.length == 2);
|
|
|
+ baseLine && Potree.Utils.updateVisible(baseLine,'enterOrthoView',false); //基准线仅在正交视图可见
|
|
|
+
|
|
|
}else {
|
|
|
+
|
|
|
console.log('switchView2', 'not ortho');
|
|
|
view.setView({ position:viewInfo.position,
|
|
|
endPitch: viewInfo.pitch, endYaw: viewInfo.yaw ,
|