|
@@ -78495,7 +78495,7 @@ void main() {
|
|
|
|
|
|
viewer.setCameraLayers(o.camera, ['measure']);
|
|
|
|
|
|
- if(o.screenshot){ //抗锯齿
|
|
|
+ if(o.screenshot && this.viewer.ssaaRenderPass.enabled){ //抗锯齿
|
|
|
this.viewer.ssaaRenderPass.sampleLevel = 4;
|
|
|
this.viewer.composer.render(this.scene, o.camera );
|
|
|
/* viewer.scene.measurements.forEach(e=>{ //隐藏除了label以外的
|
|
@@ -131662,6 +131662,8 @@ 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
|
|
|
callback && callback(data);
|
|
|
}).catch(onError);
|
|
|
}else {
|