|
@@ -20,7 +20,7 @@ export const enter = (dom, mapDom, isLocal, lonlat) => {
|
|
|
Potree.settings.urls.prefix = Potree.settings.urls.prefix7
|
|
|
Potree.settings.webSite = 'datav1'
|
|
|
}
|
|
|
-
|
|
|
+ const mapBus = mitt(), sceneBus = mitt()
|
|
|
|
|
|
|
|
|
const tagLimitDis = 8;
|
|
@@ -32,7 +32,7 @@ export const enter = (dom, mapDom, isLocal, lonlat) => {
|
|
|
|
|
|
let {THREE} = Potree.mergeEditStart(dom, mapDom)
|
|
|
let MergeEditor = viewer.modules.MergeEditor
|
|
|
- let sceneBus = mitt()
|
|
|
+
|
|
|
|
|
|
viewer.addEventListener('camera_changed', e => {
|
|
|
var camera = e.viewport.camera
|
|
@@ -47,6 +47,16 @@ export const enter = (dom, mapDom, isLocal, lonlat) => {
|
|
|
})
|
|
|
|
|
|
|
|
|
+ /* mapBus.on('visible', v => {
|
|
|
+ //console.log('mapBus visible', v)
|
|
|
+ viewer.mapViewer.visible = v
|
|
|
+ if (v) {
|
|
|
+ viewer.mapViewer.mapLayer.needUpdate = true
|
|
|
+ }
|
|
|
+ viewer.mapViewer.dispatchEvent({type:'forceVisible',visible:v})
|
|
|
+ }) */
|
|
|
+
|
|
|
+
|
|
|
{
|
|
|
let index = 1;
|
|
|
//let setDisplay()
|
|
@@ -224,7 +234,7 @@ export const enter = (dom, mapDom, isLocal, lonlat) => {
|
|
|
|
|
|
|
|
|
let sdk = {
|
|
|
- sceneBus,
|
|
|
+ sceneBus, mapBus,
|
|
|
getPositionByScreen(pos2d, hopeModelId ){//通过屏幕坐标获取真实坐标 . hopeModelId: 如果指定了模型,优先返回hopeModelId上的intersect
|
|
|
//console.log('getPositionByScreen',hopeModelId)
|
|
|
hopeModelId = null
|
|
@@ -418,12 +428,13 @@ export const enter = (dom, mapDom, isLocal, lonlat) => {
|
|
|
viewer.mapViewer = new Potree.MapViewer(mapArea)
|
|
|
viewer.mapViewer.initProjection()
|
|
|
//focus
|
|
|
- let boundSize = new THREE.Vector3(300,150,1).max(viewer.bound.boundSize)
|
|
|
- setTimeout(()=>{
|
|
|
+ let boundSize = new THREE.Vector3(200,150,1).max(viewer.bound.boundSize)
|
|
|
+
|
|
|
+ viewer.mapViewer.addEventListener('viewerResize',()=>{
|
|
|
viewer.mapViewer.moveTo(viewer.bound.center, boundSize, 0)
|
|
|
- },100)
|
|
|
+ },{once:true})
|
|
|
|
|
|
- }
|
|
|
+ }
|
|
|
},
|
|
|
|
|
|
|