xzw пре 3 година
родитељ
комит
71ee47dc82
3 измењених фајлова са 16 додато и 5 уклоњено
  1. 1 1
      public/lib/potree/potree.js
  2. 1 1
      public/lib/potree/potree.js.map
  3. 14 3
      src/sdk/cover/index.js

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

@@ -117041,7 +117041,7 @@ ENDSEC
             
             viewer.setControls(viewer.orbitControls);
             //viewer.mainViewport.view.fixZWhenPan = true
-            
+            viewer.orbitControls.constantlyForward = true;
             
             
             viewer.addEventListener('global_single_click',(e)=>{

Разлика између датотеке није приказан због своје велике величине
+ 1 - 1
public/lib/potree/potree.js.map


+ 14 - 3
src/sdk/cover/index.js

@@ -9,6 +9,9 @@ export const enter = (dom, isLocal) => {
     //Potree.fileServer = axios 
     Potree.settings.libsUrl = '../lib/'
     
+    const tagLimitDis = 8;
+    
+    
     
     let {THREE} = Potree.mergeEditStart(dom)
     let MergeEditor = viewer.modules.MergeEditor
@@ -87,7 +90,9 @@ export const enter = (dom, isLocal) => {
          
         
         
-        getScreenByPosition(pos3d, modelId){//通过模型局部坐标获取屏幕坐标 
+        getScreenByPosition(pos3d, modelId/* , disToCameraLimit */){//通过模型局部坐标获取屏幕坐标 
+            
+            
             let isLocal = modelId != void 0 
             pos3d = new THREE.Vector3().copy(pos3d)
             let worldPos = isLocal ? Potree.Utils.datasetPosTransform({ fromDataset: true, datasetId: modelId, position:pos3d}) : pos3d
@@ -95,6 +100,9 @@ export const enter = (dom, isLocal) => {
             var viewport = viewer.mainViewport
             var camera = viewport.camera
             var dom = viewer.renderArea
+            if(tagLimitDis != void 0){
+                if(camera.position.distanceTo(worldPos) < tagLimitDis)return false
+            }
             //console.log('getScreenByPoint ' + pos3d.toArray())
             return Potree.Utils.getPos2d(worldPos, camera, dom, viewport)
         },
@@ -337,6 +345,8 @@ export const enter = (dom, isLocal) => {
             props.isFirstLoad = props.bottom == void 0 //在编辑时用户添加的
             if(props.opacity == void 0)  props.opacity = 1
             props.scale /= 100
+            props.unlit = true
+            
             
             if(!props.isFirstLoad){ 
                 if(autoLoads.length == 0){ //首次加载
@@ -445,8 +455,8 @@ export const enter = (dom, isLocal) => {
             let result = {  
                 bus,
                 changeShow(show){ 
-                    if(model){
-                        viewer.updateVisible(model, 'changeShow', show)
+                    if(model){ 
+                        viewer.updateVisible(model, 'changeShow', show) 
                     } 
                 },
                 changeSelect(state){
@@ -455,6 +465,7 @@ export const enter = (dom, isLocal) => {
                         if(state && viewer.inputHandler.selection[0]){
                             MergeEditor.transformControls.attach(model) //viewer.transformObject(model); //交换
                         }
+                        console.log(props.id, show)
                     }
                 },
                 changeScale(s){