|
@@ -54212,7 +54212,7 @@
|
|
|
|
|
|
let f = ()=>{
|
|
|
this.position.copy(endPosition); //因为延时1后control的update会导致位置改变
|
|
|
- info.callback && info.callback();
|
|
|
+ info.callback && info.callback();
|
|
|
this.dispatchEvent('flyingDone');
|
|
|
};
|
|
|
if(info.duration){
|
|
@@ -54225,15 +54225,17 @@
|
|
|
|
|
|
let endPosition = new Vector3().copy(info.position);
|
|
|
let startPosition = this.position.clone();
|
|
|
- let startQuaternion, endQuaternion, endTarget = null,
|
|
|
+ let startQuaternion, endQuaternion, endTarget = info.target && new Vector3().copy(info.target) ,
|
|
|
endYaw, startYaw, endPitch, startPitch ;
|
|
|
|
|
|
|
|
|
this.restrictPos(endPosition);
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
if(info.endYaw == void 0){
|
|
|
- if(info.target ){
|
|
|
- endTarget = new Vector3().copy(info.target);
|
|
|
+ if(info.target ){
|
|
|
endQuaternion = math.getQuaFromPosAim(endPosition,endTarget); //若为垂直,会自动偏向x负的方向
|
|
|
|
|
|
}else if(info.quaternion){
|
|
@@ -73684,7 +73686,7 @@ void main()
|
|
|
//注意,这时候Potree.js中export的内容还不在Potree变量中
|
|
|
|
|
|
var texLoader$1 = new TextureLoader();
|
|
|
-
|
|
|
+ texLoader$1.crossOrigin = "anonymous";
|
|
|
{//defines:
|
|
|
Potree.defines = {};
|
|
|
Potree.defines.Buttons = {// MouseEvent.buttons
|
|
@@ -91030,7 +91032,7 @@ void main()
|
|
|
console.log('updateNodeMaxLevel ' + this.dataset_id + " : "+ this.nodeMaxLevel);
|
|
|
|
|
|
setTimeout(()=>{
|
|
|
- this.setPointLevel();//重新计算
|
|
|
+ this.setPointLevel();//重新计算 延迟是因为testNodeMax会变回旧的
|
|
|
},1);
|
|
|
|
|
|
if(!Potree.settings.sizeFitToLevel){
|
|
@@ -120772,7 +120774,7 @@ ENDSEC
|
|
|
|
|
|
model.lastMatrixWorld = model.matrixWorld.clone();
|
|
|
viewer.dispatchEvent('content_changed');
|
|
|
- viewer.mapViewer && viewer.mapViewer.dispatchEvent('content_changed');
|
|
|
+ viewer.mapViewer && Potree.settings.showObjectsOnMap && viewer.mapViewer.dispatchEvent('content_changed');
|
|
|
},
|
|
|
|
|
|
|
|
@@ -120887,12 +120889,13 @@ ENDSEC
|
|
|
|
|
|
|
|
|
setGroundPlaneImg(src){//设置地面图
|
|
|
- const s = 0.1;
|
|
|
+ const s = 0.08;
|
|
|
this.curGroundImgSrc = src;
|
|
|
if(src){
|
|
|
let map = texLoader$a.load(src,(tex)=>{
|
|
|
if(this.curGroundImgSrc == src){
|
|
|
this.groundPlane.scale.set(tex.image.width*s, tex.image.height*s);
|
|
|
+ viewer.dispatchEvent('content_changed');
|
|
|
}
|
|
|
});
|
|
|
if(!this.groundPlane){
|