Merge branch 'master' of http://192.168.0.115:3000/bill/traffic-laser

# Conflicts:
#	server/test/a0k4xu045_202305311600080410/attach/sceneStore

.env

@@ -1,2 +1 @@
-VITE_API_BASE_URL=dev
-VITE_DEV_PORT = 5178
+VITE_DEV_PORT = 5178

.env.development

@@ -0,0 +1,2 @@
+VITE_API_BASE_URL=dev
+VITE_DEV_PORT = 5178

.gitignore

@@ -12,6 +12,7 @@ dist
 dist-ssr
 *.local
 public/test
+server/test
 
 # Editor directories and files
 # .vscode/*

public/static/lib/potree/potree.js

@@ -57148,7 +57148,7 @@
 	    depthTexture:{ value: null },
 	    nearPlane:{value: 0.1},
 	    farPlane:{value: 100000},
-
+	    uUseOrthographicCamera:{ type: "b", value: false },
 	};
 
 	ShaderLib[ 'line' ] = {
@@ -57397,7 +57397,8 @@
 		uniform vec3 diffuse;
 		uniform float opacity;
 		uniform float lineWidth;
-         
+        uniform bool uUseOrthographicCamera;
+        
 		#ifdef USE_DASH
 
 			uniform float dashOffset;
@@ -57451,9 +57452,14 @@
         #if defined(GL_EXT_frag_depth) && defined(useDepth)  
             float convertToLinear(float zValue)
             {
-                float z = zValue * 2.0 - 1.0;
-                return (2.0 * nearPlane * farPlane) / (farPlane + nearPlane - z * (farPlane - nearPlane));
+                if(uUseOrthographicCamera){
+                    return zValue*(farPlane-nearPlane)+nearPlane;
+                }else{ 
+                    float z = zValue * 2.0 - 1.0;
+                    return (2.0 * nearPlane * farPlane) / (farPlane + nearPlane - z * (farPlane - nearPlane));
+                }  
             }
+            
         #endif
 
 
@@ -58035,7 +58041,7 @@
 	            this.uniforms.nearPlane.value = camera.near;
 	            this.uniforms.farPlane.value = camera.far;
 	        }
-	           
+	        this.uniforms.uUseOrthographicCamera.value = !camera.isPerspectiveCamera;
 	    }
 
 	}
@@ -63549,11 +63555,17 @@ uniform vec3 baseColor;
     uniform float clipDistance;
     uniform float maxClipFactor;
     uniform float maxOcclusionFactor;
-
+    uniform bool uUseOrthographicCamera;
+    
+    
     float convertToLinear(float zValue)
     {
-        float z = zValue * 2.0 - 1.0;
-        return (2.0 * nearPlane * farPlane) / (farPlane + nearPlane - z * (farPlane - nearPlane));
+        if(uUseOrthographicCamera){
+            return zValue*(farPlane-nearPlane)+nearPlane;
+        }else{ 
+            float z = zValue * 2.0 - 1.0;
+            return (2.0 * nearPlane * farPlane) / (farPlane + nearPlane - z * (farPlane - nearPlane));
+        }  
     }
 #endif
   
@@ -70816,7 +70828,8 @@ void main()
 	        
 	        let uniforms = {
 				resolution:    { type: 'v2',  value: new Vector2(width, height ) },
-	            viewportOffset: { type: 'v2',  value: new Vector2(0, 0 ) }, //left, top    
+	            viewportOffset: { type: 'v2',  value: new Vector2(0, 0 ) }, //left, top   
+	            uUseOrthographicCamera:{ type: "b", value: false },
 				nearPlane:     { type: 'f', 	value: 0.1 },
 				farPlane:      { type: 'f', 	value: 10000 }, 
 				depthTexture:   { type: 't', 	value: null }, 
@@ -70830,7 +70843,8 @@ void main()
 	            maxOcclusionFactor :  { type: 'f', 	value: o.maxOcclusionFactor || 1 },  //0-1
 	            //-------add:-----
 	            replaceColor : {type:'v3', value: o.replaceColor ?  new Color(o.replaceColor) : null},
-	            beReplacedRed : {type:'f', value: o.beReplacedRed},
+	            beReplacedRed : {type:'f', value: o.beReplacedRed}, 
+	            
 	        };  
 	     
 	        super({ 
@@ -70968,7 +70982,7 @@ void main()
 	        return this
 	    }
 	    
-	    
+	     
 	    
 	    
 	    updateDepthParams(e={}){//主要用于点云遮住mesh
@@ -70985,7 +70999,9 @@ void main()
 	            this.uniforms.nearPlane.value = camera.near;
 	            this.uniforms.farPlane.value = camera.far;
 	        }
-	              
+	         
+
+	        this.uniforms.uUseOrthographicCamera.value = !camera.isPerspectiveCamera;
 	    }
 
 	    
@@ -75033,7 +75049,7 @@ void main()
 	            }else if(e.event.key == 'y'){
 	                viewer.images360.cube.material.wireframe = false;
 	                viewer.images360.cube.visible = Potree.settings.displayMode == 'showPanos';
-	            }                
+	            }                 
 	        }); 
 	        
 	    }  
@@ -75180,12 +75196,12 @@ void main()
 	    
 	    urls:{
 	        //localTextures:'../resources/textures/', 
-	        prefix1: 'https://laser-oss.4dkankan.com',//oss
-	        prefix2: 'https://testlaser.4dkankan.com',
-	        prefix3: 'https://4dkk.4dage.com',
-	        prefix4: 'https://uat-laser.4dkankan.com',//test.4dkankan
-	        prefix5: 'https://laser.4dkankan.com',
-	        prefix6: 'https://mix3d.4dkankan.com/backend',
+	        prefix1: '',//'https://laser-oss.4dkankan.com',//oss
+	        prefix2: '',//'https://testlaser.4dkankan.com',
+	        prefix3: '',//'https://4dkk.4dage.com',
+	        prefix4: '',//'https://uat-laser.4dkankan.com',//test.4dkankan
+	        prefix5: '',//'https://laser.4dkankan.com',
+	        prefix6: '',//'https://mix3d.4dkankan.com/backend',
 	        
 	    },
 	    
@@ -91552,15 +91568,12 @@ void main()
 	                });
 	                
 	                faceMesh.addEventListener('click', (e)=>{  
-	                    /* if(navCubeViewer.switchView('ortho', directions[name] ,   ()=>{ 
-	                        faceMesh.material.uniforms.faceColor.value.set(Colors.black)
-	                    }) ){
-	                        faceMesh.material.uniforms.faceColor.value.set(Colors.blue) 
-	                    } */
-	                    
-	                    
 	                    if(viewer.mainViewport.view.isFlying())return
-	                    navCubeViewer.switchView('ortho', directions[name] ,   ()=>{ 
+	                     
+	                    let baseLine = viewer.scene.measurements.find(e=>e.isBaseLine);  //使基准线在俯视图中水平
+	                    let yaw = baseLine ? new Vector2().subVectors(baseLine.points[0], baseLine.points[1]).angle() : 0; 
+	                     
+	                    navCubeViewer.switchView('ortho', baseLine ? {dir: new Vector3(0,0,-1),yaw,pitch: -1.5707963267948966} : directions[name] ,   ()=>{ 
 	                        faceMesh.material.uniforms.faceColor.value.set(Colors.black);
 	                    }); 
 	                    faceMesh.material.uniforms.faceColor.value.set(Colors.blue); 
@@ -96798,7 +96811,7 @@ ENDSEC
 	            this.domRoot.appendChild(elUnfocus[0]);
 	            
 	            if(Potree.settings.editType != 'merge'){
-	            
+	             
 	                let elHide = $("<input type='button' value='隐藏点云'></input>");
 	                elHide.css({
 	                    position : "absolute",

server/index.js

@@ -0,0 +1,3 @@
+import { createServer } from './mock.js'
+
+createServer(8080)

server/mock.ts

@@ -2,19 +2,28 @@ import express from "express";
 import path from "path";
 import bodyParser from 'body-parser'
 import * as fs from "fs";
+import { fileURLToPath } from 'url';
 import fileUpload from 'express-fileupload'
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
 const staticDir = path.resolve(__dirname, "test");
+const publicDir = path.resolve(__dirname, "../dist");
 
-console.log(staticDir);
 let startup = false;
-export async function createServer(port: number) {
+
+
+
+export async function createServer(port) {
   if (startup) {
     return;
   }
 
   const app = express();
   app.use(express.static(staticDir));
+  console.log(publicDir)
+  app.use(express.static(publicDir));
   app.use(bodyParser({ limit: '200mb' }))
   app.use(fileUpload({createParentPath: true}))
   app.listen(port);
@@ -36,7 +45,7 @@ export async function createServer(port: number) {
   })
 
   app.post("/:sceneCode/upload", (req, res) => {
-    const file = (req as any).files.file
+    const file = (req).files.file
     const relUrl = `/attach/upload/${file.name}`
     const absUrl = path.resolve(staticDir, `./${req.params.sceneCode}/${relUrl}`)
     console.log("上传图片完成路径为", relUrl)