|
@@ -1185,10 +1185,8 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
}
|
|
|
},
|
|
|
changeSelect(state) {
|
|
|
- console.error('select', model?.name, state)
|
|
|
- if (model) {
|
|
|
- //window.test111 && result.putInFrontOfCam()
|
|
|
-
|
|
|
+ console.error('changeSelect', model?.name, state)
|
|
|
+ if (model) {
|
|
|
let focus = !(viewer.images360.currentPano?.pointcloud == model && viewer.images360.isAtPano()) //viewer.images360.latestRequestMode != 'showPanos' //防止因走到漫游点后我发送panoModelChange后执行这个又飞了
|
|
|
MergeEditor.selectModel(model, state, focus, true)
|
|
|
updateCamNear()
|
|
@@ -2241,9 +2239,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
|
|
|
|
getImageCenter(){ //热点在模型的本地坐标
|
|
|
if(!tag.parent)return new THREE.Vector3
|
|
|
- tag.titleLabel.sprite.update()
|
|
|
+ tag.titleLabel.sprite.update()
|
|
|
let pos = tag.onMesh ? tag.position : tag.titleLabel.parent.position.clone().applyMatrix4(tag.matrixWorld).applyMatrix4(tag.root.matrixWorld.clone().invert())
|
|
|
- console.log(props.title, 'getImageCenter', pos.toArray(), tag.lineLength)
|
|
|
+ //console.log(props.title, 'getImageCenter', pos.toArray(), tag.lineLength)
|
|
|
return pos
|
|
|
|
|
|
},
|