|
@@ -437,10 +437,12 @@
|
|
|
|
|
|
urls:{
|
|
|
//localTextures:'../resources/textures/',
|
|
|
- prefix: 'https://laser-oss.4dkankan.com',//oss
|
|
|
+ prefix1: 'https://laser-oss.4dkankan.com',//oss
|
|
|
prefix2: 'https://testlaser.4dkankan.com',
|
|
|
prefix3: 'https://4dkk.4dage.com',
|
|
|
- prefix4: 'https://uat-laser.4dkankan.com/',//test.4dkankan
|
|
|
+ prefix4: 'https://uat-laser.4dkankan.com',//test.4dkankan
|
|
|
+ prefix5: 'https://laser.4dkankan.com',
|
|
|
+ prefix6: 'https://mix3d.4dkankan.com/backend',
|
|
|
|
|
|
},
|
|
|
|
|
@@ -780,7 +782,9 @@
|
|
|
rotAroundPoint:true,//点云模式是否能绕intersectPoint旋转
|
|
|
tourTestCameraMove:false, //测试镜头时,不移动真实的镜头, 只移动frustum
|
|
|
cameraAniSmoothRatio : 20, //镜头动画平滑系数,越高越平滑
|
|
|
- urls : $.extend({}, config$1.urls),
|
|
|
+ urls : $.extend({}, config$1.urls, {
|
|
|
+ prefix : config$1.urls.prefix4 //主要使用的 是测试环境,根据不同工程更改
|
|
|
+ }),
|
|
|
|
|
|
|
|
|
useDepthTex: true,//使用深度贴图,但不代表一定有(得到的intersect更快速准确和稳定) SS-t-7DUfWAUZ3V
|
|
@@ -63457,7 +63461,7 @@ void main() {
|
|
|
data.forEach((dataset,index)=>{
|
|
|
if(!ifReload){
|
|
|
var datasetCode = dataset.sceneCode || dataset.name; //对应4dkk的场景码
|
|
|
- var cloudPath = `${Potree.settings.urls.prefix}/${Potree.settings.webSite}/${datasetCode}/data/${datasetCode}/webcloud/cloud.js`;
|
|
|
+ var cloudPath = `${Potree.settings.urls.prefix1}/${Potree.settings.webSite}/${datasetCode}/data/${datasetCode}/webcloud/cloud.js`;
|
|
|
var timeStamp = dataset.createTime ? dataset.createTime.replace(/[^0-9]/ig,'') : ''; //每重算一次后缀随createTime更新一次
|
|
|
//console.warn(dataset.name, 'timeStamp', timeStamp)
|
|
|
Potree.loadPointCloud(cloudPath, dataset.name ,datasetCode, timeStamp, e => {
|
|
@@ -63811,7 +63815,7 @@ void main() {
|
|
|
Potree.loadDatasets((data)=>{
|
|
|
let originDataset = data.find(e=>e.sceneCode == sceneCode);//只加载初始数据集
|
|
|
let timeStamp = originDataset.createTime ? originDataset.createTime.replace(/[^0-9]/ig,'') : ''; //每重算一次后缀随createTime更新一次
|
|
|
- let cloudPath = `${Potree.settings.urls.prefix}/${Potree.settings.webSite}/${sceneCode}/data/${sceneCode}/webcloud/cloud.js`;
|
|
|
+ let cloudPath = `${Potree.settings.urls.prefix1}/${Potree.settings.webSite}/${sceneCode}/data/${sceneCode}/webcloud/cloud.js`;
|
|
|
loadCloud(cloudPath, originDataset.sceneName, sceneCode, timeStamp, originDataset.color);
|
|
|
}, sceneCode, onError);
|
|
|
|
|
@@ -131683,6 +131687,7 @@ ENDSEC
|
|
|
|
|
|
async function loadFile(path, callback, onError){
|
|
|
if(Potree.fileServer){
|
|
|
+
|
|
|
Potree.fileServer.get(path).then(data=>{
|
|
|
if(data.data)data = data.data;
|
|
|
if(data.data)data = data.data; //融合页面getdataset需要查找两次data
|
|
@@ -131714,7 +131719,7 @@ ENDSEC
|
|
|
|
|
|
//path = `${Potree.settings.urls.prefix2}/indoor/${Potree.settings.number}/api/datasets`
|
|
|
//现在只能加载得了本地的了
|
|
|
- path = `${Potree.settings.urls.prefix4}laser/dataset/${sceneCode}/getDataSet`;
|
|
|
+ path = `${Potree.settings.urls.prefix}/laser/dataset/${sceneCode}/getDataSet`;
|
|
|
//path = `${Potree.scriptPath}/data/${sceneCode}/getDataSet.json`
|
|
|
|
|
|
}
|
|
@@ -131775,7 +131780,7 @@ ENDSEC
|
|
|
}else {
|
|
|
//path = `${Potree.settings.urls.prefix2}/indoor/${Potree.settings.number}/api/images/filter` + query
|
|
|
//path = `${Potree.scriptPath}/data/${Potree.settings.number}/panos-${datasetId}.json`
|
|
|
- path = `${Potree.settings.urls.prefix4}laser/filter/${Potree.settings.number}/query` + query;
|
|
|
+ path = `${Potree.settings.urls.prefix}/laser/filter/${Potree.settings.number}/query` + query;
|
|
|
|
|
|
|
|
|
}
|