Skip to content

Commit eec5551

Browse files
committed
同步代码
1 parent e50234e commit eec5551

File tree

225 files changed

+21664
-19219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

225 files changed

+21664
-19219
lines changed

public/config/config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -846,6 +846,7 @@
846846
"name": "合肥市区",
847847
"url": "{dataServer}/3dtiles/jzw-hefei/tileset.json",
848848
"maximumScreenSpaceError": 1,
849+
"maxMemory": 1024,
849850
"style": {
850851
"color": {
851852
"conditions": [["true", "color('rgba(42, 160, 224, 1)')"]]
@@ -866,6 +867,7 @@
866867
"name": "合肥市区-带贴图",
867868
"url": "{dataServer}/3dtiles/jzw-hefei-cz/tileset.json",
868869
"maximumScreenSpaceError": 1,
870+
"maxMemory": 1024,
869871
"marsJzwStyle": true,
870872
"highlight": { "type": "click", "color": "#FFFF00" },
871873
"popup": [
@@ -882,6 +884,7 @@
882884
"name": "上海市区",
883885
"url": "{dataServer}/3dtiles/jzw-shanghai/tileset.json",
884886
"maximumScreenSpaceError": 4,
887+
"maxMemory": 2048,
885888
"style": {
886889
"color": {
887890
"conditions": [
@@ -948,6 +951,7 @@
948951
"url": "{dataServer}/3dtiles/bim-ditiezhan/tileset.json",
949952
"position": { "lng": 117.203994, "lat": 31.857999, "alt": 28.9 },
950953
"rotation": { "z": 168.1 },
954+
"maxMemory": 2048,
951955
"highlight": { "type": "click", "color": "#00FF00" },
952956
"popup": "all",
953957
"scenetree": "scenetree.json",
@@ -998,6 +1002,7 @@
9981002
"url": "{dataServer}/3dtiles/max-shihua/tileset.json",
9991003
"position": { "lng": 117.077158, "lat": 31.659116, "alt": -2.0 },
10001004
"maximumScreenSpaceError": 1,
1005+
"maxMemory": 2048,
10011006
"highlight": { "type": "click", "color": "#00FF00" },
10021007
"popup": "all",
10031008
"scenetree": "scenetree.json",
@@ -1114,6 +1119,7 @@
11141119
"url": "{dataServer}/3dtiles/qx-teh/tileset.json",
11151120
"position": { "lng": 117.218434, "lat": 31.81807, "alt": 163 },
11161121
"maximumScreenSpaceError": 16,
1122+
"maxMemory": 2048,
11171123
"dynamicScreenSpaceError": true,
11181124
"cullWithChildrenBounds": false,
11191125
"skipLevelOfDetail": true,

public/config/example.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,11 @@
415415
"background.css"
416416
]
417417
},
418+
{
419+
"name": "火星",
420+
"thumbnail": "map-other-mars.jpg",
421+
"main": "map/other/mars"
422+
},
418423
{
419424
"name": "离线数据",
420425
"thumbnail": "map-other-offline.jpg",
@@ -1748,6 +1753,7 @@
17481753
"name": "echarts饼形图点",
17491754
"thumbnail": "graphic-divGraphic-echarts-pie.jpg",
17501755
"main": "graphic/divGraphic/echarts-pie",
1756+
"hasPannel": true,
17511757
"api": "DivGraphic.html",
17521758
"developerShow": false,
17531759
"libs": [
@@ -3411,6 +3417,13 @@
34113417
"api": "ClockAnimate.html",
34123418
"hasPannel": true
34133419
},
3420+
{
3421+
"name": "ClockAnimate 时钟控制栏 差值模式",
3422+
"thumbnail": "control-basis-clockAnimate-duration.jpg",
3423+
"main": "control/basis/clockAnimate-duration",
3424+
"api": "ClockAnimate.html",
3425+
"hasPannel": true
3426+
},
34143427
{
34153428
"name": "Timeline 时间线面板",
34163429
"thumbnail": "control-cesium-timeline.jpg",
Loading
24.2 KB
Loading
21.4 KB
Loading

public/config/tileset.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"name": "合肥市区",
99
"url": "//data.mars3d.cn/3dtiles/jzw-hefei/tileset.json",
1010
"maximumScreenSpaceError": 1,
11+
"maxMemory": 1024,
1112
"style": {
1213
"color": {
1314
"conditions": [["true", "color('rgba(42, 160, 224, 1)')"]]
@@ -109,6 +110,7 @@
109110
"position": { "lng": 117.203994, "lat": 31.857999, "alt": 28.9 },
110111
"rotation": { "z": 168.1 },
111112
"maximumScreenSpaceError": 8,
113+
"maxMemory": 1024,
112114
"skipLevelOfDetail": true,
113115
"loadSiblings": true,
114116
"cullRequestsWhileMoving": true,
@@ -131,6 +133,7 @@
131133
"position": { "lng": 117.096906, "lat": 31.851564, "alt": 45 },
132134
"rotation": { "z": 17.5 },
133135
"maximumScreenSpaceError": 16,
136+
"maxMemory": 1024,
134137
"skipLevelOfDetail": true,
135138
"loadSiblings": true,
136139
"cullRequestsWhileMoving": true,
@@ -191,6 +194,7 @@
191194
"url": "//data.mars3d.cn/3dtiles/max-shihua/tileset.json",
192195
"position": { "lng": 117.077158, "lat": 31.659116, "alt": -2.0 },
193196
"maximumScreenSpaceError": 1,
197+
"maxMemory": 1024,
194198
"highlight": { "type": "click", "color": "#00FF00" },
195199
"popup": "all",
196200
"scenetree": "scenetree.json",
@@ -292,6 +296,7 @@
292296
"url": "//data.mars3d.cn/3dtiles/qx-hfdxy/tileset.json",
293297
"position": { "alt": 43.7 },
294298
"maximumScreenSpaceError": 1,
299+
"maxMemory": 2048,
295300
"center": { "lat": 31.841523, "lng": 117.205761, "alt": 166, "heading": 1, "pitch": -33 }
296301
},
297302
{
@@ -302,6 +307,7 @@
302307
"url": "//data.mars3d.cn/3dtiles/qx-shequ/tileset.json",
303308
"position": { "alt": 148.2 },
304309
"maximumScreenSpaceError": 2,
310+
"maxMemory": 2048,
305311
"dynamicScreenSpaceError": true,
306312
"cullWithChildrenBounds": false,
307313
"center": { "lat": 28.440864, "lng": 119.486477, "alt": 588.23, "heading": 268.6, "pitch": -37.8 },
@@ -315,6 +321,7 @@
315321
"url": "//data.mars3d.cn/3dtiles/qx-teh/tileset.json",
316322
"position": { "lng": 117.218434, "lat": 31.81807, "alt": 163 },
317323
"maximumScreenSpaceError": 16,
324+
"maxMemory": 2048,
318325
"dynamicScreenSpaceError": true,
319326
"cullWithChildrenBounds": false,
320327
"skipLevelOfDetail": true,

public/lib/Cesium/Cesium.js

Lines changed: 6313 additions & 6313 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
-201 Bytes
Binary file not shown.

public/lib/Cesium/Workers/chunk-KJJX7FYJ.js renamed to public/lib/Cesium/Workers/chunk-2C3WG56Z.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)