|
@@ -37,19 +37,20 @@ export default class ConvertViews extends THREE.EventDispatcher{
|
|
|
viewer.setFlySpeedRate(5)
|
|
|
viewer.getViewer().setTransitionAnimationState(false) //setCameraStatus瞬间变化相机
|
|
|
|
|
|
- /* viewer.addEventListener('Rendered', (e)=>{
|
|
|
+ viewer.addEventListener('Rendered', (e)=>{
|
|
|
let info = viewer.getCameraStatus()
|
|
|
let poseChanged = !math.closeTo(this.lastCamStatus.position, info.position)
|
|
|
|| !math.closeTo(this.lastCamStatus.target, info.target)
|
|
|
|| !math.closeTo(this.lastCamStatus.fov, info.fov)
|
|
|
|
|
|
- if(poseChanged){
|
|
|
- this.send(info)
|
|
|
- }
|
|
|
-
|
|
|
- this.lastCamStatus = info
|
|
|
+ if(poseChanged){
|
|
|
+ if(sourceApp.canChangePos()){
|
|
|
+ this.send(info)
|
|
|
+ this.lastCamStatus = info
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- }) */
|
|
|
+ })
|
|
|
|
|
|
|
|
|
/* viewer.addEventListener(targetApp.Glodon.Bimface.Viewer.Viewer3DEvent.ViewAdded,
|
|
@@ -96,6 +97,7 @@ export default class ConvertViews extends THREE.EventDispatcher{
|
|
|
this.sourceDom.dispatchEvent(event)
|
|
|
})
|
|
|
dom1.addEventListener('mouseup',(e)=>{
|
|
|
+
|
|
|
let event = getEvent('mouseup', e)
|
|
|
this.sourceApp.dispatchEvent(event) //mouseup 在laser中加在window上的
|
|
|
})
|
|
@@ -164,8 +166,9 @@ export default class ConvertViews extends THREE.EventDispatcher{
|
|
|
target,
|
|
|
up: new THREE.Vector3(0,0,1),
|
|
|
//前三个缺一不可
|
|
|
+ fov: data.fov , //fov 用setCameraStatus 无效
|
|
|
}
|
|
|
- //fov 用setCameraStatus 无效
|
|
|
+
|
|
|
|
|
|
|
|
|
this.viewer.setCameraStatus(msg)
|
|
@@ -230,8 +233,8 @@ export default class ConvertViews extends THREE.EventDispatcher{
|
|
|
let panoPos1 = sourcePano
|
|
|
|
|
|
let panoPos2 = [
|
|
|
- new THREE.Vector3( -5.313605730801787, -4.889868407960505, 1.717447893355817),
|
|
|
- new THREE.Vector3( -5.337403524084278, -2.5012228235167737, 1.7608838933558175)
|
|
|
+ new THREE.Vector3( -5.313605730801787, -4.889868407960505, 1.237447893355817),
|
|
|
+ new THREE.Vector3( -5.337403524084278, -2.5012228235167737, 1.2808838933558175)
|
|
|
]
|
|
|
|
|
|
let length = panoPos1.length
|