Browse Source

修改bug

bill 8 tháng trước cách đây
mục cha
commit
603d3a1c11

+ 4 - 4
.env.development

@@ -1,4 +1,4 @@
-VITE_QJ_URL=https://test.4dkankan.com/panorama
-VITE_LASER_URL=https://uat-laser.4dkankan.com/4pc
-VITE_API=https://uat-sp.4dkankan.com/api
-VITE_4DKK_URL=https://test.4dkankan.com
+VITE_QJ_URL=https://4dkankan.com/panorama
+VITE_LASER_URL=https://laser.4dkankan.com/4pc
+VITE_API=https://sp.4dkankan.com/
+VITE_4DKK_URL=https://www.4dkankan.com/

+ 3 - 0
src/store/scene.ts

@@ -32,6 +32,7 @@ export const relicsId = computed(() => relics.value!.relicsId);
 // https://4dkankan.oss-cn-shenzhen.aliyuncs.com/scene_view_data/KJ-t-OgSx9XIrvNQ/images/panoramas/22.jpg?x-oss-process=image/resize,m_fixed,w_6144&171342528615
 
 export const getPointPano = (point: ScenePoint, tile = false, thumbnail = true) => {
+  
   if (tile) {
     const fileNames = new Array(6).fill(0);
     return fileNames.map(
@@ -46,6 +47,8 @@ export const getPointPano = (point: ScenePoint, tile = false, thumbnail = true)
     } else {
       return `https://4dkk.4dage.com/scene_result_data/${point.sceneCode}/caches/images/${point.uuid}.jpg`
     }
+  } else {
+      return `https://4dkk.4dage.com/scene_view_data/${point.sceneCode}/images/pan/high/${point.uuid}.jpg`;
   }
 };
 

+ 1 - 2
src/view/map/pc4Helper.ts

@@ -75,10 +75,9 @@ export const exportImage = async (points: ScenePoint[], name?: string) => {
   const downloadImages = Promise.all(
     points.map((point) => {
       const url = getPointPano(point) as string;
-
+      console.log(url, point)
 
       let loadBlob: Promise<Blob>
-      console.log(point.pos, noValidPoint(point.pos as any))
       if (!noValidPoint(point)) {
         let ration = 6;
         loadBlob = new Promise<void>(resolve => {

+ 7 - 1
src/view/pano/pano.vue

@@ -231,7 +231,13 @@ onMounted(() => {
   );
   const s2 = watchEffect(() => {
     if (point.value) {
-      const yaw = point.value.cameraType === DeviceType.CLUNT ? 90 : -90;
+      // console.log(point.value.sceneType);
+      // SceneType.VR
+      const yaw =
+        point.value.sceneType === SceneType.MESH ||
+        point.value.sceneType === SceneType.CLUNT
+          ? 90
+          : -90;
       pano.setYaw(glMatrix.toRadian(yaw));
     }
   });

+ 5 - 1
src/view/pano/three-env.ts

@@ -95,6 +95,7 @@ export const init = (canvas: HTMLCanvasElement) => {
 
   let mesh: Mesh;
   let prevMat: Matrix4
+  controls.saveState()
   return {
     setSize,
     redraw,
@@ -123,6 +124,10 @@ export const init = (canvas: HTMLCanvasElement) => {
     reset() {
       camera.fov = 70
       camera.updateProjectionMatrix()
+      
+      camera.position.applyMatrix4(prevMat.invert())
+      prevMat = null
+      controls.reset()
     },
     setYaw(yaw: number) {
       const mat = new Matrix4().makeRotationY(-yaw)
@@ -131,7 +136,6 @@ export const init = (canvas: HTMLCanvasElement) => {
       }
       prevMat = mat
       camera.position.applyMatrix4(mat)
-      console.log({...camera.position.clone()})
       controls.update()
     },
     destory() {

+ 1 - 1
vite.config.ts

@@ -43,7 +43,7 @@ export default ({ mode }: any) =>
           target: loadEnv(mode, process.cwd()).VITE_API,
           // target: `http://192.168.0.11:8324/relics/`,
           changeOrigin: true,
-          rewrite: (path) => path.replace(/^\/api/, ""),
+          rewrite: (path) => path.replace(/^\/api/, "/api"),
         },
         // "/api": {
         //   target: `https://uat-sp.4dkankan.com/`,