xzw před 1 rokem
rodič
revize
bc7f1820d0
1 změnil soubory, kde provedl 8 přidání a 5 odebrání
  1. 8 5
      src/sdk/cover/index.js

+ 8 - 5
src/sdk/cover/index.js

@@ -486,7 +486,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
                 pose.model = model.result_
                 pose.model = model.result_
                  
                  
                 pose.posInModel = Potree.Utils.datasetPosTransform({ toDataset: true, position: camera.position.clone(), object:model })
                 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 }) //拿第一个数据集
+                pose.rotInModel = Potree.Utils.datasetRotTransform({ toDataset: true, quaternion: camera.quaternion.clone(), getQuaternion: true, pointcloud:model }).toArray() //拿第一个数据集
  
  
             }
             }
             
             
@@ -504,12 +504,14 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
                 })
                 })
             } */
             } */
             let deferred = $.Deferred()
             let deferred = $.Deferred()
-            if(o.displayMode == 'showPanos'){
-                let pano = o.model.panos.find(a=>a.originID == e.panoId)
+            if(o.panoId != void 0){
+                let model = o.model.model
+                let pano = model.panos.find(a=>a.originID == o.panoId)
                 if(pano){
                 if(pano){
-                    let quaternion = Potree.Utils.datasetRotTransform({ fromDataset: true, quaternion: o.rotInModel, getQuaternion: true, object:o.model })  
+                    o.rotInModel = new THREE.Quaternion().fromArray(o.rotInModel)
+                    let quaternion = Potree.Utils.datasetRotTransform({ fromDataset: true, quaternion: o.rotInModel, getQuaternion: true, object:model})  
 
 
-                    o.model.result_.flyInPano(pano, {quaternion, callback(){
+                    o.model.flyInPano(pano, {quaternion, callback(){
                         o.callback && o.callback()
                         o.callback && o.callback()
                         deferred.resolve(true)
                         deferred.resolve(true)
                     }})
                     }})
@@ -727,6 +729,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
             let done = (model_) => {
             let done = (model_) => {
                 model = model_
                 model = model_
                 model.result_ = result
                 model.result_ = result
+                result.model = model
                 if (!props.isFirstLoad) {
                 if (!props.isFirstLoad) {
                     model.visible = false//先不显示,防止卡顿
                     model.visible = false//先不显示,防止卡顿
                 }
                 }