|
@@ -75505,7 +75505,7 @@ void main()
|
|
|
|
|
|
|
|
|
let r1 = Potree.Utils.getPos2d(center, camera, viewer.renderArea, e.viewport);
|
|
|
- if(!r1.trueSide)return Potree.Utils.updateVisible(this, 'notTrueSide', false); //console.error('!r1.trueSide') //中心点如果在背面直接不渲染了
|
|
|
+ if(!r1.trueSide)return //Potree.Utils.updateVisible(this, 'notTrueSide', false); 但这句会使realVisible为false从而无法更新//console.error('!r1.trueSide') //中心点如果在背面直接不渲染了
|
|
|
|
|
|
let r2, point2;
|
|
|
|
|
@@ -75536,9 +75536,9 @@ void main()
|
|
|
//console.log(p2StateHistory,len)
|
|
|
|
|
|
if(!r2.trueSide){
|
|
|
- return Potree.Utils.updateVisible(this, 'notTrueSide', false), console.log(' !r2.trueSide', )
|
|
|
+ return //Potree.Utils.updateVisible(this, 'notTrueSide', false), console.log(' !r2.trueSide', )
|
|
|
}
|
|
|
- Potree.Utils.updateVisible(this, 'notTrueSide', true);
|
|
|
+ //Potree.Utils.updateVisible(this, 'notTrueSide', true)
|
|
|
|
|
|
let p1 = r1.pos, p2 = r2.pos;
|
|
|
let vec = new Vector2().subVectors(p1,p2);
|
|
@@ -80968,7 +80968,7 @@ void main()
|
|
|
|
|
|
|
|
|
this.name = this.measureType + this.constructor.counter; //'Measure_' + this.constructor.counter;
|
|
|
- this.color = '#FF4399';
|
|
|
+ //this.color = '#FF4399'
|
|
|
this.color = new Color(this.color);
|
|
|
|
|
|
this.markerLabels = [];
|
|
@@ -81569,12 +81569,14 @@ void main()
|
|
|
|
|
|
|
|
|
createEdgeLabel(name, hasHoverEvent){
|
|
|
+
|
|
|
+ mainLabelProp.backgroundColor = {r: this.color.r*255, g: this.color.g*255, b: this.color.b*255, a:config$1.measure.default.opacity};
|
|
|
+
|
|
|
+
|
|
|
const edgeLabel = new TextSprite$2(
|
|
|
$.extend(hasHoverEvent ? mainLabelProp : subLabelProp,{
|
|
|
- sizeInfo: labelSizeInfo, name:name||'edgeLabel',
|
|
|
-
|
|
|
- backgroundColor: {r: this.color.r*255, g: this.color.g*255, b: this.color.b*255, a:config$1.measure.default.opacity},
|
|
|
-
|
|
|
+ sizeInfo: labelSizeInfo, name:name||'edgeLabel',
|
|
|
+
|
|
|
})
|
|
|
);
|
|
|
if(hasHoverEvent){
|
|
@@ -81701,7 +81703,7 @@ void main()
|
|
|
|
|
|
|
|
|
if(type != 'guide'){
|
|
|
- return Measure$1.lineMats['edgeSelect'+color]
|
|
|
+ return Measure$1.lineMats[type+color]
|
|
|
}else return Measure$1.lineMats[type]
|
|
|
|
|
|
|