xzw 2 rokov pred
rodič
commit
3adf69a816

+ 5 - 3
src/Potree.js

@@ -180,12 +180,14 @@ export async function loadPanos( callback){
     var path 
     //let query = `?datasetId=${datasetId}`                  //`?lat=${center.lat}&lon=${center.lon}&radius=200000`
     if(Potree.fileServer){ 
-        path = 'vision.json'
+        path = '/vision.json'
     }else{
         path = `${Potree.settings.urls.prefix1}/vision.json` 
     }
-     
-    return loadFile(path, { }, callback) 
+    return Potree.getRealUrl(path, (path)=>{
+        loadFile(path, {  }, callback, )  
+    })
+    //return loadFile(path, { }, callback) 
     
 }
 

+ 3 - 5
src/custom/modules/panos/Images360.js

@@ -1412,12 +1412,10 @@ export class Images360 extends THREE.EventDispatcher{
                         
      
     
-    addPanoData(data ){//加载漫游点
-        //data[0].file_id = '00019'
-         
+    addPanoData(data={} ){//加载漫游点
+        
         data = data.sweepLocations
-        if(data.length == 0)console.error( '没有漫游点') 
-        //data = data.sort(function(a,b){return a.id-b.id})
+        if(!data || data.length == 0)return console.error( '没有漫游点') 
         
         data.forEach((info)=>{  
             //if(Potree.fileServer){

+ 5 - 4
src/custom/objects/Sprite.js

@@ -121,10 +121,11 @@ export default class Sprite extends THREE.Mesh{
                 }
                 let p1 = r1.pos,  p2 = r2.pos
                 let vec = new THREE.Vector2().subVectors(p1,p2);
-                let angle = vec.angle() 
-                let axis = p1.x < p2.x ? 1 : -1 
-                orient2d = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0,0,1), axis*angle)
-                console.log(this.parent.text, THREE.Math.radToDeg(angle), axis )
+                let angle = -vec.angle() 
+                if(p1.x < p2.x) angle += Math.PI 
+                 
+                orient2d = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0,0,1),  angle)
+                console.log(this.parent.text, THREE.Math.radToDeg(angle), p1.x < p2.x   )
             }
         
             let parentQua = this.root.parent.getWorldQuaternion(new THREE.Quaternion)

+ 1 - 1
src/custom/objects/tool/Measure.js

@@ -259,7 +259,7 @@ export class Measure extends ctrlPolygon{
                 if(edgeLabel.visible){
                     setEdgeLabel(edgeLabel,point,nextPoint,distance)
                 }  
-                edgeLabel.sprite.lineDir = [point,nextPoint]//new THREE.Vector3().subVectors(point,nextPoint)
+                edgeLabel.sprite.lineDir = new THREE.Vector3().subVectors(point,nextPoint).normalize() //[point,nextPoint]
             }
         } 
 

+ 1 - 1
src/custom/start.js

@@ -64,7 +64,7 @@ export function start(dom, navDom, number ){ //t-Zvd3w0m
             //transformPointcloud(pointcloud,dataset)
             scene.addPointCloud(pointcloud);
             
-             
+