xzw 2 years ago
parent
commit
33b2ca2f70
3 changed files with 5 additions and 3 deletions
  1. 3 1
      public/lib/potree/potree.js
  2. 1 1
      public/lib/potree/potree.js.map
  3. 1 1
      src/sdk/cover/index.js

+ 3 - 1
public/lib/potree/potree.js

@@ -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 {

File diff suppressed because it is too large
+ 1 - 1
public/lib/potree/potree.js.map


+ 1 - 1
src/sdk/cover/index.js

@@ -6,7 +6,7 @@ import axios from 'axios' //{ axios } from '@/api'
 export const enter = (dom, isLocal) => {
     
     Potree.settings.isOfficial = true //标记为正式、非测试版本 
-    //Potree.fileServer = axios 
+    Potree.fileServer = axios 
     Potree.settings.libsUrl = './lib/'
     
     Potree.settings.notAdditiveBlending = true