|
@@ -22027,7 +22027,7 @@
|
|
/* if(!originDataset){
|
|
/* if(!originDataset){
|
|
//应该是data为空,原因未知
|
|
//应该是data为空,原因未知
|
|
} */
|
|
} */
|
|
-
|
|
|
|
|
|
+ Potree.settings.cloudAddMapping && (prefix2 += '/' + originDataset.mapping);
|
|
var timeStamp = originDataset.updateTime ? originDataset.updateTime.replace(/[^0-9]/ig, '') : ''; //每重算一次后缀随updateTime更新一次
|
|
var timeStamp = originDataset.updateTime ? originDataset.updateTime.replace(/[^0-9]/ig, '') : ''; //每重算一次后缀随updateTime更新一次
|
|
//let cloudPath = `${Potree.settings.urls.prefix1}/${Potree.settings.webSite}/${sceneCode}/data/${sceneCode}/webcloud/cloud.js`
|
|
//let cloudPath = `${Potree.settings.urls.prefix1}/${Potree.settings.webSite}/${sceneCode}/data/${sceneCode}/webcloud/cloud.js`
|
|
var cloudPath = "".concat(prefix2, "/").concat(originDataset.webBin); //webBin添加原因:每次裁剪之类的操作会换路径,因为oss文件缓存太严重,更新慢
|
|
var cloudPath = "".concat(prefix2, "/").concat(originDataset.webBin); //webBin添加原因:每次裁剪之类的操作会换路径,因为oss文件缓存太严重,更新慢
|
|
@@ -23784,13 +23784,15 @@
|
|
var data = {};
|
|
var data = {};
|
|
data.id = e.id;
|
|
data.id = e.id;
|
|
data.globalLocation = Potree.Utils.VectorFactory.fromArray3(e.location);
|
|
data.globalLocation = Potree.Utils.VectorFactory.fromArray3(e.location);
|
|
- data.orientation = Potree.Utils.QuaternionFactory.fromArray(e.orientation);
|
|
|
|
|
|
+ data.orientation = Potree.Utils.QuaternionFactory.fromArray(e.orientation); //数据集支持其他方向旋转后不用这个了
|
|
|
|
+
|
|
var pointcloud = viewer.scene.pointclouds.find(p => p.dataset_id == e.datasetId);
|
|
var pointcloud = viewer.scene.pointclouds.find(p => p.dataset_id == e.datasetId);
|
|
if (pointcloud.datasetData.mapping) {
|
|
if (pointcloud.datasetData.mapping) {
|
|
data.filePath = "".concat(Potree.settings.urls.prefix1, "/").concat(pointcloud.datasetData.mapping).concat(e.file_path);
|
|
data.filePath = "".concat(Potree.settings.urls.prefix1, "/").concat(pointcloud.datasetData.mapping).concat(e.file_path);
|
|
} else {
|
|
} else {
|
|
data.filePath = "".concat(Potree.settings.urls.prefix1).concat(e.file_path);
|
|
data.filePath = "".concat(Potree.settings.urls.prefix1).concat(e.file_path);
|
|
}
|
|
}
|
|
|
|
+ this.pointcloud = pointcloud;
|
|
data.fileName = '$DEPTH/$X/$Y.png';
|
|
data.fileName = '$DEPTH/$X/$Y.png';
|
|
data.type = e.type, data.mapSizeM = e.map_size_m, data.tileSizePx = e.tile_size_px, data.maxDepth = e.max_depth, data.quadtree = e.quadtree, data.floorId = e.floor_id, data.bundleId = e.bundle_id;
|
|
data.type = e.type, data.mapSizeM = e.map_size_m, data.tileSizePx = e.tile_size_px, data.maxDepth = e.max_depth, data.quadtree = e.quadtree, data.floorId = e.floor_id, data.bundleId = e.bundle_id;
|
|
//this.computeLocalCoordinates()
|
|
//this.computeLocalCoordinates()
|
|
@@ -23816,13 +23818,10 @@
|
|
}
|
|
}
|
|
get position() {
|
|
get position() {
|
|
return this.tiledMapEntity.location;
|
|
return this.tiledMapEntity.location;
|
|
- /* enumerable: !0,
|
|
|
|
- configurable: !0 */
|
|
|
|
}
|
|
}
|
|
get quaternion() {
|
|
get quaternion() {
|
|
- return this.tiledMapEntity.orientation;
|
|
|
|
- /* enumerable: !0,
|
|
|
|
- configurable: !0 */
|
|
|
|
|
|
+ //return this.tiledMapEntity.orientation//数据集支持其他方向旋转后不用这个了
|
|
|
|
+ return typeof this.pointcloud.orientationUser == 'number' ? this.tiledMapEntity.orientation : this.pointcloud.orientationUser.clone();
|
|
}
|
|
}
|
|
getTileUrl(t, e, n) {
|
|
getTileUrl(t, e, n) {
|
|
var i = (this.tiledMapEntity.filePath + "/" + this.tiledMapEntity.fileName).replace(/\$DEPTH/g, t.toString(10)).replace(/\$X/g, e.toString(10)).replace(/\$Y/g, n.toString(10));
|
|
var i = (this.tiledMapEntity.filePath + "/" + this.tiledMapEntity.fileName).replace(/\$DEPTH/g, t.toString(10)).replace(/\$X/g, e.toString(10)).replace(/\$Y/g, n.toString(10));
|