瀏覽代碼

fix: color

xzw 2 年之前
父節點
當前提交
7bbab05a25
共有 3 個文件被更改,包括 16 次插入14 次删除
  1. 11 9
      public/static/lib/potree/potree.js
  2. 1 1
      public/static/lib/potree/potree.js.map
  3. 4 4
      src/sdk/laser/core/enter.js

+ 11 - 9
public/static/lib/potree/potree.js

@@ -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]
 	        
 	         

文件差異過大導致無法顯示
+ 1 - 1
public/static/lib/potree/potree.js.map


+ 4 - 4
src/sdk/laser/core/enter.js

@@ -468,11 +468,11 @@ var enter = ({
             /**
              * 开始测量
              */
-            startMeasure(type, unit) {
+            startMeasure(type, unit, color) {
                 const bus = mitt();
                 let info = getMeasureType(type, unit);
                 //info.bus = bus
-
+                info.color = color
                 let measure = viewer.measuringTool.startInsertion(
                         info,
                         () => {
@@ -521,7 +521,7 @@ var enter = ({
                 datasetId,
                 dataset_points,
                 points_datasets,
-                sid) {
+                sid, color) {
                 const bus = mitt();
                 let info = getMeasureType(type, unit);
                 info.points = points;
@@ -530,7 +530,7 @@ var enter = ({
                 info.points_datasets = points_datasets;
                 info.sid = sid;
                 info.bus = bus;
-
+                info.color = color
                 let measure = viewer.measuringTool.createMeasureFromData(info);
                 Potree.Log("drawMeasure由数据新建: " + measure.id, {
                     font: {