|
@@ -103553,25 +103553,18 @@ ENDSEC
|
|
|
|
|
|
|
|
|
setBoxPose(){
|
|
|
- const min = 0.01;//0的话相当于没有box所以不能为0
|
|
|
//box底部不变,永远在bound的底部。但top会根据height改变
|
|
|
- let boxData = this.getBoxData();
|
|
|
- let bound = viewer.bound.boundingBox.clone();
|
|
|
- let scale = viewer.bound.boundSize.clone().setZ(Math.max(min,boxData.height));
|
|
|
- let pos = viewer.bound.center.clone().setZ(bound.min.z + boxData.height/2);
|
|
|
- let rotation = new Euler(0,0,boxData.rotAngle);
|
|
|
- scale.setX(Math.max(min,scale.x*boxData.scaleXY)).setY(Math.max(min,scale.y*boxData.scaleXY));
|
|
|
-
|
|
|
- this.box.position.copy(pos);
|
|
|
- this.box.rotation.copy(rotation);
|
|
|
- this.box.scale.copy(scale);
|
|
|
|
|
|
+ let boxData = this.getBoxData();
|
|
|
+ this.setRot(boxData.rotAngle);
|
|
|
+ this.setScale(boxData.scaleXY);
|
|
|
+ this.setScaleZ(boxData.scaleZ);
|
|
|
},
|
|
|
|
|
|
//暂定为在手动设置旋转之前 , 如果有基准线,使用基准线的旋转角。
|
|
|
getDefaultData(){
|
|
|
this.boxData = {
|
|
|
- height : 4, scaleXY:1, //水平缩放比率。1代表和bound相同
|
|
|
+ scaleZ : 1, scaleXY:1, //水平缩放比率。1代表和bound相同
|
|
|
rotAngle: 0//this.getRotByBaseLine() , rotByUser: false
|
|
|
};
|
|
|
},
|
|
@@ -103677,10 +103670,13 @@ ENDSEC
|
|
|
this.box.scale.x = viewer.bound.boundSize.x * s;
|
|
|
this.box.scale.y = viewer.bound.boundSize.y * s;
|
|
|
},
|
|
|
- setHeight(v){
|
|
|
- this.boxData.height = v;
|
|
|
- this.box.scale.z = v;
|
|
|
- this.box.position.z = viewer.bound.boundingBox.min.z + v/2;
|
|
|
+ setScaleZ(scaleZ){
|
|
|
+ scaleZ = Math.max(0.0001, scaleZ); //0的话相当于没有box所以不能为0
|
|
|
+ let maxHeight = viewer.bound.boundSize.z;
|
|
|
+ let height = maxHeight * scaleZ;
|
|
|
+ this.boxData.scaleZ = scaleZ;
|
|
|
+ this.box.scale.z = height;
|
|
|
+ this.box.position.z = viewer.bound.boundingBox.min.z + height/2;
|
|
|
}
|
|
|
|
|
|
|
|
@@ -134257,7 +134253,9 @@ ENDSEC
|
|
|
pointcloud.material.addEventListener('material_property_changed',()=>{
|
|
|
this.dispatchEvent('pointcloud_changed');
|
|
|
});
|
|
|
-
|
|
|
+ /* if(Potree.settings.isTest ){
|
|
|
+ this.showBoundingBox = true
|
|
|
+ } */
|
|
|
|
|
|
});
|
|
|
|