1

src/custom/modules/datasetAlignment/Alignment.js

@@ -223,7 +223,7 @@ var Alignment = {
         var vec2 = pointcloud.translateUser
         var angle = pointcloud.orientationUser
         var pos1Matrix = new THREE.Matrix4().setPosition(vec1);//先移动到点云本身应该在的初始位置（在4dkk里和其他应用中都是在这个位置的，也能和漫游点对应上）
-        var rotMatrix = new THREE.Matrix4().makeRotationAxis(new THREE.Vector3(0,0,1), angle)//再旋转 
+        var rotMatrix = new THREE.Matrix4().makeRotationAxis(new THREE.Vector3(0,1,0), angle)//再旋转 
         var pos2Matrix = new THREE.Matrix4().setPosition(vec2);//最后是平移
          
         var matrix = new THREE.Matrix4().multiplyMatrices(pos2Matrix, rotMatrix);

src/custom/start.js

@@ -265,7 +265,7 @@ export function start(dom, mapDom, number ){ //t-Zvd3w0m
                 locationLonLat = [locationLonLat.x,locationLonLat.y] 
             } */
             
-            var location = viewer.transform.lonlatToLocal.forward(locationLonLat)  //transform.inverse()
+            var location = dataset.location//viewer.transform.lonlatToLocal.forward(locationLonLat)  //transform.inverse()
             //初始化位置 
             
             /* 
@@ -295,7 +295,8 @@ export function start(dom, mapDom, number ){ //t-Zvd3w0m
         var originDataset =  data.find(e=>e.id == Potree.settings.originDatasetId)  
         
         {//拿初始数据集作为基准。它的位置是000
-            var locationLonLat = originDataset.location.slice(0,2)
+            var locationLonLat = [113.52166733502364,22.37048111402197]//originDataset.location.slice(0,2)
+            
             
             if(window.AMapWith84){//需要转换为高德的
                 locationLonLat = AMapWith84.wgs84ToAMap({x:locationLonLat[0], y:locationLonLat[1]})
@@ -365,12 +366,14 @@ export function start(dom, mapDom, number ){ //t-Zvd3w0m
         data.forEach((dataset,index)=>{  
             if(!ifReload){
                 var datasetCode = dataset.sceneCode || dataset.name //对应4dkk的场景码
-                if(Potree.settings.isLocal && dataset.mapping){
+                /* if(Potree.settings.isLocal && dataset.mapping){
                     var cloudPath = `${Potree.settings.urls.prefix1}/${dataset.mapping}/${dataset.webBin}`  //webBin添加原因：每次裁剪之类的操作会换路径，因为oss文件缓存太严重，更新慢
                 }else{
                     var cloudPath = `${Potree.settings.urls.prefix1}/${dataset.webBin}`  //webBin添加原因：每次裁剪之类的操作会换路径，因为oss文件缓存太严重，更新慢
-                }
-                //var cloudPath = `${Potree.scriptPath}/data/test/${dataset.name}/cloud.js` 
+                } */
+                var cloudPath = `${Potree.scriptPath}/data/test/${dataset.name}/cloud.js` 
+                
+                
                 
                 var timeStamp = dataset.updateTime ? dataset.updateTime.replace(/[^0-9]/ig,'') : '';  //每重算一次后缀随updateTime更新一次 
                 //console.warn(dataset.name, 'timeStamp', timeStamp)
@@ -447,15 +450,15 @@ export function start(dom, mapDom, number ){ //t-Zvd3w0m
     
     
     
-    number && Potree.loadDatasets(Potree.loadDatasetsCallback) 
-    /* 
-    //调试用，加载多个本地
-    Potree.loadDatasetsCallback([
+    //number && Potree.loadDatasets(Potree.loadDatasetsCallback) 
+     Potree.loadDatasetsCallback([
          {name:'webcloud_0',id:0, orientation:0, location:[0,0,0]},
          {name:'webcloud_1',id:1, orientation:0.047234761795199476, location:[-0.07925513345058573,-0.0010590072536559839,-2.403613132687564]},
          {name:'webcloud_2',id:2, orientation:-1.5299545647758208, location:[1.5603736310030292, -0.0009340812579088904, -2.4464530770974139]},
-          
-     ]) */
+         
+         
+     ])
+     
 
     window.testTransform = function(locationLonLat, location1, location2){
         proj4.defs("NAVVIS:test", "+proj=tmerc +ellps=WGS84 +lon_0=" + locationLonLat[0].toPrecision(15) + " +lat_0=" + locationLonLat[1].toPrecision(15));
@@ -1100,7 +1103,10 @@ export function mergeEditStart(dom){
  
  
  
- 
+setTimeout(()=>{
+    viewer.scene.pointclouds.forEach(e=>e.material.size = 0.05)
+},5000)
+