src/sdk/cover/index.js

@@ -13,8 +13,9 @@ const ModelTypes = {
     3 : {name:'用户上传三维模型'},
     4 : {name:'深时mesh（激光转台）',panos4dkk:true, rot90:true},//3dtiles or obj
     5 : {name:'深光点云' },
-    6 : {name:'深光mesh',panos4dkk:true, rot90:true},//3dtiles
-    7 : {name:'圆周率相机' },//圆周率相机场景
+    6 : {name:'深光mesh', panos4dkk:true, rot90:true},//3dtiles
+    7 : {name:'圆周率相机', panos4dkk:true },//圆周率相机场景 之前我记得场景没有漫游点…… 3dtiles要转90度
+    //'7_new' : {name:'新版圆周率相机', panos4dkk:true, rot90:true}, //圆周率相机场景
 }
 let cesAspect , cesImageryProvider
 
@@ -134,7 +135,10 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
         //sdk.setBackdrop('none')
     }
     
-    let { THREE } = Potree.mergeEditStart(dom, mapDom)
+   
+    let { THREE } = Potree.mergeEditStart(dom, mapDom, {
+        queryCloudLonLatUrl:Potree.settings.urls.prefix+"/laser/4dage/{sceneCode}/getDataSetAndControlPoint"  
+    })
     let MergeEditor = viewer.modules.MergeEditor
     Potree.settings.unableNavigate = true 
     Potree.setLonlat(lonlat[0], lonlat[1])
@@ -158,8 +162,6 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
     } */
 
      
-    Potree.settings.queryCloudLonLatUrl = Potree.settings.urls.prefix+"/laser/4dage/{sceneCode}/getDataSetAndControlPoint"
-   
      
      
     //因为getPose里用的是target，俯视的yaw不准，所以限制一下不要完全俯视
@@ -953,7 +955,13 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                 model.result_ = result
                 model.props = props
                 result.model = model
-                model.fromType = ModelTypes[props.fromType].name
+                model.fromType = ModelTypes[props.raw.type].name
+                 
+                if(model.fromType == '圆周率场景'){
+                    props.fromType = (props.type == 'osgb' || props.type == 'b3dm') ? 4 : 0  
+                }
+                
+                  
                 if (!props.isFirstLoad) {
                     model.visible = false//先不显示，防止卡顿
                 }