|
|
@@ -19938,7 +19938,8 @@ window.Modernizr = function(n, e, t) {
|
|
|
if (this.player.currentPano.id === this.warpDestPano.id)
|
|
|
y.debug("Already at destination pano");
|
|
|
else {
|
|
|
- this.nodes = this.findShortestPath(this.player.currentPano, this.warpDestPano),
|
|
|
+ // this.nodes = this.findShortestPath(this.player.currentPano, this.warpDestPano),
|
|
|
+ this.nodes = [this.player.currentPano.id, this.warpDestPano.id], // 周恩光加 导览点之间直线路径
|
|
|
n = void 0 === this.nodes || null === this.nodes || this.nodes.length < 1,
|
|
|
this.obj3d = new r.Object3D,
|
|
|
y.debug('Brushing from "' + this.player.currentPano.id + '" to "' + this.warpDestPano.id + '" (' + (this.nodes ? this.nodes.length : 0) + ")"),
|
|
|
@@ -20075,7 +20076,8 @@ window.Modernizr = function(n, e, t) {
|
|
|
return this.warpPathPoints = null,
|
|
|
this.warpLength = 0,
|
|
|
!1;
|
|
|
- this.nodes = this.findShortestPath(this.player.currentPano, this.warpDestPano),
|
|
|
+ // this.nodes = this.findShortestPath(this.player.currentPano, this.warpDestPano),
|
|
|
+ this.nodes = [this.player.currentPano.id, this.warpDestPano.id], // 周恩光加 导览点之间相机直线跳转
|
|
|
void 0 === this.nodes || null === this.nodes || this.nodes.length < 1 ? (y.debug("warp path to unreachable node"),
|
|
|
t = this.warpDestPano.position.clone().sub(o.position),
|
|
|
i = t.clone().negate(),
|
|
|
@@ -23737,7 +23739,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
var rotTime
|
|
|
if(currentLocation.rotTime == void 0 || currentLocation.rotTime == ''){
|
|
|
// 周恩光加 使用片段时长覆盖音乐时长
|
|
|
- rotTime = currentLocation.heroLocations[this.director.currentItem[1]-1].rotTime * 1000
|
|
|
+ rotTime = currentLocation.heroLocations[this.director.currentItem[1]].rotTime * 1000
|
|
|
if(!rotTime) {
|
|
|
var restChildCount = currentLocation.heroLocations ? (currentLocation.heroLocations.length-this.director.currentItem[1]-1) : 0
|
|
|
var hasMusic = currentLocation && currentLocation.musicInfo && currentLocation.musicInfo.music
|
zhouenguang