|
|
@@ -4173,6 +4173,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
case c.LEFT:
|
|
|
this.startRotationFrom(e.clientX, e.clientY)
|
|
|
}
|
|
|
+ SoundManager.pause('tour') // 周恩光 点击场景时停止语音
|
|
|
this.emit(u.InputStart, "mouse")
|
|
|
}
|
|
|
}
|
|
|
@@ -4533,6 +4534,25 @@ window.Modernizr = function(n, e, t) {
|
|
|
this.updateModel(),
|
|
|
this.resetAll(),
|
|
|
this.bindEvents()
|
|
|
+
|
|
|
+ // 周恩光 查询pano对应的导览片段
|
|
|
+ if(!this.panoIdMap) {
|
|
|
+ this.panoIdMap = new Map()
|
|
|
+ this.model.heroLocations.forEach( (value, index) => {
|
|
|
+ // value.heroLocations.forEach( hl => {
|
|
|
+ if(value.heroLocations){
|
|
|
+ let hl = value.heroLocations[0]
|
|
|
+ let arr = this.panoIdMap.get(hl.panoId)
|
|
|
+ if(arr){
|
|
|
+ this.panoIdMap.set(hl.panoId, [...arr, index])
|
|
|
+ } else {
|
|
|
+ this.panoIdMap.set(hl.panoId, [index])
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ // })
|
|
|
+ })
|
|
|
+ }
|
|
|
}
|
|
|
,
|
|
|
n.prototype.resetAll = function() {
|
|
|
@@ -4786,8 +4806,17 @@ window.Modernizr = function(n, e, t) {
|
|
|
//音频
|
|
|
|
|
|
var musicInfo = this.model.heroLocations[this.destinationItem[0]].musicInfo
|
|
|
- if(musicInfo && musicInfo.music){
|
|
|
- let src = musicInfo.music.includes(g_Prefix.slice(-10)) ? musicInfo.music : g_Prefix + musicInfo.music;
|
|
|
+ // 手动导览不播放音频
|
|
|
+ if(musicInfo && musicInfo.music && !e){
|
|
|
+
|
|
|
+ let musicType = localStorage.getItem('xunirole') || 'male'
|
|
|
+
|
|
|
+ let isMale = musicType.indexOf('female') < 0
|
|
|
+
|
|
|
+ let fixMusic = isMale?musicInfo.music:(musicInfo.fmusic||musicInfo.music)
|
|
|
+
|
|
|
+ // let src = musicInfo.music.includes(g_Prefix.slice(-10)) ? musicInfo.music : g_Prefix + musicInfo.music;
|
|
|
+ let src = fixMusic
|
|
|
let audioObj = SoundManager.list.find(e=>e.name == 'tour')
|
|
|
let audioSrc1 = common.getFileNameFromUrl(audioObj.src);
|
|
|
let audioSrc2 = common.getFileNameFromUrl(src)
|
|
|
@@ -4806,6 +4835,9 @@ window.Modernizr = function(n, e, t) {
|
|
|
|
|
|
|
|
|
}
|
|
|
+
|
|
|
+ let oldPos = this.player.position.clone();
|
|
|
+ let oldPano = this.player.currentPano
|
|
|
|
|
|
if (this.onTheBus = !0,
|
|
|
this.emit("update.controls"),
|
|
|
@@ -4822,15 +4854,18 @@ window.Modernizr = function(n, e, t) {
|
|
|
if (this.player.flying || this.player.isWarping())
|
|
|
A.warn("Cannot go to new destination while player is flying or warping.");
|
|
|
else {
|
|
|
+
|
|
|
var r = this.model.getHeroDescriptorByIndex(this.destinationItem)
|
|
|
, o = null
|
|
|
, a1 = null;
|
|
|
+ // console.error(this.destinationItem)
|
|
|
if (r.isPano()) {
|
|
|
|
|
|
//var s = 0 === this.destinationItem || e ? u.BLACK : this.nextWarpStyle;
|
|
|
//var walk = window.DATA.black ? 'black' : 'walk';
|
|
|
//若是点击item，直接瞬间过渡。
|
|
|
var s = e ? 'black' : this.getMomentTour(this.destinationItem) //window.DATA.momentTour || "walk";
|
|
|
+ if(this.destinationItem[0] == 0 && this.destinationItem[1] == 0) s = 'black' // 周恩光加 返回最初导览点是瞬间过渡
|
|
|
a1 = this.player.warpToPanoByHeroIndex.bind(this.player, this.destinationItem, v.Show, m.Slow, s, true, i, this.actionComplete.bind(this)),
|
|
|
o = this.arrivedAtDestination.bind(this, !0)
|
|
|
|
|
|
@@ -4850,6 +4885,9 @@ window.Modernizr = function(n, e, t) {
|
|
|
}
|
|
|
.bind(this), o),
|
|
|
this.emit("update.controls")
|
|
|
+ // 周恩光加 更新右侧导览当前位置
|
|
|
+ let pano = this.model.panos.index[r.panoId]
|
|
|
+ this.player.emit("flying.ended", pano.position, oldPos, pano, oldPano)
|
|
|
}
|
|
|
}
|
|
|
,
|
|
|
@@ -4861,8 +4899,15 @@ window.Modernizr = function(n, e, t) {
|
|
|
this.emit("update.controls"),
|
|
|
this.tourIsPlaying)
|
|
|
return this.atEndOfTour() && !this.endlessLoop ? (this.tourInProgress = !1,
|
|
|
- this.stopTour(true),
|
|
|
- this.emit(p.TourEnd),
|
|
|
+ void this.awaitCompletion(function() {
|
|
|
+ this.transitionStage = y.Interlude,
|
|
|
+ this.player.tourInterlude(this.nextItem(this.currentItem),this.actionComplete.bind(this))
|
|
|
+ }
|
|
|
+ .bind(this), function(){
|
|
|
+ this.currentItem = [0,0],
|
|
|
+ this.stopTour(true),
|
|
|
+ this.emit(p.TourEnd)
|
|
|
+ }.bind(this)),
|
|
|
void (this.player.mode === c.PANORAMA && this.model.fadePanoMarkers(a.panorama.markerOpacity))) : void this.awaitCompletion(function() {
|
|
|
this.transitionStage = y.Interlude,
|
|
|
this.player.tourInterlude(this.nextItem(this.currentItem),this.actionComplete.bind(this))
|
|
|
@@ -4871,7 +4916,33 @@ window.Modernizr = function(n, e, t) {
|
|
|
}
|
|
|
,
|
|
|
n.prototype.playTour = function() {
|
|
|
- if (!this.bounceable())
|
|
|
+ if (!this.bounceable()) {
|
|
|
+
|
|
|
+ if(!this.currentItem) this.currentItem = []
|
|
|
+ if(this.currentItem[0] != 0 || this.destinationItem[0]!= this.nItems-1){
|
|
|
+ // 周恩光加 从当前pano进行自动导览
|
|
|
+ let currentPanoDestinations = this.panoIdMap.get(this.player.currentPano.id)
|
|
|
+ // this.model.heroLocations.forEach( (value, index) => {
|
|
|
+ // if(value.heroLocations.find( hl => hl.panoId == this.player.currentPano.id )) {
|
|
|
+ // currentPanoDestinations.push(index)
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+
|
|
|
+ if(!currentPanoDestinations) {
|
|
|
+ // let panoIndex = this.model.panos.list.findIndex( pano => pano.id == this.player.currentPano.id )
|
|
|
+ let panoIndex = this.model.panos.list.indexOf( this.player.currentPano )
|
|
|
+ let neighbourIndex = [ panoIndex + 1, panoIndex - 1, panoIndex + 2, panoIndex - 2, panoIndex + 3, panoIndex - 3 ]
|
|
|
+ for(var i = 0; i < neighbourIndex.length; i++) {
|
|
|
+ currentPanoDestinations = this.panoIdMap.get(this.model.panos.list[neighbourIndex[i]]&&this.model.panos.list[neighbourIndex[i]].id)
|
|
|
+ if(currentPanoDestinations && currentPanoDestinations[0] != 0) break
|
|
|
+ }
|
|
|
+ if(!currentPanoDestinations) currentPanoDestinations = [0];
|
|
|
+ }
|
|
|
+ if(currentPanoDestinations.indexOf(this.currentItem[0]) == -1) {
|
|
|
+ this.currentItem[0] = currentPanoDestinations[0]
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
return this.tourIsPlaying ? void A.info("tour is already playing") : void (this.wouldInterrupt() || (this.player.emit("tour_auto", this.defaultWarpStyle),
|
|
|
this.tourInProgress = !0,
|
|
|
this.reachSource = "play",
|
|
|
@@ -4882,8 +4953,10 @@ window.Modernizr = function(n, e, t) {
|
|
|
this.emit("update.controls"),
|
|
|
this.emit(p.TourStart),
|
|
|
this.player.enablePreRendering(),
|
|
|
+ this.currentItem[1] = null,
|
|
|
this.walkingSectionPaused ? (this.clearWalkingSectionPaused(),
|
|
|
this.goToDestination()) : this.goNext()))
|
|
|
+ }
|
|
|
}
|
|
|
,
|
|
|
/* n.prototype.bgmReplay = function() {//xzw add 结束tour后可能要继续播放背景音乐
|
|
|
@@ -4892,6 +4965,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
} */
|
|
|
|
|
|
n.prototype.stopTour = function(isAutoStop) {//停止导览 isAutoStop 希望仅在飞完结束自动停止时的stopTour不停止tourSound, 这样才能完整播放tourSound. 不过似乎会在倒数第二个片段点击按钮停止导览时也视作自动结束的（执行this.interrupt() ）。
|
|
|
+ SoundManager.pause('tour'), // 周恩光 自动导览暂停时同时停止语音
|
|
|
this.isInterrupted() || this.transitionStage === y.Moving && this.checkAndHandleWalkingtourInterruption(this.nextWarpStyle) || (this.tourIsPlaying && (this.player.zoomEnabled = this.wasZoomEnabled),
|
|
|
this.tourIsPlaying = !1,
|
|
|
this.interrupt(),
|
|
|
@@ -5055,18 +5129,28 @@ window.Modernizr = function(n, e, t) {
|
|
|
n.prototype.tourAdvance = function(e) {//e是1或-1
|
|
|
|
|
|
A.debug("tourAdvance(" + e + ")")
|
|
|
+
|
|
|
+ // 周恩光改
|
|
|
if(null === this.currentItem || void 0 === this.currentItem){
|
|
|
- this.setDestinationItem(this.firstDestination())
|
|
|
- }else{
|
|
|
- var item
|
|
|
- if(e == 1){
|
|
|
- item = this.nextItem(this.currentItem)
|
|
|
- }else if(e == -1){
|
|
|
- item = this.prevItem(this.currentItem)
|
|
|
-
|
|
|
- }
|
|
|
- this.setDestinationItem(item)
|
|
|
+ // this.setDestinationItem(this.firstDestination())
|
|
|
+ // this.setDestinationItem([currentPanoDestinations[0], 0])
|
|
|
+ this.setDestinationItem([this.currentItem[0], 0])
|
|
|
+ }
|
|
|
+ else if(this.currentItem[1] == null) {
|
|
|
+ this.setDestinationItem([this.currentItem[0], 0])
|
|
|
+ }
|
|
|
+ else{
|
|
|
+
|
|
|
+ var item
|
|
|
+ if(e == 1){
|
|
|
+ item = this.nextItem(this.currentItem)
|
|
|
+ }else if(e == -1){
|
|
|
+ item = this.prevItem(this.currentItem)
|
|
|
+
|
|
|
+ }
|
|
|
+ this.setDestinationItem(item)
|
|
|
}
|
|
|
+
|
|
|
if(this.itemCompare(this.destinationItem, this.finalDestination(), 'equal')[0] < 0 ){
|
|
|
this.useSpecialTransition("reverse-looping to end")
|
|
|
}else if(this.itemCompare(this.destinationItem, this.firstDestination(), 'equal')){
|
|
|
@@ -6599,6 +6683,18 @@ window.Modernizr = function(n, e, t) {
|
|
|
$(".gui-floor-number").text(" " + (e.floorIndex + 1)),
|
|
|
$(".floorChoice").removeClass("active"),
|
|
|
$(".floorChoice[data-index=" + e.floorIndex + "]").addClass("active")))
|
|
|
+
|
|
|
+ if(window.number == '1149_2'){
|
|
|
+ if(e.floorIndex===0){
|
|
|
+ $('.cad') && $('.cad').addClass('hidemap')
|
|
|
+ $('.cad1') && $('.cad1').removeClass('hidemap')
|
|
|
+ }
|
|
|
+
|
|
|
+ if(e.floorIndex===1){
|
|
|
+ $('.cad1') && $('.cad1').addClass('hidemap')
|
|
|
+ $('.cad') && $('.cad').removeClass('hidemap')
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
function I(e) {
|
|
|
return e.describe().inTransition
|
|
|
@@ -7348,7 +7444,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
$(".icon:visible").hide().show(0)
|
|
|
}, 100)
|
|
|
}),
|
|
|
- $("#gui-fullscreen").find("a").on("click", function(e) {
|
|
|
+ $("#gui-fullscreen").on("click", function(e) {
|
|
|
l(e),
|
|
|
K.requestFullscreen($("body")[0]),
|
|
|
J.track("showcase_gui", {
|
|
|
@@ -7358,7 +7454,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
//czj
|
|
|
//W.reload()
|
|
|
}),
|
|
|
- $("#gui-fullscreen-exit").find("a").on("click", function(e) {
|
|
|
+ $("#gui-fullscreen-exit").on("click", function(e) {
|
|
|
l(e),
|
|
|
K.exitFullscreen(),
|
|
|
J.track("showcase_gui", {
|
|
|
@@ -7380,6 +7476,8 @@ window.Modernizr = function(n, e, t) {
|
|
|
K.supportsFullscreen() || $("#gui-fullscreen").hide(),
|
|
|
$("#pullTab").on("click", function(e) {
|
|
|
l(e),
|
|
|
+ window.player.director.emit('isPulltttttt',!$("#drawer").hasClass("open"));
|
|
|
+
|
|
|
$("#drawer").hasClass("open") ? (J.trackAlways("showcase_gui", {
|
|
|
gui_action: "hide_highlight_reel"
|
|
|
}),
|
|
|
@@ -7910,7 +8008,8 @@ window.Modernizr = function(n, e, t) {
|
|
|
}
|
|
|
function s(e, t) {
|
|
|
setTimeout(function() {
|
|
|
- if (h.isHelpEnabled()) {
|
|
|
+ // h.isHelpEnabled()
|
|
|
+ if (false) {
|
|
|
if (t(),
|
|
|
u.init(),
|
|
|
C.addClass("fadeIn landing " + u.deviceType),
|
|
|
@@ -8918,15 +9017,15 @@ window.Modernizr = function(n, e, t) {
|
|
|
}
|
|
|
function u(e, t) {
|
|
|
if (t) {
|
|
|
- var i = "keydown" === t.type
|
|
|
- , n = t.which === f.SPACE || C.tourIsPlaying;
|
|
|
+ // var i = "keydown" === t.type
|
|
|
+ // , n = t.which === f.SPACE || C.tourIsPlaying;
|
|
|
|
|
|
- i && n || e || (O = !0),
|
|
|
- C.atEndOfTour() && d(),
|
|
|
- !C.tourIsPlaying && C.tourInProgress && (_.removeClass("fadeIn"),
|
|
|
- d(),
|
|
|
- t.which !== f.SPACE && a()),
|
|
|
- i && n && s()
|
|
|
+ // i && n || e || (O = !0),
|
|
|
+ // C.atEndOfTour() && d(),
|
|
|
+ // !C.tourIsPlaying && C.tourInProgress && (_.removeClass("fadeIn"),
|
|
|
+ // d(),
|
|
|
+ // t.which !== f.SPACE && a()),
|
|
|
+ // i && n && s()
|
|
|
}
|
|
|
}
|
|
|
function d() {
|
|
|
@@ -14612,9 +14711,9 @@ window.Modernizr = function(n, e, t) {
|
|
|
var e = N.calcFullLoadingTime();
|
|
|
de.warn("Total load time: " + e / 1e3),
|
|
|
H.loadComplete(e),
|
|
|
+ window.dispatchEvent(window.evt);
|
|
|
de.warn("First render after model load finished.")
|
|
|
try {
|
|
|
- window.evt && window.dispatchEvent(window.evt);
|
|
|
parent.postMessage({
|
|
|
cmd: "loaded",
|
|
|
}, "*")
|
|
|
@@ -17090,7 +17189,14 @@ window.Modernizr = function(n, e, t) {
|
|
|
if (cameraMode === a.MESH) return
|
|
|
|
|
|
|
|
|
- if(window.isLocal)src = manage.dealURL(src)
|
|
|
+ if(window.isLocal){
|
|
|
+ src = manage.dealURL(src)
|
|
|
+ //本地文件莫名少了个"."
|
|
|
+ if(src[src.length-1]=='.'){
|
|
|
+ src = src.slice(0,-1)
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
else src = "one" === g_version ? g_Prefix + src + "?" + randomTime().getTime() : src + "?" + randomTime().getTime()
|
|
|
|
|
|
var l = {
|
|
|
@@ -18969,7 +19075,6 @@ window.Modernizr = function(n, e, t) {
|
|
|
}
|
|
|
t[this.id] || (t[this.id] = !0,
|
|
|
this.on(f.LoadComplete, function(e, t) {
|
|
|
- //console.warn('点位下载完成 ', 'id:'+this.id, 'count:'+t )
|
|
|
var i = this.getWaitDeferred(e).deferred;
|
|
|
i && "pending" === i.state() && this.highestPartialTileRenderOpCompleted >= e && (i.resolve(e, t),
|
|
|
this.resetWaitDeferred(e))
|
|
|
@@ -18982,9 +19087,6 @@ window.Modernizr = function(n, e, t) {
|
|
|
}
|
|
|
.bind(this)),
|
|
|
this.on(f.TileLoaded, function(t, i, n) {
|
|
|
- //console.log('tileLoaded', 'id:'+this.id, 'size:'+t, 'index:'+i )
|
|
|
-
|
|
|
-
|
|
|
var r = this.getWaitDeferred(t).deferred;
|
|
|
if (r && "pending" === r.state()) {
|
|
|
r.notify(t, i, n);
|
|
|
@@ -19768,7 +19870,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
n.prototype.getHeroIndexFromPanoId = function(e) {
|
|
|
for (var t = 0; t < this.model.heroLocations.length; t++) {
|
|
|
var i = this.model.heroLocations[t]
|
|
|
- , n = this.getHeroId(i);
|
|
|
+ , n = this.getHeroId(i);
|
|
|
if (n && n === e)
|
|
|
return t
|
|
|
}
|
|
|
@@ -20245,7 +20347,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
, o = new r.Vector3;
|
|
|
y.debug("Starting wait: " + (void 0 !== t));
|
|
|
|
|
|
- var currentLocation = this.model.getHeroDescriptorByIndex(this.director.currentItem)//this.model.heroLocations[this.director.currentItem[0]]
|
|
|
+ var currentLocation = this.model.heroLocations[this.director.currentItem[0]]
|
|
|
var s = currentLocation.dontRot || this.calcBurnsAmount(e)
|
|
|
, h = function() {
|
|
|
this.endWarpState(),
|
|
|
@@ -22074,7 +22176,9 @@ window.Modernizr = function(n, e, t) {
|
|
|
}
|
|
|
|
|
|
if(e.cameraChanged){
|
|
|
- this.mode == "panorama" && window.cad && cad.setSign && cad.setSign({ x: this.position.x, y: this.position.z }, this.cameraControls.controls.panorama.lon);
|
|
|
+ this.mode == "panorama" && window.cad && cad.setSign({ x: this.position.x, y: this.position.z }, this.cameraControls.controls.panorama.lon);
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
if(e.cameraChanged2){ //变化要更大些
|
|
|
for(var i in this.model.hots){
|
|
|
@@ -22626,7 +22730,8 @@ window.Modernizr = function(n, e, t) {
|
|
|
for (var index in hots){
|
|
|
var visible;
|
|
|
if(this.mode != "panorama"){
|
|
|
- visible = true;
|
|
|
+ // visible = true;
|
|
|
+ visible = false; // 周恩光改 非全景模式下隐藏热点
|
|
|
}else{
|
|
|
//hots[index].mesh.material.depthTest = false;
|
|
|
visible = !hots[index].visiblePanos || hots[index].visiblePanos.indexOf(pano.id) > -1
|
|
|
@@ -22748,7 +22853,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
//---------before fly--------------- add
|
|
|
this.updateHotVisible(i); //更新热点显示
|
|
|
this.transitionPos({type:"beforeFlytopano", pano:i, dur:I})//add
|
|
|
- Hot.updateVisibles([this.currentPano, i])
|
|
|
+ //Hot.updateVisibles([this.currentPano, i]) // 周恩光 注释 只在fly完成时再显示热点
|
|
|
|
|
|
//地标变化
|
|
|
if(this.model.floorLogos){
|
|
|
@@ -23014,7 +23119,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
}
|
|
|
,
|
|
|
n.prototype.flyDirection = function(e, t, i) {
|
|
|
- Hot.closePopup();//xzw add
|
|
|
+ Hot && Hot.closePopup();//xzw add
|
|
|
|
|
|
var n = $.Deferred();
|
|
|
this.history.invalidate();
|
|
|
@@ -23607,9 +23712,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
var defaultRotTime = DATA.tourRotTime * 1000
|
|
|
var timeEachItem = 2e3 / (DATA.tourWalkSpeed + DATA.tourBlackSpeed) * 200 //预估时间假设每个item飞的时间(如果距离远就少了)
|
|
|
|
|
|
- //var currentLocation = this.model.heroLocations[this.director.currentItem[0]]
|
|
|
- var currentLocation = this.model.getHeroDescriptorByIndex(this.director.currentItem)
|
|
|
-
|
|
|
+ var currentLocation = this.model.heroLocations[this.director.currentItem[0]]
|
|
|
var rotTime
|
|
|
if(currentLocation.rotTime == void 0 || currentLocation.rotTime == ''){
|
|
|
var restChildCount = currentLocation.heroLocations ? (currentLocation.heroLocations.length-this.director.currentItem[1]-1) : 0
|
|
|
@@ -23942,11 +24045,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
, s = new a(i);
|
|
|
n.prototype.start = function() {
|
|
|
this.loadNextPano(function(e) {
|
|
|
- e ? this.start() : (s.debug("No suitable pano loaded, waiting a little while before looking again"),
|
|
|
- setTimeout(function() {
|
|
|
- this.start()
|
|
|
- }
|
|
|
- .bind(this), 1e3))
|
|
|
+ e ? this.start() : (s.debug("No suitable pano loaded, waiting a little while before looking again"))
|
|
|
}
|
|
|
.bind(this))
|
|
|
}
|
|
|
@@ -27432,6 +27531,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
}
|
|
|
,
|
|
|
l.prototype.clearUploadQueue = function(e, t, i) {
|
|
|
+ if(!r || !r.tile) return
|
|
|
void 0 !== t && null !== t || (t = 0);
|
|
|
for (var n = 0; n < e.length; ) {
|
|
|
var r = e[n];
|
|
|
@@ -27494,10 +27594,6 @@ window.Modernizr = function(n, e, t) {
|
|
|
var e = {}
|
|
|
, t = (new h.Vector4,
|
|
|
d.tiling.overlayStyle);
|
|
|
-
|
|
|
- //var failHistory = {};
|
|
|
-
|
|
|
-
|
|
|
return function(i, n) {
|
|
|
var r = i.panoId
|
|
|
, o = i.image
|
|
|
@@ -27525,14 +27621,6 @@ window.Modernizr = function(n, e, t) {
|
|
|
this.isTileUploaded(i) && (p = !1,
|
|
|
g = !1)),
|
|
|
p) {
|
|
|
-
|
|
|
- /* if(failHistory[''+r+s+l]){
|
|
|
- console.log('uploadTile retry', r, s, l)
|
|
|
- }
|
|
|
-
|
|
|
- console.log('uploadTile 成功', r, s, l)
|
|
|
- */
|
|
|
-
|
|
|
var C = u * a
|
|
|
, I = d * a
|
|
|
, E = a / s * y
|
|
|
@@ -27552,12 +27640,8 @@ window.Modernizr = function(n, e, t) {
|
|
|
m.uploadCount === c && this.emit(f.PanoRenderComplete, r, s, c),
|
|
|
this.setUploaded(i, !0),
|
|
|
this.addCoverageForNode(i.node)
|
|
|
- } else{
|
|
|
+ } else
|
|
|
this.setUploaded(i, !1);
|
|
|
- console.log('uploadTile 失败', r, s, l)
|
|
|
- //failHistory[''+r+s+l] = true;
|
|
|
-
|
|
|
- }
|
|
|
return i.uploadAttempted || (m.uploadAttempts++,
|
|
|
this.emit(f.TileUploadAttempted, r, s, l, c)),
|
|
|
i.uploadAttempted = !0,
|
|
|
@@ -30067,6 +30151,9 @@ window.Modernizr = function(n, e, t) {
|
|
|
return r("PATCH", e, t)
|
|
|
},
|
|
|
getImage: function(e, t) {
|
|
|
+ if(!e){
|
|
|
+ return
|
|
|
+ }
|
|
|
function i() {
|
|
|
u.warn("Retrying ", e),
|
|
|
o.getImage(e, t - 1).done(n.resolve.bind(n)).progress(n.notify.bind(n)).fail(n.reject.bind(n))
|
|
|
@@ -31390,6 +31477,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
, a = {};
|
|
|
t.exports = {
|
|
|
load: function(e, t, i) {
|
|
|
+ if(!e) return;
|
|
|
var s = a[e];
|
|
|
return s ? (t && setTimeout(function() {
|
|
|
t(s)
|
|
|
@@ -58280,7 +58368,7 @@ var addMagnifier = function(){
|
|
|
}))
|
|
|
this.overlayMesh = new THREE.Mesh(circleGeo, new THREE.MeshBasicMaterial({
|
|
|
side: THREE.DoubleSide ,
|
|
|
- map: Texture.load('static/images/crosshair.png') ,
|
|
|
+ map: Texture.load('images/crosshair.png') ,
|
|
|
transparent:true,
|
|
|
depthTest: !1,
|
|
|
depthWrite: !1,
|
zhouenguang
