|
@@ -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();
|