xzw il y a 1 mois
Parent
commit
50120a437e
3 fichiers modifiés avec 19 ajouts et 4 suppressions
  1. 1 1
      src/PotreeRendererNew.js
  2. 1 0
      src/custom/start.js
  3. 17 3
      src/custom/utils/math.js

+ 1 - 1
src/PotreeRendererNew.js

@@ -824,7 +824,7 @@ export class Renderer {
 
 
 			if (visibilityTextureData) {
 			if (visibilityTextureData) {
 				let vnStart = visibilityTextureData.offsets.get(node);
 				let vnStart = visibilityTextureData.offsets.get(node);
-                console.log('vnStart',vnStart)
+                //console.log('vnStart',vnStart)
 				shader.setUniform1f("uVNStart", vnStart);
 				shader.setUniform1f("uVNStart", vnStart);
 			}  
 			}  
 
 

+ 1 - 0
src/custom/start.js

@@ -124,6 +124,7 @@ export function start(dom, navDom, number ){ //t-Zvd3w0m
                     //console.log('loadPanos',dataset.sceneCode, dataset.id, data)
                     //console.log('loadPanos',dataset.sceneCode, dataset.id, data)
                     viewer.images360.addPanoData(data  ) 
                     viewer.images360.addPanoData(data  ) 
                     viewer.images360.loadDone()  
                     viewer.images360.loadDone()  
+                    
                     done() 
                     done() 
                 }) 
                 }) 
             }
             }

+ 17 - 3
src/custom/utils/math.js

@@ -618,9 +618,23 @@ var math = {
     },
     },
 
 
         
         
-    linearClamp(value,  x1,x2, y1, y2){//x为bound.min, bound.max
-        value = THREE.Math.clamp(value, x1,x2)
-        return y1 + ( y2 - y1) * (value - x1)  / (x2 - x1)  
+    linearClamp(value, xArr , yArr){ //xArr需要按顺序从小到大,yArr对应xArr中的值
+        
+        let len = xArr.length 
+        if(value <= xArr[0]) return yArr[0]
+        if(value >= xArr[len - 1]) return yArr[len - 1]
+        let i = 0 
+        
+        while(++i < len ){
+            if(value < xArr[i]){
+                let x1 = xArr[i-1], x2 = xArr[i], y1 = yArr[i-1], y2 = yArr[i] 
+                value = y1 + ( y2 - y1) * (value - x1)  / (x2 - x1)  
+                break
+            }
+        }
+        return value
+        
+         
     },
     },