xzw 7 月之前
父节点
当前提交
f01eb71330
共有 2 个文件被更改,包括 9 次插入43 次删除
  1. 8 42
      public/lib/potree/potree.js
  2. 1 1
      public/lib/potree/potree.js.map

+ 8 - 42
public/lib/potree/potree.js

@@ -22104,20 +22104,21 @@
 	              if (prop.raw.orientation) {
 	                model.rotation.y = parseFloat(prop.raw.orientation);
 	              }
-	              if (model.is4dkkModel) {
+	              if (prop.is4dkkModel) {
 	                console.warn('遇到is4dkkModel的且有经纬度的mesh,但不是3dtiles! 位置估计不准', model);
+	                //看见的场景说是市场不会带rtk的。所以我们这边标品也没存rtk的坐标信息。和产品聊了,不处理。意思就是,只有激光场景开启了rtk的rtkLocation才有值
 	                /* if(model.panos?.length){//只能通过漫游点经纬度来校准 
 	                    //但这时候panos还没加载。。。。
 	                    let sceneCode = ...从url中解析
 	                    Potree.loadDatasets((data)=>{ //获取datasetId
 	                        let originDataset = data.find(e=>e.sceneCode == sceneCode);//只加载初始数据集  
-	                        Potree.loadPanos(originDataset.datasetId)
-	                     
+	                        Potree.loadPanos(originDataset.datasetId,()=>{
+	                            shouldPos = 获取坐标  data[0].location经纬度
+	                            model.position.add(new THREE.Vector3().subVectors(shouldPos, model.panos[0].position))
+	                        }) 
 	                  }, sceneCode, (e)=>{
-	                    console.log(e)
-	                  } , prop.prefix)
-	                    
-	                    
+	                            console.log(e)
+	                  } , prop.prefix) 
 	                } */
 	              }
 	            }
@@ -22229,12 +22230,6 @@
 	        if (prop.mode != 'single') {
 	          //如果不是模型展示页,模型会随着鼠标位置移动 
 	          modelEditing = model;
-	          /* if(model.fileType == '3dTiles'){
-	              setTimeout(()=>{
-	                  moveModel({pointer:{x:0,y:0}}) //3dTiles的移动会错乱,先默认放在当前视图中间吧 
-	                  confirmPos()
-	              },1)
-	          }else{ */
 	          if (!model.hasLonLat && moveModelWhenLoad) {
 	            viewer.addEventListener('global_mousemove', moveModel);
 	            viewer.addEventListener('global_click', confirmPos, {
@@ -22251,16 +22246,8 @@
 	    };
 	    if (prop.type == 'glb') {
 	      var callback = object => {
-	        //focusOnSelect(object, 1000)  
 	        object.isModel = true;
-	        //object.dataset_id = Date.now() //暂时
-
 	        object.traverse(e => e.material && (e.material.transparent = true));
-
-	        /* object.addEventListener('click',(e)=>{
-	            //只是为了能得到hoverElement识别才加这个侦听
-	        }) */
-
 	        loadDone(object);
 	      };
 	      var info = {
@@ -22269,11 +22256,6 @@
 	        unlit: prop.unlit,
 	        url: prop.url,
 	        name: prop.title
-	        /* transform : { 
-	            position : prop.position,
-	            rotation : new THREE.Euler().setFromVector3(prop.rotation), 
-	            scale: new THREE.Vector3(prop.scale,prop.scale,prop.scale),        
-	        }  */
 	      };
 	      viewer.loadModel(info, callback, onProgress, onError);
 	    } else if (prop.type == 'osgb' || prop.type == 'b3dm') {
@@ -22281,9 +22263,6 @@
 
 	      var _callback = object => {
 	        object.isModel = true;
-	        //透明度怎么办
-	        //object.traverse(e=>e.material && (e.material.transparent = true))
-
 	        loadDone(object);
 	      };
 	      viewer.loadModel({
@@ -22291,17 +22270,6 @@
 	        id: prop.id,
 	        name: prop.title,
 	        maximumScreenSpaceError: prop.maximumScreenSpaceError,
-	        /* tilesUrl: 'https://4dkk.4dage.com/scene_view_data/SS-Ds19qsmuFA/images/3dtiles/tileset.json',
-	        transform : { 
-	            rotation : [Math.PI/2,  0,   0],
-	            position : [0,0,0]  
-	        }  
-	            tilesUrl: 'https://testgis.4dage.com/LVBADUI_qp/tileset.json',
-	        transform : { 
-	            rotation : [0,  0,   0],
-	            position : [0,0,0]  
-	        }  */
-
 	        url: prop.url
 	      }, _callback, onprogress);
 	    } else if (prop.type == 'shp') {
@@ -22315,8 +22283,6 @@
 	        name: prop.title,
 	        url: prop.url
 	      }, _callback2, onprogress);
-
-	      //shpModel.position.set(-330000, 900000,10)//尽量移动到原点。原位置在江门那
 	    } else if (prop.type == '3dgs') {
 	      var _callback3 = object => {
 	        object.isModel = true;

文件差异内容过多而无法显示
+ 1 - 1
public/lib/potree/potree.js.map