xzw 11 месяцев назад
Родитель
Сommit
1d766417c8
1 измененных файлов с 10 добавлено и 8 удалено
  1. 10 8
      src/sdk/cover/index.js

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

@@ -489,13 +489,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
         comeTo(o = {}) {
             //console.log('comeTo',o.position, o.target)
             //飞到某个点  
-            /* if (o.modelId) {
-                ['position', 'target'].forEach(e => {
-                    if (o[e]) {
-                        o[e] = Potree.Utils.datasetPosTransform({ fromDataset: true, datasetId: o.modelId, position: o[e] })
-                    }
-                })
-            } */
+             
             let deferred = $.Deferred()
             if(o.panoId != void 0){
                 let model = o.model.model
@@ -515,6 +509,14 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
                 }
             }else if(requestInPano){
                 requestInPano.result_.flyOutPano()
+            }else{
+                if (o.modelId != void 0) {
+                    ['position', 'target'].forEach(e => { 
+                        if (o[e]) {
+                            o[e] = Potree.Utils.datasetPosTransform({ fromDataset: true, datasetId: o.modelId, position: o[e] })
+                        }
+                    })
+                }
             }
             
 
@@ -766,7 +768,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
                 spliceFromArr(model, props, true)
  
                 model.addEventListener('changeSelect', (e) => {
-                    MergeEditor.selected && e.selected && MergeEditor.transformControls.attach(model, e.clickPos) //: MergeEditor.transformControls.detach()
+                    MergeEditor.transformControls.visible && e.selected && MergeEditor.transformControls.attach(model, e.clickPos) //: MergeEditor.transformControls.detach()
                 })