Sfoglia il codice sorgente

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

bill 2 anni fa
parent
commit
a8f735162f
3 ha cambiato i file con 5615 aggiunte e 5788 eliminazioni
  1. 5590 5775
      public/lib/potree/potree.js
  2. 1 1
      public/lib/potree/potree.js.map
  3. 24 12
      src/sdk/cover/index.js

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


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


+ 24 - 12
src/sdk/cover/index.js

@@ -133,10 +133,10 @@ export const enter = (dom, isLocal) => {
             }, */
             //手动开启或关闭:
             show: () => {
-                viewer.updateVisible(measure, 'inListByUser', true)
+                Potree.Utils.updateVisible(measure, 'inListByUser', true)
             },
             hide: () => {
-                viewer.updateVisible(measure, 'inListByUser', false)
+                Potree.Utils.updateVisible(measure, 'inListByUser', false)
             },
             fly(){
                 let result = viewer.focusOnObject(measure , 'measure', 1200  )
@@ -175,14 +175,14 @@ export const enter = (dom, isLocal) => {
                 if(hopeModelId != void 0){//隐藏其他的模型
                     let models = MergeEditor.getAllObjects()
                     models.forEach(model=>{
-                        viewer.updateVisible(model, 'forPick', model.dataset_id == hopeModelId)
+                        Potree.Utils.updateVisible(model, 'forPick', model.dataset_id == hopeModelId)
                     }) 
                 }
                 let intersect2 = Handler.onMouseMove(pos2d)
                 if(hopeModelId != void 0){//恢复
                     let models = MergeEditor.getAllObjects()
                     models.forEach(model=>{
-                        viewer.updateVisible(model, 'forPick', true)
+                        Potree.Utils.updateVisible(model, 'forPick', true)
                     }) 
                 }
                 if(intersect2 && intersect2.location){
@@ -291,15 +291,27 @@ export const enter = (dom, isLocal) => {
      
         setBackdrop(sky){//天空盒背景
             console.log('天空盒背景',  sky)
+            
+            let setGroundAndText = (color)=>{
+                MergeEditor.secondCompass.dom.find(".dirText").css({'color':color})
+                viewer.compass.dom.find(".dirText").css({'color':color})
+                MergeEditor.ground.material.uniforms.uColor.value.set(color) 
+                //MergeEditor.ground.children[0].material.color.set(color)
+            }
+            
             if(sky == 'none'){
                 viewer.setBackground(mainBackground) 
+                setGroundAndText('#eee')
             }else if(sky[0] == '#'){
-                viewer.setBackground(new THREE.Color(sky))
+                viewer.setBackground(new THREE.Color(sky)) 
+                let color = sky == '#fff' ? '#666' : sky == '#333' ? '#eee' : '#bbb'  //反相
+                setGroundAndText(color)
             }else{
                 viewer.setBackground('skybox', sky) 
+                setGroundAndText('#e0e0e0')
             }
             
-             
+            viewer.dispatchEvent('content_changed')
         },
         
         
@@ -515,7 +527,7 @@ export const enter = (dom, isLocal) => {
                 changeShow(show){ 
                     props.show = show  //for autoLoads show model
                     if(model){  
-                        viewer.updateVisible(model, 'changeShow', show) 
+                        Potree.Utils.updateVisible(model, 'changeShow', show) 
                     } 
                 },
                 changeSelect(state){
@@ -668,7 +680,7 @@ export const enter = (dom, isLocal) => {
                     }
                 
                     MergeEditor.getAllObjects().forEach(m=>{//隐藏其他的模型
-                        if(m!=model) viewer.updateVisible(m, 'enterScaleSet', false) 
+                        if(m!=model) Potree.Utils.updateVisible(m, 'enterScaleSet', false) 
                     })
                     
                     let setScale = ()=>{
@@ -739,7 +751,7 @@ export const enter = (dom, isLocal) => {
                     
                     viewer.outlinePass.selectedObjects = [model];
                     MergeEditor.getAllObjects().forEach(m=>{//恢复其他的模型
-                        if(m!=model) viewer.updateVisible(m, 'enterScaleSet', true) 
+                        if(m!=model) Potree.Utils.updateVisible(m, 'enterScaleSet', true) 
                     })
                 },
 
@@ -902,10 +914,10 @@ export const enter = (dom, isLocal) => {
                     return sdk.getScreenByPosition(pos3d) 
                 },
                 show(){
-                    viewer.updateVisible(tag, 'byList', true)
+                    Potree.Utils.updateVisible(tag, 'byList', true)
                 },
                 hide(){
-                    viewer.updateVisible(tag, 'byList', false)
+                    Potree.Utils.updateVisible(tag, 'byList', false)
                 },
                 destroy(){
                     if(tag){
@@ -934,7 +946,7 @@ export const enter = (dom, isLocal) => {
     }
      
     
-    console.log('版本: 2022.9.20-1')
+    console.log('版本: 2022.12.20-1')
      
     return sdk 
 }