2 Комити cd132cf171 ... aecccc3eec

Аутор SHA1 Порука Датум
  xzw aecccc3eec fix: 1 пре 1 месец
  xzw bb5254f462 fix: path play bug пре 1 месец
3 измењених фајлова са 17 додато и 10 уклоњено
  1. 10 5
      public/lib/potree/potree.js
  2. 1 1
      public/lib/potree/potree.js.map
  3. 6 4
      src/sdk/cover/index.js

+ 10 - 5
public/lib/potree/potree.js

@@ -23609,11 +23609,11 @@
 	          pointcloud.matrixAutoUpdate = true;
 	          pointcloud.matrixAutoUpdate = true;
 	          if (pointcloud.hasLonLat) {
 	          if (pointcloud.hasLonLat) {
 	            pointcloud.matrix.decompose(pointcloud.position, pointcloud.quaternion, pointcloud.scale); //将数据集的经纬度和旋转应用到rotation和position (注意position和translateUser并不一样)
 	            pointcloud.matrix.decompose(pointcloud.position, pointcloud.quaternion, pointcloud.scale); //将数据集的经纬度和旋转应用到rotation和position (注意position和translateUser并不一样)
-	          } else if (!prop.isFirstLoad) {
-	            //点云一般加载后position都不是0, 但后台初始化为0所以先归零要不然撤销后容易错
-	            pointcloud.position.set(0, 0, 0);
-	          }
+	          } /* else if(!prop.isFirstLoad){//点云一般加载后position都不是0, 但后台初始化为0所以先归零要不然撤销后容易错
+	               pointcloud.position.set(0,0,0)
+	            }  */ //不记得了  
 	        }
 	        }
+
 	        if (Potree.settings.mergeType2 && pointcloud.datasetData) {
 	        if (Potree.settings.mergeType2 && pointcloud.datasetData) {
 	          Potree.loadPanos(pointcloud.datasetData.id, data => {
 	          Potree.loadPanos(pointcloud.datasetData.id, data => {
 	            viewer.images360.addPanoData(data, pointcloud);
 	            viewer.images360.addPanoData(data, pointcloud);
@@ -73677,7 +73677,12 @@
 	    if (this.selected == model) this.selectModel(null);
 	    if (this.selected == model) this.selectModel(null);
 	    var dispose = e => {
 	    var dispose = e => {
 	      e.geometry && e.geometry.dispose();
 	      e.geometry && e.geometry.dispose();
-	      e.material && e.material.dispose();
+	      if (e.material) {
+	        var mats = e.material instanceof Array ? e.material : [e.material];
+	        mats.forEach(mat => {
+	          mat.dispose();
+	        });
+	      }
 	    };
 	    };
 	    model.skeletonHelper && model.add(model.skeletonHelper); //打包一起dispose
 	    model.skeletonHelper && model.add(model.skeletonHelper); //打包一起dispose
 	    (_model$titleLabel = model.titleLabel) === null || _model$titleLabel === void 0 ? void 0 : _model$titleLabel.dispose();
 	    (_model$titleLabel = model.titleLabel) === null || _model$titleLabel === void 0 ? void 0 : _model$titleLabel.dispose();

Разлика између датотеке није приказан због своје велике величине
+ 1 - 1
public/lib/potree/potree.js.map


+ 6 - 4
src/sdk/cover/index.js

@@ -993,12 +993,14 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                     return new THREE.Euler(Math.PI / 2, 0, 0)
                     return new THREE.Euler(Math.PI / 2, 0, 0)
                 } else return new THREE.Euler(0, 0, 0)
                 } else return new THREE.Euler(0, 0, 0)
             }
             }
-            let getDefaultRotation = () => { 
+            let getDefaultRotation = (type) => { 
+                let rotation 
                 if(model.lonLatRot){ 
                 if(model.lonLatRot){ 
-                    return model.lonLatRot
+                    rotation = model.lonLatRot
                 }else{
                 }else{
-                    return getBaseRotation() 
+                    rotation = getBaseRotation() 
                 } 
                 } 
+                return type == 'getEuler' ? rotation : rotation.toObject() //给前端用
             }
             }
             
             
             if (props.rotation) {
             if (props.rotation) {
@@ -2121,7 +2123,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                   
                   
                     if(Potree.settings.pathSmooth){  
                     if(Potree.settings.pathSmooth){  
                         let curve = path.curve.clone(); 
                         let curve = path.curve.clone(); 
-                            curve.points.forEach(e=>e.z += 2)
+                            curve.points.forEach(e=>{e.add(path.edge.position), e.z += 2})
                             
                             
                         if(path.reverse) curve.points.reverse()      
                         if(path.reverse) curve.points.reverse()