同步代码 v3.5.12

marsgis · Jun 19, 2023 · 51a2e50 · 51a2e50
1 parent a453916
commit 51a2e50
Show file tree

Hide file tree

Showing 150 changed files with 73,614 additions and 69,361 deletions.
diff --git a/public/config/example.json b/public/config/example.json
@@ -120,7 +120,7 @@
             "thumbnail": "map-other-networkPlug.jpg",
             "main": "map/other/networkPlug",
             "libs": ["mars3d", "localforage", "cesium-networkPlug"],
-            "new":true
+            "new": true
           }
         ]
       }
@@ -1040,7 +1040,8 @@
             "name": "扇形",
             "thumbnail": "graphic-entity-polygon-sector.jpg",
             "main": "graphic/entity/polygon-sector",
-            "hasPannel": true
+            "hasPannel": true,
+            "resources": ["Circle3WaveMaterialProperty.js"]
           },
           {
             "name": "军标",
@@ -2901,12 +2902,6 @@
             "thumbnail": "thirdParty-ammo-turnRope.gif",
             "main": "thirdParty/ammo/turnRope",
             "libs": ["mars3d", "cesium-meshVisualizer"]
-          },
-          {
-            "name": "撞击（断裂体）",
-            "thumbnail": "thirdParty-ammo-convexBreak.gif",
-            "main": "thirdParty/ammo/convexBreak",
-            "libs": ["mars3d", "cesium-meshVisualizer"]
           }
         ]
       },

diff --git a/public/config/thumbnail/thirdParty-ammo-convexBreak.gif b/public/config/thumbnail/thirdParty-ammo-convexBreak.gif
diff --git a/public/config/thumbnail/thirdParty-ammo-convexBreak.jpg b/public/config/thumbnail/thirdParty-ammo-convexBreak.jpg
diff --git a/public/config/thumbnail/thirdParty-ammo-softbodyVolume.jpg b/public/config/thumbnail/thirdParty-ammo-softbodyVolume.jpg
diff --git a/public/config/thumbnail/thirdParty-ammo-turnCloth.jpg b/public/config/thumbnail/thirdParty-ammo-turnCloth.jpg
diff --git a/public/config/thumbnail/thirdParty-ammo-turnRope.jpg b/public/config/thumbnail/thirdParty-ammo-turnRope.jpg
diff --git a/public/lib/Cesium/Cesium.js b/public/lib/Cesium/Cesium.js
diff --git a/public/lib/Cesium/ThirdParty/Workers/draco_decoder_nodejs.js b/public/lib/Cesium/ThirdParty/Workers/draco_decoder_nodejs.js
diff --git a/public/lib/Cesium/ThirdParty/Workers/pako_deflate.min.js b/public/lib/Cesium/ThirdParty/Workers/pako_deflate.min.js
diff --git a/public/lib/Cesium/ThirdParty/Workers/pako_inflate.min.js b/public/lib/Cesium/ThirdParty/Workers/pako_inflate.min.js
diff --git a/public/lib/Cesium/ThirdParty/Workers/z-worker-pako.js b/public/lib/Cesium/ThirdParty/Workers/z-worker-pako.js
diff --git a/public/lib/Cesium/ThirdParty/draco_decoder.wasm b/public/lib/Cesium/ThirdParty/draco_decoder.wasm
diff --git a/.../Workers/AttributeCompression-48e336db.js → .../Workers/AttributeCompression-0b8f7b7d.js b/.../Workers/AttributeCompression-48e336db.js → .../Workers/AttributeCompression-0b8f7b7d.js
diff --git a/...orkers/AxisAlignedBoundingBox-e7b79110.js → ...orkers/AxisAlignedBoundingBox-04c1a5e3.js b/...orkers/AxisAlignedBoundingBox-e7b79110.js → ...orkers/AxisAlignedBoundingBox-04c1a5e3.js
diff --git a/...ium/Workers/BoundingRectangle-9216d683.js → ...ium/Workers/BoundingRectangle-4ef16803.js b/...ium/Workers/BoundingRectangle-9216d683.js → ...ium/Workers/BoundingRectangle-4ef16803.js