Merge branch 'dev' of http://192.168.0.115:3000/bill/fuse-code into dev

src/sdk/cover/index.js

@@ -11,9 +11,14 @@ export const enter = (dom, isLocal) => {
     //Potree.fileServer = axios 
     Potree.settings.libsUrl = './lib/'
     
-    if(location.host === 'mix3d.4dkankan.com' ){//正式环境
+    
+    //正式环境（本地调试会打不开）
+    if(location.host === 'mix3d.4dkankan.com' ){
         Potree.settings.urls.prefix = Potree.settings.urls.prefix6  
         Potree.settings.webSite = 'datav1' 
+    }else if(location.host === 'xfhd.4dkankan.com'){ 
+        Potree.settings.urls.prefix = Potree.settings.urls.prefix7  
+        Potree.settings.webSite = 'datav1' 
     }
     
      
@@ -303,9 +308,9 @@ export const enter = (dom, isLocal) => {
             return Potree.Utils.getPos2d(worldPos, viewport, dom  )
         },
         
-        screenshot: (width, height) => {
+        screenshot: (width, height, bgOpacity=1) => {
             //截图  
-            var {getImagePromise, finishPromise} =  viewer.startScreenshot({ type: 'default', useRenderTarget:true }, width, height) 
+            var {getImagePromise, finishPromise} =  viewer.startScreenshot({ type: 'default', useRenderTarget:true, bgOpacity }, width, height) 
             var deferred = $.Deferred();
             finishPromise.done(({dataUrl}) => {
                deferred.resolve(dataUrl)
@@ -964,6 +969,15 @@ export const enter = (dom, isLocal) => {
             
             return result
             
+        },
+        
+        
+        showGrid(){
+            Potree.Utils.updateVisible(viewer.modules.MergeEditor.ground, 'hideGrid', false)
+        },
+        
+        hideGrid(){
+            Potree.Utils.updateVisible(viewer.modules.MergeEditor.ground, 'hideGrid', true)
         }
     }