Merge branch 'master' into qzc-dev

public/models/dam/gszh_xyz.gltf

@@ -399,20 +399,20 @@
         },
         {
             "matrix": [
-                0.13457144796848297,
-                0.05683456361293792,
-                1.9052840471267698,
+                0.12910610437393183,
+                0.06834746152162549,
+                1.90528392791748,
                 0,
-                1.7006011009216306,
-                0.8591647148132323,
-                -0.14574338495731354,
+                1.619248628616333,
+                1.0041124820709224,
+                -0.14574383199214935,
                 0,
-                -0.8609851002693176,
-                1.7058898210525513,
-                0.009925499558448792,
+                -1.006386876106262,
+                1.6243585348129272,
+                0.009925223886966702,
                 0,
-                -211.75634375,
-                -23.153990234375,
+                -209.250546875,
+                -16.30928515625,
                 18.9017890625,
                 1
             ],
@@ -1633,16 +1633,16 @@
             "alphaMode": "OPAQUE"
         },
         {
-            "name": "fallback Material",
+            "name": "node1",
             "pbrMetallicRoughness": {
                 "baseColorFactor": [
-                    0,
-                    0,
-                    0,
+                    0.76052450467022,
+                    0.76052450467022,
+                    0.76052450467022,
                     1
                 ],
                 "metallicFactor": 0,
-                "roughnessFactor": 1
+                "roughnessFactor": 0
             },
             "emissiveFactor": [
                 0,
@@ -1736,16 +1736,16 @@
             "alphaMode": "OPAQUE"
         },
         {
-            "name": "fallback Material",
+            "name": "node1",
             "pbrMetallicRoughness": {
                 "baseColorFactor": [
-                    0,
-                    0,
-                    0,
+                    0.2541520943200296,
+                    0.2541520943200296,
+                    0.2541520943200296,
                     1
                 ],
                 "metallicFactor": 0,
-                "roughnessFactor": 1
+                "roughnessFactor": 0
             },
             "emissiveFactor": [
                 0,
@@ -4243,7 +4243,7 @@
     ],
     "images": [
         {
-            "uri": "Binary_0.png"
+            "uri": "Binary_0.jpeg"
         },
         {
             "uri": "Binary_1.jpeg"

public/models/dam/license.txt

@@ -1,11 +0,0 @@
-Model Information:
-* title:	El Pontón de la Oliva | PATONES, MADRID
-* source:	https://sketchfab.com/3d-models/el-ponton-de-la-oliva-patones-madrid-eb3cb2b70a8d439aa8abf598989315c3
-* author:	Arqueomodel3D (https://sketchfab.com/juanbrualla)
-
-Model License:
-* license type:	CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
-* requirements:	Author must be credited. Commercial use is allowed.
-
-If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
-This work is based on "El Pontón de la Oliva | PATONES, MADRID" (https://sketchfab.com/3d-models/el-ponton-de-la-oliva-patones-madrid-eb3cb2b70a8d439aa8abf598989315c3) by Arqueomodel3D (https://sketchfab.com/juanbrualla) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)

src/views/Home/MapCtrl/Map3D/Map3D.js

@@ -114,6 +114,11 @@ export default class Map3D extends BaseMap {
         skyAtmosphere: false,//去掉球边缘
     });
 
+    viewer.clock.currentTime = Cesium.JulianDate.fromIso8601('2000-01-01T04:00:07Z');//设置当前时间
+    // setTimeout(() => {
+    //   viewer.clock.currentTime = Cesium.JulianDate.fromIso8601('2000-07-01T04:00:07Z');//设置当前时间
+    // }, 4000);
+
     //设置地表透明
     let globe = viewer.scene.globe;
     globe.depthTestAgainstTerrain = false;//关闭深度测试
@@ -123,6 +128,7 @@ export default class Map3D extends BaseMap {
 
 
     viewer.scene.globe.enableLighting = false; //关闭光照
+    viewer.scene.light.intensity = 6 //默认光源强度，太低了模型显示效果差
     viewer.shadows = false;//关闭阴影
     viewer.scene.globe.depthTestAgainstTerrain = false;//解决地形遮挡entity问题
 
@@ -237,19 +243,7 @@ export default class Map3D extends BaseMap {
     });
 
     this.layerMgr = new LayerMgr3D(viewer);
-    this.demo = new Demo3D()
-
-    this.demo.getQxsy(viewer) //倾斜摄影
-    this.demo.getDem(viewer) //地形图
-    this.demo.getWxyx(viewer) //卫星影像
-    // this.demo.getCzml2(viewer) //demo
-    // this.demo.getGltf(viewer) //模型
-    // this.demo.getWater(viewer)//简单淹没分析
-    // this.demo.getWater2(viewer)
-    // this.demo.getRlt2(viewer)  
-    // this.demo.getRlt3(viewer)  //热力图
-    // this.demo.getCzml(viewer)  //czml模型
-
+    this.getDemo(viewer)//加载地图
 
     viewer.scene.postRender.addEventListener(() => {
       this.dispatch.runtime.tickViewChanged();
@@ -372,4 +366,22 @@ export default class Map3D extends BaseMap {
       this._map.camera.flyToBoundingSphere(Cesium.BoundingSphere.fromPoints([p1, p2]));
     }
   }
+
+  async getDemo(viewer) {
+    const demo = new Demo3D()
+    this.demo = demo
+    demo.getDem(viewer) //地形图
+    demo.getWxyx(viewer) //卫星影像
+
+    await demo.getGltf(viewer) //模型
+    demo.getQxsy(viewer) //倾斜摄影 先加载模型
+    // demo.getDem(viewer) //地形图
+    // this.demo.getCzml2(viewer) //demo
+    // this.demo.getWater(viewer)//简单淹没分析
+    // this.demo.getWater2(viewer)
+    // this.demo.getRlt2(viewer)  
+    // this.demo.getRlt3(viewer)  //热力图
+    // this.demo.getCzml(viewer)  //czml模型
+
+  }
 }

src/views/Home/MapCtrl/Markers/ShuikuMarker.js

@@ -221,7 +221,8 @@ function ShuikuMarker({ data, dispatch, setting, zoom, distSq }) {
           bottom: 0,
           left: 0,
           transformOrigin: 'bottom center',
-          transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
+          // transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
+          transform: 'translateX(-50%) scale(1.2)',
           lineHeight: 1,
           zIndex: zindexmarker.shuiku + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0),
           cursor:"pointer"

src/views/Home/hsyy/index.js

@@ -45,6 +45,9 @@ const Page = ({ showPanels }) => {
 
       const demo = new Demo3D()    
       demo.getCzml2(mapObj)
+      // setTimeout(() => {
+      //   mapObj.clock.currentTime = Cesium.JulianDate.fromIso8601('2000-01-01T04:00:03Z');
+      // }, 2000);
     }else{
       mapObj.dataSources._dataSources.forEach(dataSource => {
           if (dataSource.name === 'CZML1111') { // 确保你知道你想要移除的数据源名称