|
@@ -190,7 +190,12 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
Potree.Common.intervalTool.isWaiting('updateCamNear', ()=>{
|
|
|
updateCamNear()
|
|
|
}, 1000)
|
|
|
- updateCamFar()
|
|
|
+ updateCamFar()
|
|
|
+ if(e.changeInfo.positionChanged){
|
|
|
+ viewer.objs.children.forEach(model=>{
|
|
|
+ model.result_.updateVisiByRange && model.result_.updateVisiByRange()
|
|
|
+ })
|
|
|
+ }
|
|
|
}
|
|
|
if (e.viewport.name == 'MainView' || e.viewport.name == 'top' ) {
|
|
|
updateMap()
|
|
@@ -264,13 +269,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
//viewer.mainViewport.camera.position
|
|
|
viewer.mainViewport.view.radius = 0.1 //使pivot在面前一丢丢距离
|
|
|
viewer.setControls(viewer.orbitControls)
|
|
|
- viewer.removeEventListener('camera_changed', camera_changed)
|
|
|
-
|
|
|
-
|
|
|
- viewer.objs.children.forEach(model=>{
|
|
|
- model.result_.updateVisiByRange && model.result_.updateVisiByRange()
|
|
|
- })
|
|
|
-
|
|
|
+ viewer.removeEventListener('camera_changed', camera_changed)
|
|
|
}
|
|
|
}
|
|
|
let requestInPano = false
|
|
@@ -718,7 +717,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
}
|
|
|
|
|
|
if (o.modelId != void 0) {
|
|
|
- ['position', 'target'].forEach(e => { //热点
|
|
|
+ ['position', 'target', 'focusPos'].forEach(e => { //热点
|
|
|
if (o[e]) {
|
|
|
o[e] = Potree.Utils.datasetPosTransform({ fromDataset: true, datasetId: o.modelId, position: o[e] })
|
|
|
}
|
|
@@ -729,7 +728,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
if (o.distance || o.maxDis) {
|
|
|
//o.isFlyToTag = true
|
|
|
let requestShowPano
|
|
|
- let position = o.focusPos || o.target || o.position
|
|
|
+ let position = o.focusPos || o.target || o.position
|
|
|
if(o.isFlyToTag){
|
|
|
let r = sdk.canTurnToPanoMode(position, 5)//热点新需求:如果附近有漫游点就飞到全景模式
|
|
|
if(r){
|
|
@@ -1026,6 +1025,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
props.opacity < 100 && result.changeOpacity(props.opacity)
|
|
|
|
|
|
model.addEventListener('changeSelect', (e) => {
|
|
|
+
|
|
|
bus.emit('changeSelect', e.selected)
|
|
|
})
|
|
|
let lastState = {}
|
|
@@ -1501,8 +1501,10 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
// 更改模型名称
|
|
|
changeTitle(name){
|
|
|
model.name = name
|
|
|
- if(model.titleLabel){
|
|
|
- model.titleLabel.setText(name)
|
|
|
+
|
|
|
+ if(model.titleLabel ){
|
|
|
+ model.titleLabel.setText(name)
|
|
|
+ Potree.Utils.updateVisible(model.titleLabel, 'noText', name.trim() != '')
|
|
|
viewer.dispatchEvent('content_changed')
|
|
|
}
|
|
|
},
|