Procházet zdrojové kódy

fix: 全景模型显示

xzw před 7 měsíci
rodič
revize
88bb5c1a01

+ 13 - 18
public/lib/potree/potree.js

@@ -4655,6 +4655,9 @@
 	          func,
 	          delayTime
 	        };
+	        /* if(name == 'processPriorityQueue'){
+	            console.log('isWaiting', delayTime)
+	        } */
 	        this.list.push(item);
 	        setTimeout(() => {
 	          var a = this.list.indexOf(item);
@@ -42709,14 +42712,8 @@
 	      this.titleLabel.updatePose();
 	    }
 	  }
-
-	  /* let lastIndex = this.points.length - 1
-	  if(add == -1) return (index === 0) ? lastIndex : index - 1;
-	  else if(add == 1)  return (index + 1 > lastIndex) ? 0 : index + 1; 
-	  }
-	     */
 	  getPosByIntersect(e, type) {
-	    //intersect落在线上的位置
+	    //intersect落在线上的位置,以及在哪两个点之间
 
 	    if (!Potree.settings.pathSmooth) {
 	      var prevIndex = Math.floor(e.hoveredElement.faceIndex / 2); //端点1(可能是最后一个)
@@ -42732,7 +42729,7 @@
 	      var prevIndex0 = Math.floor(e.hoveredElement.faceIndex / 2); //所在的mesh片段的端点1
 	      var nextIndex0 = prevIndex0 + 1; //所在的mesh片段的端点2
 
-	      var _point = math.getFootPoint(e.hoveredElement.point, this.geoPoints[prevIndex0], this.geoPoints[nextIndex0]);
+	      var _point = math.getFootPoint(e.hoveredElement.point, this.geoPoints[prevIndex0], this.geoPoints[nextIndex0]); //新点位置
 	      if (type == 'onlyPoint') return {
 	        point: _point
 	      };
@@ -42747,17 +42744,15 @@
 	        }
 	      }
 	      if (_nextIndex == void 0) {
-	        //最后一
+	        //最后一个点 
 	        _nextIndex = count - 1;
 	      }
-	      if (_prevIndex == _nextIndex) {
-	        //端点在相同区间。直接+1
-	        _nextIndex = _prevIndex + 1;
-	      } else {
+	      if (_prevIndex != _nextIndex) {
 	        //端点在不同points区间, 需要判断intersect的究竟在哪个区间
+
 	        //console.log('跨点', prevIndex, nextIndex)
 	        this.geoPoints[_prevIndex];
-	        var lengths = [];
+	        var lengths = []; //geo端点间包含points哪些点
 	        var j = _prevIndex;
 	        var A = this.geoPoints[prevIndex0];
 	        var B = this.geoPoints[nextIndex0];
@@ -42774,9 +42769,8 @@
 	        }
 	        searchIndex == void 0 && (searchIndex = _nextIndex); //最后一个点之后
 	        _prevIndex = searchIndex;
-	        _nextIndex = _prevIndex + 1;
 	      }
-
+	      _nextIndex = _prevIndex + 1;
 	      //console.log(prevIndex, nextIndex)
 	      var _index = _prevIndex + 1; //新点在端点1后
 	      return {
@@ -58292,7 +58286,7 @@
 	          if (Potree.settings.fastTran && viewer.images360.fastTranMaskPass.enabled) {
 	            viewer.images360.fastTranMaskPass.render();
 	          }
-	          return;
+	          if (viewer.objs.children.length == 0 || !params.useModelOnRT) return;
 	        }
 	      }
 	    }
@@ -84879,9 +84873,10 @@
 	          //多折线没有areaPlane 有时候会看向空白区域 - -
 	        }
 	      } else if (Potree.settings.displayMode == 'showPanos') {
+	        var _object$measureType;
 	        //全景 (比较难校准)
 	        var target2, _dir4;
-	        if (object.measureType.includes('MulDistance')) {
+	        if ((_object$measureType = object.measureType) !== null && _object$measureType !== void 0 && _object$measureType.includes('MulDistance')) {
 	          //因为该线不闭合,可能看向target的方向会没有线,所以换一个target
 	          target2 = object.points[Math.round(object.points.length / 2)]; //直接看向中间点
 	          _dir4 = new Vector3().subVectors(target2, position).normalize();

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1 - 1
public/lib/potree/potree.js.map


+ 1 - 1
src/sdk/cover/index.js

@@ -910,7 +910,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                 if (!props.isFirstLoad) {
                     model.visible = false//先不显示,防止卡顿
                 }
-                model.showInPano = props.raw.showInPano 
+                model.showInPano = /* !model.is4dkkModel// */props.raw.showInPano  //现在不用这个,所有模型都可见,非is4dkkModel的还显示原本的贴图
                 props.opacity < 100 && result.changeOpacity(props.opacity)
 
                 model.addEventListener('changeSelect', (e) => {