xzw 4 maanden geleden
bovenliggende
commit
f66267510b
1 gewijzigde bestanden met toevoegingen van 6 en 6 verwijderingen
  1. 6 6
      src/sdk/cover/index.js

+ 6 - 6
src/sdk/cover/index.js

@@ -662,6 +662,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                 if(isFlyToTag && model.dataset_id != modelId){ //保存编辑热点时的视角,如果在全景模式,只有点位在所加模型上时才保存
                     pose.noViewSaved = true //不保存视角
                 }else{
+                    pose.modelId = model.dataset_id //pose.model = model.result_ //无法json化
                     pose.panoId = viewer.images360.currentPano.originID 
                     pose.posInModel = Potree.Utils.datasetPosTransform({ toDataset: true, position: camera.position.clone(), object:model })
                     pose.rotInModel = Potree.Utils.datasetRotTransform({ toDataset: true, quaternion: camera.quaternion.clone(), getQuaternion: true, pointcloud:model }).toArray() //拿第一个数据集
@@ -688,9 +689,8 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
             let fly = ()=>{
                 
                 if(o.panoId != void 0){
-                    
-                    let pano = viewer.images360.panos.find(a=>a.originID == o.panoId)
-                    let model = pano.pointcloud 
+                    let model = viewer.scene.pointclouds.concat(viewer.objs.children).find(e=>e.dataset_id == o.modelId)
+                    let pano = model.panos.find(a=>a.originID == o.panoId) 
                     if(pano){
                         o.rotInModel = new THREE.Quaternion().fromArray(o.rotInModel)
                         let quaternion = Potree.Utils.datasetRotTransform({ fromDataset: true, quaternion: o.rotInModel, getQuaternion: true, object:model})  
@@ -881,9 +881,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
           
 
             //console.log('enterSceneGuide',pathArr)
-            pathArr.forEach(e=>{
-                if(e.panoId != void 0){
-                    e.model = e.model.model
+            pathArr.forEach(p=>{
+                if(p.panoId != void 0){ 
+                    p.model = viewer.scene.pointclouds.concat(viewer.objs.children).find(e=>e.dataset_id == p.modelId)//e.model.model
                 }
             })
             let data = {