|
@@ -73160,6 +73160,8 @@ void main()
|
|
visiMap.set(e,e.visible);
|
|
visiMap.set(e,e.visible);
|
|
e.visible = Potree.Utils.getObjVisiByReason(e, 'datasetSelection'); //先将隐藏的点云显示
|
|
e.visible = Potree.Utils.getObjVisiByReason(e, 'datasetSelection'); //先将隐藏的点云显示
|
|
if(!e.visible)return
|
|
if(!e.visible)return
|
|
|
|
+
|
|
|
|
+
|
|
size.set(e, e.temp.pointSize);
|
|
size.set(e, e.temp.pointSize);
|
|
sizeType = e.material.pointSizeType;
|
|
sizeType = e.material.pointSizeType;
|
|
e.material.pointSizeType = Potree.config.material.pointSizeType;
|
|
e.material.pointSizeType = Potree.config.material.pointSizeType;
|
|
@@ -73916,7 +73918,7 @@ void main()
|
|
priorityQueue.push({pointcloud: i, node: pointcloud.root, weight: Number.MAX_VALUE});
|
|
priorityQueue.push({pointcloud: i, node: pointcloud.root, weight: Number.MAX_VALUE});
|
|
} */
|
|
} */
|
|
|
|
|
|
- if (pointcloud.visible || !pointcloud.hasDepthTex && pointcloud.unvisibleReasons && pointcloud.unvisibleReasons.length == 1 && pointcloud.unvisibleReasons[0].reason == 'displayMode' && pointcloud.root !== null) {//改 visible ->
|
|
|
|
|
|
+ if (pointcloud.visible || /* !pointcloud.hasDepthTex && */ pointcloud.unvisibleReasons && pointcloud.unvisibleReasons.length == 1 && pointcloud.unvisibleReasons[0].reason == 'displayMode' && pointcloud.root !== null) {//改 visible ->
|
|
priorityQueue.push({pointcloud: i, node: pointcloud.root, weight: Number.MAX_VALUE});
|
|
priorityQueue.push({pointcloud: i, node: pointcloud.root, weight: Number.MAX_VALUE});
|
|
}else {
|
|
}else {
|
|
continue
|
|
continue
|
|
@@ -74014,7 +74016,7 @@ void main()
|
|
let pointcloudTransformVersion = Potree._pointcloudTransformVersion;
|
|
let pointcloudTransformVersion = Potree._pointcloudTransformVersion;
|
|
for(let pointcloud of pointclouds){
|
|
for(let pointcloud of pointclouds){
|
|
|
|
|
|
- if(pointcloud.hasDepthTex ? !pointcloud.visible : !Potree.Utils.getObjVisiByReason(pointcloud, 'datasetSelection')){//改 visible ->
|
|
|
|
|
|
+ if(/* pointcloud.hasDepthTex ? !pointcloud.visible : */ !Potree.Utils.getObjVisiByReason(pointcloud, 'datasetSelection')){//改 visible -> 这一版的深度图不准,就只用在贴图里,pick时需要点云,所以要一直有, 否则但pick时显示的话visibleNodes只能加载出一点点
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -89840,16 +89842,16 @@ void main()
|
|
&& viewer.images360.currentPano.pointcloud.hasDepthTex && viewport == viewer.mainViewport && !usePointcloud;
|
|
&& viewer.images360.currentPano.pointcloud.hasDepthTex && viewport == viewer.mainViewport && !usePointcloud;
|
|
|
|
|
|
|
|
|
|
- if(canUseDepthTex)getByDepthTex();
|
|
|
|
- else getByCloud();
|
|
|
|
- /* if(canUseDepthTex && !this.isMeasuring){
|
|
|
|
- getByDepthTex()
|
|
|
|
- }else{
|
|
|
|
- getByCloud()
|
|
|
|
|
|
+ /* if(canUseDepthTex)getByDepthTex()
|
|
|
|
+ else getByCloud() */
|
|
|
|
+ if(canUseDepthTex && !this.isMeasuring){
|
|
|
|
+ getByDepthTex();
|
|
|
|
+ }else {
|
|
|
|
+ getByCloud();
|
|
if(!intersectPoint && canUseDepthTex ){ //若在测量,先尝试点云,再用全景 //后来发现有深度图的点云全景visibleNode为空,pick不到的
|
|
if(!intersectPoint && canUseDepthTex ){ //若在测量,先尝试点云,再用全景 //后来发现有深度图的点云全景visibleNode为空,pick不到的
|
|
- getByDepthTex()
|
|
|
|
|
|
+ getByDepthTex();
|
|
}
|
|
}
|
|
- } */
|
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
|
|
|