播放时到最近点

edit-backstage/js/overlay.js

@@ -3,24 +3,24 @@ MathLight.RADIANS_PER_DEGREE = Math.PI / 180;
 MathLight.DEGREES_PER_RADIAN = 180 / Math.PI;
 
 var filterAll = function filterAll(e, t) {
-    return e.filter(function (e) {
-  return t.every(function (t) {
-    return t(e);
-  });
-});
-} 
-var sortByScore = function (list, request, rank) {
-  var i = filterAll(list, request);
-  return 0 === i.length ? null : i = i.map(function (e) {
-    return {
-      item: e,
-      score: rank.reduce(function (t, i) {
-        return t + i(e);
-      }, 0)
-    };
-  }).sort(function (e, t) {
-    return t.score - e.score;
-  });
+    return e.filter(function(e) {
+        return t.every(function(t) {
+            return t(e);
+        });
+    });
+}
+var sortByScore = function(list, request, rank) {
+    var i = filterAll(list, request);
+    return 0 === i.length ? null : i = i.map(function(e) {
+        return {
+            item: e,
+            score: rank.reduce(function(t, i) {
+                return t + i(e);
+            }, 0)
+        };
+    }).sort(function(e, t) {
+        return t.score - e.score;
+    });
 };
 /* var cameraLight = {
     clampVFOV: function(fov, t, i, n) {
@@ -44,130 +44,138 @@ var sortByScore = function (list, request, rank) {
     }
 };
   */
- 
- 
- 
-var initOverlay = function(THREE){
-    var _planeGeometry = new THREE.PlaneGeometry(settings.overlay.width, settings.overlay.height,1,1)
-    var _boxGeometry = new THREE.BoxBufferGeometry(settings.overlay.width, settings.overlay.height, settings.overlay.depth )
-        //ie的mesh 加了polygonOffset也是会重叠。所以去掉前面的face：  （但是突然ie又播放不了videoTexture）
-        var newIndex = [..._boxGeometry.index.array]
-        newIndex.splice(4*6,6)
-        _boxGeometry.setIndex(new THREE.BufferAttribute(new Uint16Array(newIndex), 1))
-     
-
-    var _boxMat = new THREE.MeshBasicMaterial({//MeshStandardMaterial
-            color:"#eeeeee", 
-            transparent: !0 ,
-            opacity:0.8
-        })
-    
-    var overlayGroup = new THREE.Object3D;    player.model.add(overlayGroup);  overlayGroup.name = "overlayGroup"
-    player.overlayGroup = overlayGroup;
 
+var initOverlay = function(THREE) {
+    var _planeGeometry = new THREE.PlaneGeometry(settings.overlay.width,settings.overlay.height,1,1)
+    var _boxGeometry = new THREE.BoxBufferGeometry(settings.overlay.width,settings.overlay.height,settings.overlay.depth)
+    //ie的mesh 加了polygonOffset也是会重叠。所以去掉前面的face：  （但是突然ie又播放不了videoTexture）
+    var newIndex = [..._boxGeometry.index.array]
+    newIndex.splice(4 * 6, 6)
+    _boxGeometry.setIndex(new THREE.BufferAttribute(new Uint16Array(newIndex),1))
 
-    var Overlay = function(info){ 
-        THREE.Object3D.call(this); 
+    var _boxMat = new THREE.MeshBasicMaterial({
+        //MeshStandardMaterial
+        color: "#eeeeee",
+        transparent: !0,
+        opacity: 0.8
+    })
+
+    var overlayGroup = new THREE.Object3D;
+    player.model.add(overlayGroup);
+    overlayGroup.name = "overlayGroup"
+    player.overlayGroup = overlayGroup;
+
+    var Overlay = function(info) {
+        THREE.Object3D.call(this);
         this.sid = info.sid;
-        if(info.media)this.preDeal(info) 
+        if (info.media)
+            this.preDeal(info)
         this.build(info);
-        this.name = "overlay_"+this.sid;
+        this.name = "overlay_" + this.sid;
     }
     Overlay.prototype = Object.create(THREE.Object3D.prototype);
-    
-    Overlay.prototype.build = function(info){
-        
-        var plane = new THREE.Mesh(_planeGeometry, new THREE.MeshBasicMaterial({//MeshStandardMaterial
-            color:"#00c8af",
-            opacity:0.4,
+
+    Overlay.prototype.build = function(info) {
+
+        var plane = new THREE.Mesh(_planeGeometry,new THREE.MeshBasicMaterial({
+            //MeshStandardMaterial
+            color: "#00c8af",
+            opacity: 0.4,
             transparent: !0,
-            polygonOffset : true,//是否开启多边形偏移		//ie不开启时blank也不会闪烁
-            polygonOffsetFactor : -0.9,//多边形偏移因子
-            polygonOffsetUnits : -4.0,//多边形偏移单位  
-        }) )								
+            polygonOffset: true,
+            //是否开启多边形偏移		//ie不开启时blank也不会闪烁
+            polygonOffsetFactor: -0.9,
+            //多边形偏移因子
+            polygonOffsetUnits: -4.0,
+            //多边形偏移单位  
+        }))
         plane.renderOrder = 3
         this.add(plane);
         this.plane = plane;
-        if(info.hasBox){
-            this.addBox(true)  
-        }   
+        if (info.hasBox) {
+            this.addBox(true)
+        }
         overlayGroup.add(this);
-        
-        if(info.media){ 
-            if(info.media.includes('video')){
+
+        if (info.media) {
+            if (info.media.includes('video')) {
                 var video = $('<video controls="controls" loop autoplay x5-playsinline="" webkit-playsinline="true" playsinline="true" controlslist="nodownload"></video>')[0]
-                video.setAttribute("crossOrigin", 'Anonymous')//要在src设置好前解决跨域
-                $(video).on('contextmenu', function () { return false; });//禁止右键点击出
-                 
-                video.src = manage.dealURL(info.file)  ;
+                video.setAttribute("crossOrigin", 'Anonymous')
+                //要在src设置好前解决跨域
+                $(video).on('contextmenu', function() {
+                    return false;
+                });
+                //禁止右键点击出
+
+                video.src = manage.dealURL(info.file);
                 info.media = video;
                 info.type = "video"
-                
+
                 video.addEventListener('loadeddata', ()=>{
                     console.log(this.sid + " loaded!!!")
-                })
+                }
+                )
                 video.volume = 0
                 video.muted = true
-            }else if(info.media.includes('photo')){
+                plane.material.opacity = 1;
+            } else if (info.media.includes('photo')) {
                 /* var img = new Image();
                  
                 img.src = manage.dealURL(info.file) //"https://4dkk.4dage.com/images/images"+Config.projectNum+"/overlay"+this.sid+".jpg?m="+new Date().getTime()
                 info.media = img
                  */
-                
-                info.type = "photo"  
-                
+
+                info.type = "photo"
+                plane.material.opacity = 0.1;
             }
-            plane.material.opacity = 0.1;
-            plane.material.color = new THREE.Color(1,1,1) 
+
+            plane.material.color = new THREE.Color(1,1,1)
         }
-        if(info.width == void 0) info.width = settings.overlay.width;
-        if(info.height == void 0) info.height = settings.overlay.height;
-        this.setFromInfo(info) 
+        if (info.width == void 0)
+            info.width = settings.overlay.width;
+        if (info.height == void 0)
+            info.height = settings.overlay.height;
+        this.setFromInfo(info)
         this.fileSrc = info.file
-        
+
     }
-    
-     
-     
-    Overlay.prototype.setFromInfo = function(info){//1 恢复到编辑之前 2 初始加载 
-        var plane = this.plane; 
-        this.transformAtPanos = info.transformAtPanos || {} //在每个漫游点独立设置的position。  
-        var curPanoTransform = player.currentPano && this.transformAtPanos[player.currentPano.id] || {} 
-        
-        info.depth && this.scale.setZ(info.depth/settings.overlay.depth)
-        
-         
-        this.posCustom = info.pos ? info.pos.clone() : this.position.clone(); //没有单独设置position的漫游点使用的position
-        this.position.copy(curPanoTransform.pos || this.posCustom )
-        
+
+    Overlay.prototype.setFromInfo = function(info) {
+        //1 恢复到编辑之前 2 初始加载 
+        var plane = this.plane;
+        this.transformAtPanos = info.transformAtPanos || {}
+        //在每个漫游点独立设置的position。  
+        var curPanoTransform = player.currentPano && this.transformAtPanos[player.currentPano.id] || {}
+
+        info.depth && this.scale.setZ(info.depth / settings.overlay.depth)
+
+        this.posCustom = info.pos ? info.pos.clone() : this.position.clone();
+        //没有单独设置position的漫游点使用的position
+        this.position.copy(curPanoTransform.pos || this.posCustom)
+
         this.quaCustom = info.qua ? info.qua.clone() : this.quaternion.clone()
         this.quaternion.copy(curPanoTransform.qua || this.quaCustom);
-        
-        
-        this.widthCustom = info.width  
-        this.heightCustom = info.height  
+
+        this.widthCustom = info.width
+        this.heightCustom = info.height
         this.width = curPanoTransform.width || this.widthCustom
         this.height = curPanoTransform.height || this.heightCustom
         var a = this.getScaleBySize(this.width, this.height)
-        this.scale.setX( a.x )
-        this.scale.setY( a.y )
-        
-        
-        
-        
-        if(info.type){
-            if(!plane.material.map){
-                if(info.type == "video"){ 
-                    plane.material.map = new THREE.VideoTexture( info.media ); 
+        this.scale.setX(a.x)
+        this.scale.setY(a.y)
+
+        if (info.type) {
+            if (!plane.material.map) {
+                if (info.type == "video") {
+                    plane.material.map = new THREE.VideoTexture(info.media);
                     this.hasRequestLoad = true
-                    
+
                     plane.material.map.wrapS = plane.material.map.wrapT = THREE.ClampToEdgeWrapping;
                     plane.material.map.minFilter = THREE.LinearFilter;
                     plane.material.map.magFilter = THREE.LinearFilter;
-                    plane.material.map.generateMipmaps = true; 
-                    
-                }else{  
+                    plane.material.map.generateMipmaps = true;
+
+                } else {
                     this._loadDones = []
                     /* plane.material.map = Texture.load(info.file,()=>{
                         if(this._loadDones){
@@ -175,61 +183,62 @@ var initOverlay = function(THREE){
                             this._loadDones = null
                         }
                     })  */
-                } 
+                }
                 /* plane.material.map.wrapS = plane.material.map.wrapT = THREE.ClampToEdgeWrapping;
                 plane.material.map.minFilter = THREE.LinearFilter;
                 plane.material.map.magFilter = THREE.LinearFilter;
                 plane.material.map.generateMipmaps = true;  */
-            }else plane.material.map.image = info.media; 
+            } else
+                plane.material.map.image = info.media;
             this.file = info.file;
         }
         this.overlayType = info.type;
-         
-        if(!!this.hasBox != !!info.hasBox){
-            this.addBox(!this.hasBox); 
+
+        if (!!this.hasBox != !!info.hasBox) {
+            this.addBox(!this.hasBox);
         }
-        
+
         this.updateMatrixWorld()
         this.getVisiblePanos()
-        
-    } 
 
-    Overlay.prototype.addBox = function(state){
-        if(state == !!this.hasBox){ 
+    }
+
+    Overlay.prototype.addBox = function(state) {
+        if (state == !!this.hasBox) {
             return;
-        } 
-        if(state){
-            var box = new THREE.Mesh(_boxGeometry , _boxMat) 
-            box.position.set(0,0,settings.overlay.depth/2);
-            box.renderOrder = 3 
-            this.plane.position.set(0,0,settings.overlay.depth ); 
+        }
+        if (state) {
+            var box = new THREE.Mesh(_boxGeometry,_boxMat)
+            box.position.set(0, 0, settings.overlay.depth / 2);
+            box.renderOrder = 3
+            this.plane.position.set(0, 0, settings.overlay.depth);
             this.add(box);
-            this.box = box;   
-            
-        }else{
-            this.plane.position.set(0,0,0);
+            this.box = box;
+
+        } else {
+            this.plane.position.set(0, 0, 0);
             this.remove(this.box);
             this.box = null;
-        }  
+        }
         this.hasBox = state
     }
-    
-    Overlay.prototype.getSizeByScale = function(){ 
+
+    Overlay.prototype.getSizeByScale = function() {
         return {
-            width : settings.overlay.width * this.scale.x,
-            height : settings.overlay.height * this.scale.y
+            width: settings.overlay.width * this.scale.x,
+            height: settings.overlay.height * this.scale.y
         }
     }
-    Overlay.prototype.getScaleBySize = function(width, height){ 
+    Overlay.prototype.getScaleBySize = function(width, height) {
         return {
-            x : width / settings.overlay.width,
-            y : height / settings.overlay.height,
-        }  
-    } 
-    
-    Overlay.prototype.preDeal = function(info){
+            x: width / settings.overlay.width,
+            y: height / settings.overlay.height,
+        }
+    }
+
+    Overlay.prototype.preDeal = function(info) {
         info.pos = new THREE.Vector3().fromArray(info.pos)
-        info.qua = new THREE.Quaternion().fromArray(info.qua) 
+        info.qua = new THREE.Quaternion().fromArray(info.qua)
         info.width = parseFloat(info.width)
         info.height = parseFloat(info.height)
         info.depth = parseFloat(info.depth)
@@ -241,95 +250,95 @@ var initOverlay = function(THREE){
         info.qua.y = parseFloat(info.qua.y)
         info.qua.z = parseFloat(info.qua.z)
         info.qua.w = parseFloat(info.qua.w)
-        
-        if(!info.transformAtPanos)info.transformAtPanos = {}
-               
-        for(let i in info.transformAtPanos){
+
+        if (!info.transformAtPanos)
+            info.transformAtPanos = {}
+
+        for (let i in info.transformAtPanos) {
             info.transformAtPanos[i].pos = new THREE.Vector3().fromArray(info.transformAtPanos[i].pos)
             info.transformAtPanos[i].qua = new THREE.Quaternion().fromArray(info.transformAtPanos[i].qua)
-                
+
         }
-        
+
     }
-    
-    Overlay.prototype.getVisiblePanos = function(){ 
-        this.visiblePanos = getVisiblePano(this.plane.getWorldPosition(),{model: null});  
-        
+
+    Overlay.prototype.getVisiblePanos = function() {
+        this.visiblePanos = getVisiblePano(this.plane.getWorldPosition(), {
+            model: null
+        });
+
     }
-    Overlay.prototype.updateVisibles = function(panos){ 
+    
+    
+    Overlay.prototype.updateVisibles = function(panos) {
         this.visible = !!panos.find(pano=>this.visiblePanos.includes(pano))
-        if(!this.visible && this.overlayType == 'video') this.plane.material.map.image.pause()
-    }    
-    Overlay.updateVisibles = function(panos){
-        if(panos === true){
+        if (!this.visible && this.overlayType == 'video')
+            this.plane.material.map.image.pause()
+    }
+    
+    
+    Overlay.updateVisibles = function(panos) {
+        if (panos === true) {
             player.overlayGroup.children.forEach(e=>e.visible = true)
-        }else{
+        } else {
             player.overlayGroup.children.forEach(e=>e.updateVisibles(panos))
         }
     }
-    
-    
-    Overlay.prototype.addToLoadQueue = function(){
-        if(this.overlayType == 'photo'){ 
+
+    Overlay.prototype.addToLoadQueue = function() {
+        if (this.overlayType == 'photo') {
             Overlay.loadQueue.includes(this) || Overlay.loadQueue.push(this)
-              
+
         }
-    } 
-    Overlay.prototype.requestDownload = function(){
-        if(this.hasRequestLoad ||  this.overlayType != 'photo')return
-        
-        console.log('overlay requestDownload : '+this.sid)
-        var plane = this.plane; 
-        
-        plane.material.map = Texture.load(this.file,()=>{
+    }
+    
+    
+    Overlay.prototype.requestDownload = function() {
+        if (this.hasRequestLoad || this.overlayType != 'photo')
+            return
+
+        console.log('overlay beginDownload : ' + this.sid)
+        var plane = this.plane;
+
+        plane.material.map = Texture.load(this.file, ()=>{
             plane.material.needsUpdate = true
-            if(this._loadDones){
+            if (this._loadDones) {
                 this._loadDones.forEach(e=>e())
-                this._loadDones = null  
+                this._loadDones = null
             }
-            setTimeout(Overlay.loadNext,50)
+            setTimeout(Overlay.loadNext, 50)
             plane.material.opacity = 1;
-            console.log('overlay loaded: '+this.sid)
+            console.log('overlay loaded: ' + this.sid)
         })
         plane.material.map.wrapS = plane.material.map.wrapT = THREE.ClampToEdgeWrapping;
         plane.material.map.minFilter = THREE.LinearFilter;
         plane.material.map.magFilter = THREE.LinearFilter;
-        plane.material.map.generateMipmaps = true; 
-        
-         
+        plane.material.map.generateMipmaps = true;
+
         this.hasRequestLoad = true
     }
-    
-    
-    
-    
-    
- 
+
     Overlay.loadQueue = [];
-  
-    
-    Overlay.getNeedLoad = function(){ 
-        if(!player || !player.domElement || !player.mode)return;
-        
-        if(player.mode != 'panorama'){
-            if( !Overlay.loadWhenOutside) return;
-            /* var loadings = player.overlayGroup.children.filter(e=>e.hasRequestLoad && e._loadDones)//开始下载了但是没加载好的
-            
-            if(loadings.length==4){
-                Overlay.loadQueue = player.overlayGroup.children.filter(e=>!e.hasRequestLoad) .slice(0,5);
-            } */
-            
-            if(Overlay.loadQueue.length == 0){
-                Overlay.loadQueue = player.overlayGroup.children.filter(e=>!e.hasRequestLoad).slice(0,5);
+
+    Overlay.getNeedLoad = function() {
+        if (!player || !player.domElement || !player.mode)
+            return;
+
+        if (player.mode != 'panorama') {
+            if (!Overlay.loadWhenOutside)
+                return; 
+
+            if (Overlay.loadQueue.length == 0) {
+                Overlay.loadQueue = player.overlayGroup.children.filter(e=>!e.hasRequestLoad).slice(0, 5);
             }
-            
+
             return;
         }
         Overlay.loadWhenOutside = true
         var overlays = player.overlayGroup.children.filter(e=>!e.hasRequestLoad && e.visiblePanos.includes(player.currentPano))
         //var maxAngle = THREE.Math.degToRad( cameraLight.getHFOVFromVFOV(70, player.domElement.clientWidth, app.player.domElement.clientHeight) / 2);
         var cameraDir = player.getDirection()
-        
+
         /* var maxCount = 5; 
         if(overlays.length>maxCount){
             for(var i=0;i<overlays.length;i++){ 
@@ -345,52 +354,49 @@ var initOverlay = function(THREE){
                 Overlay.loadQueue.push()
             }
         }else{ */
-            Overlay.loadQueue = overlays
+        Overlay.loadQueue = overlays
         //} 
-        
-        
-      
-        var request = [(overlay)=>{ 
+
+        var request = [(overlay)=>{
             return true
-        }];
+        }
+        ];
         var rank = [(overlay)=>{
             var dis = overlay.plane.getWorldPosition().distanceTo(player.position);
             return -dis
-        },(overlay)=>{
-            var tagDir = overlay.plane.getWorldPosition().sub(player.position) 
+        }
+        , (overlay)=>{
+            var tagDir = overlay.plane.getWorldPosition().sub(player.position)
             var angle = tagDir.angleTo(cameraDir)
-            return -angle*20
-        }]
-        var result = sortByScore(Overlay.loadQueue, request,rank); 
-        Overlay.loadQueue = result ? result.slice(0,5).map(e=>e.item) : player.overlayGroup.children.filter(e=>!e.hasRequestLoad).slice(0,2);
-         
-      
+            return -angle * 20
+        }
+        ]
+        var result = sortByScore(Overlay.loadQueue, request, rank);
+        Overlay.loadQueue = result ? result.slice(0, 5).map(e=>e.item) : player.overlayGroup.children.filter(e=>!e.hasRequestLoad).slice(0, 2);
+
     }
-    
+
     Overlay.maxLoadingCount = 3;
     Overlay.loadNext = ()=>{
-        
+
         var loadings = player.overlayGroup.children.filter(e=>e.hasRequestLoad && e._loadDones)//开始下载了但是没加载好的
-        Overlay.loadQueue.slice(0,Overlay.maxLoadingCount-loadings.length).forEach(e=>e.requestDownload())
-        Overlay.loadQueue.splice(0,Overlay.maxLoadingCount-loadings.length)
-    } 
-    
-    
+        
+        Overlay.loadQueue.slice(0, Overlay.maxLoadingCount - loadings.length).forEach(e=>e.requestDownload())
+        Overlay.loadQueue.splice(0, Overlay.maxLoadingCount - loadings.length)
+    }
+
     Overlay.load = ()=>{
-        Overlay.getNeedLoad()
-        //Overlay.loadQueue.slice(0,2).forEach(e=>e.requestDownload())
-        Overlay.loadNext() 
-        var unloads = player.overlayGroup.children.filter(e=>!e.hasRequestLoad) 
-        if(unloads.length){ 
+        Overlay.getNeedLoad() 
+        Overlay.loadNext()
+        var unloads = player.overlayGroup.children.filter(e=>!e.hasRequestLoad)
+        if (unloads.length) {
             setTimeout(Overlay.load, 200)
-        }else{
+        } else {
             Overlay.allRequestLoad = true
             console.log('allRequestLoad')
         }
     }
-  
-    
-    
+
     window.Overlay = Overlay;
-    
-} 
+
+}

web/public/static/js/main_2020_show.js

@@ -4965,8 +4965,40 @@ window.Modernizr = function(n, e, t) {
                     .bind(this), this.goNext.bind(this))
             }
             ,
+            
+            
+            
+            n.prototype.findNearestItem = function(){//找到离currentPano最近的导览
+                var result = {item:[0,0], dis:Infinity};
+                var compare = (location, item)=>{
+                    if(location.panoId != void 0){
+                        var pano = this.model.panos.index[location.panoId];
+                        var dis = pano.position.distanceTo(this.player.currentPano.position)
+                        if(dis<result.dis){
+                            result.item = item, result.dis = dis
+                        }
+                    }
+                    
+                }
+                this.model.heroLocations.forEach((e,i)=>{
+                    if(e.heroLocations){
+                       /* e.heroLocations.forEach((a,j)=>{
+                           compare(a, [i,j])
+                       }) */
+                       var location = e.heroLocations.find(e=>e.panoId != void 0)
+                       location && compare(location, [i,0])
+                       
+                    }else{
+                       compare(e, [i,0])
+                    }  
+                    
+                })
+                return result.item
+                
+            }
+            
             n.prototype.playTour = function() {
-                if (!this.bounceable())
+                if (!this.bounceable()){
                     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",
@@ -4977,8 +5009,14 @@ window.Modernizr = function(n, e, t) {
                     this.emit("update.controls"),
                     this.emit(p.TourStart),
                     this.player.enablePreRendering(),
-                    this.walkingSectionPaused ? (this.clearWalkingSectionPaused(),
-                    this.goToDestination()) : this.goNext()))
+                    /* this.walkingSectionPaused ? (this.clearWalkingSectionPaused(),
+                    this.goToDestination()) : this.goNext())) */
+                    
+                    
+                    this.setDestinationItem(this.findNearestItem()) , this.goToDestination()) )
+                    
+                    
+                }
             } 
 			,
 			n.prototype.bgmReplay = function() {//xzw add  结束tour后可能要继续播放背景音乐
@@ -5012,7 +5050,9 @@ window.Modernizr = function(n, e, t) {
                 this.emit("update.controls"),
                 this.emit(p.TourEnd)
             }
+            
             ,
+            
             n.prototype.goToHighlight = function(e) {
                 
                 /* if (this.wouldInterrupt())