ソースを参照

fix: 本地版2.0.0

xzw 5 ヶ月 前
コミット
43f6f1ab1d
4 ファイル変更4773 行追加3184 行削除
  1. 1731 1309
      pnpm-lock.yaml
  2. 3032 1866
      public/lib/potree/potree.js
  3. 1 1
      public/lib/potree/potree.js.map
  4. 9 8
      src/sdk/cover/index.js

ファイルの差分が大きいため隠しています
+ 1731 - 1309
pnpm-lock.yaml


ファイルの差分が大きいため隠しています
+ 3032 - 1866
public/lib/potree/potree.js


ファイルの差分が大きいため隠しています
+ 1 - 1
public/lib/potree/potree.js.map


+ 9 - 8
src/sdk/cover/index.js

@@ -102,9 +102,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
         Potree.settings.urls.setPrefix(8, panoOSSRoot)//vision.txt
         //Potree.settings.urls.panoPrefix = panoOSSRoot //vision.txt
     }
-    /* if(ossRoot){
-        Potree.settings.urls.panoPrefix = Potree.settings.urls.handlePrefix(ossRoot) //vision.txt
-    } */
+    if(ossRoot){
+        Potree.settings.urls.ossRoot/* panoPrefix */ = Potree.settings.urls.handlePrefix(ossRoot) //vision.txt
+    }  
     Potree.settings.cloudAddMapping = true
     Potree.settings.webSite = 'datav1' //depthTex
     
@@ -128,9 +128,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
     Potree.settings.tiles3DMaxMemory = 300 //稍微增加点
     Potree.settings.mergeTransCtlOnClick = true
     Potree.settings.canWalkThroughModel = true
-    window.cesErrorWords = '由于GPU占用过大, 将关闭地图,请更换更好的显卡!'
+    window.cesErrorWords = '内存占用过高,建议关闭部分场景或升级显卡。'
     window.cesErrorCallback = ()=>{
-        sdk.setBackdrop('none')
+        //sdk.setBackdrop('none')
     }
     
     let { THREE } = Potree.mergeEditStart(dom, mapDom)
@@ -750,6 +750,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                 } else if (type == 'image-map' || type == 'vector-map') {//影像|矢量 地图
 
                 } else {//环境
+                    sky = ossRoot + sky 
                     viewer.setBackground('skybox', sky)
                     setGroundAndText('#e0e0e0')
                 }
@@ -1766,7 +1767,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                 title: props.title,  fontsize: props.fontSize  
             }    
             let tag = viewer.tagTool.createTagFromData(info)
-            
+            props.image = ossRoot + '/' +props.image
             
             tag.addEventListener('mouseover',()=>{
                 bus.emit('enter') 
@@ -1968,7 +1969,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
             
             let satellite = true
             let gaoDeImageryProvider = cesImageryProvider || new Cesium.UrlTemplateImageryProvider({ 
-                url: `//wprd04.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=${satellite?6:7}&x={x}&y={y}&z={z}&layer=6&token=YOUR_API_KEY`, //style=6是卫星,7是标准
+                url: `http://wprd04.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=${satellite?6:7}&x={x}&y={y}&z={z}&layer=6&token=YOUR_API_KEY`, //style=6是卫星,7是标准
                 minimumLevel: 0,
                 maximumLevel: satellite?18:19, 
                 credit: new Cesium.Credit('高德地图'),
@@ -1980,7 +1981,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
              
             //叠一层文字上去
             let gaoDeImageryProvider2 = cesImageryProvider || new Cesium.UrlTemplateImageryProvider({ 
-                url: `//wprd04.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}&layer=6&token=YOUR_API_KEY`, //style=6是卫星,7是标准
+                url: `http://wprd04.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}&layer=6&token=YOUR_API_KEY`, //style=6是卫星,7是标准
                 minimumLevel: 0,
                 maximumLevel: 18, 
                 credit: new Cesium.Credit('高德地图'),