|
@@ -865,6 +865,7 @@ export default class ConvertViews extends THREE.EventDispatcher{
|
|
|
isAtPano : images360.isAtPano(),
|
|
|
quaternionChanged : true,
|
|
|
bumping: images360.bumping,
|
|
|
+ isFlyToPano: !!images360.latestToPano
|
|
|
|
|
|
}
|
|
|
}else if(app.sceneType == 'kankan'){
|
|
@@ -899,7 +900,7 @@ export default class ConvertViews extends THREE.EventDispatcher{
|
|
|
convertInfo = convertInfo || this.convertInfo
|
|
|
if(fakeApp.sceneType == 'laser'){
|
|
|
//customer.Potree.settings.displayMode = fakeApp.viewInfo.displayMode
|
|
|
- if(fakeApp.viewInfo.isAtPano || fakeApp.viewInfo.bumping || fakeApp.viewInfo.displayMode == 'showPanos'){ //不改变漫游点,仅转换朝向
|
|
|
+ if(fakeApp.viewInfo.isAtPano || fakeApp.viewInfo.bumping || fakeApp.viewInfo.isFlyToPano || fakeApp.viewInfo.displayMode == 'showPanos'){ //不改变漫游点,仅转换朝向
|
|
|
if( fakeApp.viewInfo.quaternionChanged){
|
|
|
let diffQua = customer.fakeApp == convertInfo.targetFakeApp ? convertInfo.diffQua : convertInfo.diffQuaInvert
|
|
|
//let diffQua = customer == this.targetApp ? convertInfo.diffQua : convertInfo.diffQuaInvert
|
|
@@ -936,7 +937,7 @@ export default class ConvertViews extends THREE.EventDispatcher{
|
|
|
|
|
|
}
|
|
|
|
|
|
- laserSyncView(app,data){
|
|
|
+ laserSyncView(app,data){
|
|
|
app.viewer.mainViewport.view.position.copy(data.position)
|
|
|
app.viewer.mainViewport.view.lookAt(data.target)
|
|
|
}
|
|
@@ -1149,8 +1150,13 @@ note:
|
|
|
还不支持laser和4dkk同屏
|
|
|
|
|
|
访问:
|
|
|
-window[0] window[1]
|
|
|
-window[0].fakeApp, window[1].fakeApp
|
|
|
+
|
|
|
+window.global__.sourceApp.fakeApp
|
|
|
+window.global__.targetApp.fakeApp
|
|
|
+ window[1] 不准确,不一定是targetApp
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
旋转只能通过target设置, 不能直接改camera.quaternion
|
|
|
当且仅当发送方相机属性变化后才传递过来,就不在这里判断是否变化了。
|