xzw 2 лет назад
Родитель
Сommit
8a99905585
4 измененных файлов с 263 добавлено и 169 удалено
  1. 4 27
      index.html
  2. 2 1
      js/Hot.js
  3. 235 126
      js/main_2020_show.js
  4. 22 15
      js/manage.js

+ 4 - 27
index.html

@@ -793,33 +793,10 @@
     <script>
      
         var changeLog = ()=>{
-             
-            if((number == "TEST" || browser.valueFromHash('TEST')) && browser.isMobile()){
-            
-                
-                /*var t = $("<textarea id='consoleLog'></textarea>")
-                      $('body').append(t);
-                      
-                
-                    var exchange = function (o) {
-                    console["old" + o] = console[o];
-                    console[o] = function () {
-                      var args =   Array.from(arguments)
-                      console["old" + o].apply(this, arguments)
-                      //var t = document.getElementById("consoleLog").innerHTML;
-                      
-                      var str = ''
-                      args.forEach(a=>{
-                          str += a + ' '
-                      })
-                      document.getElementById("consoleLog").innerHTML = str + "\n\n" + t;
-                    }
-                  }
-               */
-                }
-                
-             let logLevel = 1  
-             if((number == "TEST" || browser.valueFromHash('test')) && browser.isMobile()){
+
+            let logLevel = 1
+        
+           if((number == "TEST" || browser.valueFromHash('test')) && browser.isMobile()){
                 var textarea = document.createElement('textarea');
                   textarea.id = "consoleLog";
 

+ 2 - 1
js/Hot.js

@@ -1415,11 +1415,12 @@ window.initHot = function(model){
         setMesh(mesh){
             this.mesh = mesh
             this.add(this.mesh);  
-            this.mesh.renderOrder = 3  
+            
             this.changeMaterial(this.material_) //re applyTo every mesh
             
             this.mesh.traverse((mesh)=>{
                 mesh.type = "hotSprite"    //raycaster use
+                mesh.renderOrder = 3  
             })
             
             if(!this.mesh.boxHelper){ 

Разница между файлами не показана из-за своего большого размера
+ 235 - 126
js/main_2020_show.js


+ 22 - 15
js/manage.js

@@ -101,7 +101,7 @@ var settings = {
         },
         bigMobile:{ //width和height都超过一定值
             nav: '2k',
-            max: '2k',//'2k',
+            max: '4k',//'2k',
         },
         mobile:{
             nav: '1k',  //不放大时
@@ -583,21 +583,28 @@ window.browser = { //提前定义
 window.expandCommon = function(common){
     Object.assign(common,{
         intervalTool : {  //延时update,防止卡顿
-            list:[],
+            list:[], 
             
-            isWaiting:function(name, func, delayTime){
-                if(!this.list.includes(name)){  //如果没有该项, 则开始判断
-                    var needWait = func(); //触发了改变,则等待一段时间后再自动判断
-                    if(needWait){
-                        this.list.push(name);
-                        setTimeout(()=>{
-                            var a = this.list.indexOf(name);
-                            this.list.splice(a,1);
-                            this.isWaiting(name, func, delayTime) //循环
-                        },delayTime)
-                    } 
-                }
-            },
+            isWaiting:function(name, func, delayTime/* , autoCycle */){   
+	            let item = this.list.find(e=>e.name == name);
+	            if(!item){  //如果没有该项, 则加入循环
+	                let ifContinue = func(); 
+	                item = {name, func, delayTime}; 
+	                this.list.push(item);
+	                    setTimeout(()=>{ 
+	                        var a = this.list.indexOf(item);
+	                        this.list.splice(a,1);
+	                        let {func, delayTime} = item; 
+	                        if(item.requestUpdate || ifContinue )  this.isWaiting(name, func, delayTime); //循环
+	                    },delayTime);
+	                 
+	            }else {//如果有该项,说明现在请求下一次继续更新 
+                    //更新属性  
+                    item.func = func;
+                    item.delayTime = delayTime;
+                    item.requestUpdate = true;  
+	            }
+	        },
         },
         
         sortByScore : function(list, request, rank) {