|
@@ -96166,8 +96166,8 @@ ENDSEC
|
|
this.marker = marker;
|
|
this.marker = marker;
|
|
|
|
|
|
this.images360.node.add(marker);
|
|
this.images360.node.add(marker);
|
|
- Potree.settings.isTest && this.addLabel();
|
|
|
|
- //this.addLabel2()
|
|
|
|
|
|
+ //Potree.settings.isTest && this.addLabel()
|
|
|
|
+ this.addLabel2();
|
|
|
|
|
|
marker.addEventListener('mouseover', this.hoverOn.bind(this));
|
|
marker.addEventListener('mouseover', this.hoverOn.bind(this));
|
|
marker.addEventListener('mouseleave', this.hoverOff.bind(this));
|
|
marker.addEventListener('mouseleave', this.hoverOff.bind(this));
|
|
@@ -96226,15 +96226,15 @@ ENDSEC
|
|
getMarkerMat(){
|
|
getMarkerMat(){
|
|
if(!markerTex) {
|
|
if(!markerTex) {
|
|
markerTex = {
|
|
markerTex = {
|
|
- default:texLoader$4.load( Potree.resourcePath+'/textures/marker.png' ),
|
|
|
|
|
|
+ //default:texLoader.load( Potree.resourcePath+'/textures/marker.png' ),
|
|
ring:texLoader$4.load( Potree.resourcePath+'/textures/marker2.png' )
|
|
ring:texLoader$4.load( Potree.resourcePath+'/textures/marker2.png' )
|
|
};
|
|
};
|
|
- markerTex.default.anisotropy = 4; // 各向异性过滤 .防止倾斜模糊
|
|
|
|
|
|
+ //markerTex.default.anisotropy = 4 // 各向异性过滤 .防止倾斜模糊
|
|
markerTex.ring.anisotropy = 4;
|
|
markerTex.ring.anisotropy = 4;
|
|
//有可能被点云遮住吗。
|
|
//有可能被点云遮住吗。
|
|
|
|
|
|
}
|
|
}
|
|
- return new DepthBasicMaterial({opacity: markerOpacitys.default, side: DoubleSide , map:markerTex.default ,transparent:true,
|
|
|
|
|
|
+ return new DepthBasicMaterial({opacity: markerOpacitys.default, side: DoubleSide , map:markerTex.ring/* .default */ ,transparent:true,
|
|
clipDistance: 2, occlusionDistance:1, //不能设置太短,因为过渡时深度不准确
|
|
clipDistance: 2, occlusionDistance:1, //不能设置太短,因为过渡时深度不准确
|
|
useDepth: !!(Potree.settings.useDepthTex && this.pointcloud.hasDepthTex),
|
|
useDepth: !!(Potree.settings.useDepthTex && this.pointcloud.hasDepthTex),
|
|
autoDepthTest:true
|
|
autoDepthTest:true
|
|
@@ -96298,7 +96298,18 @@ ENDSEC
|
|
this.images360.node.add(this.label);
|
|
this.images360.node.add(this.label);
|
|
this.floorPosition && this.label.position.copy(this.floorPosition);
|
|
this.floorPosition && this.label.position.copy(this.floorPosition);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ addLabel2(){
|
|
|
|
+ if(this.label2)return
|
|
|
|
+ this.label2 = new TextSprite$2(Object.assign({},
|
|
|
|
+ labelProp2, {text: /* this.originID */ parseInt(this.id)+1 }) //{text: `id:${this.id}, dataset:${this.pointcloud.name}, 4dkkId:${this.originID}`}
|
|
|
|
+ );
|
|
|
|
+ this.images360.node.add(this.label2);
|
|
|
|
+ this.floorPosition && this.label2.position.copy(this.floorPosition);
|
|
|
|
+ let s = 0.4;
|
|
|
|
+ this.label2.scale.set(s,s,s);
|
|
|
|
+ //Potree.Utils.updateVisible(this.label2, 'notDisplay', false)
|
|
|
|
+ Potree.Utils.updateVisible(this.label2, 'panoVisi', this.visible);
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
removeTextLabel(){
|
|
removeTextLabel(){
|