Merge remote-tracking branch 'origin' into cesium.com

CesiumGS · Feb 1, 2024 · 025c642 · 025c642
2 parents 2e58a9c + 67f3ed4
commit 025c642
Show file tree

Hide file tree

Showing 160 changed files with 7,947 additions and 2,409 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -0,0 +1,64 @@
+name: deploy
+on: 
+  push:
+    branches-ignore: 
+      - 'cesium.com'
+      - production
+concurrency:
+  group: deploy-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    permissions:
+      statuses: write
+      contents: read
+    env:
+      BUILD_VERSION: ${{ github.ref_name }}.${{ github.run_number }}
+      AWS_ACCESS_KEY_ID: ${{ secrets.DEV_AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }}
+      AWS_REGION: us-east-1
+      BRANCH: ${{ github.ref_name }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GITHUB_REPO: ${{ github.repository }}
+      GITHUB_SHA: ${{ github.sha }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: install node 20
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+      - name: npm install
+        run: npm install
+      - name: set the version in package.json
+        run: npm run deploy-set-version -- --buildVersion $BUILD_VERSION
+      - name: create release zip
+        run: npm run make-zip
+      - name: package cesium module
+        run: npm pack &> /dev/null
+      - name: package workspace modules
+        run: npm pack --workspaces &> /dev/null
+      - name: build apps
+        run: npm run build-apps
+      - uses: ./.github/actions/verify-package
+      - name: deploy to s3
+        if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
+        run: |
+          aws s3 sync . s3://cesium-public-builds/cesium/$BRANCH/ \
+          --cache-control "no-cache" \
+          --exclude ".git/*" \
+          --exclude ".concierge/*" \
+          --exclude ".github/*" \
+          --exclude ".husky/*" \
+          --exclude ".vscode/*" \
+          --exclude "Build/Coverage/*" \
+          --exclude "Build/CesiumDev/*" \
+          --exclude "Build/Specs/e2e" \
+          --exclude "Documentation/*" \
+          --exclude "node_modules/*" \
+          --exclude "scripts/*" \
+          --exclude "Tools/*" \
+          --delete 
+      - name: set status
+        if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
+        run: npm run deploy-status -- --status success --message Deployed
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -1,11 +1,11 @@
 name: dev
 on: 
   push:
-    branches-ignore: 
-      - 'cesium.com'
-      - production
+    branches: 
+      - main
+  pull_request:
 concurrency:
-  group: ${{ github.ref }}
+  group: dev-${{ github.ref }}
   cancel-in-progress: true
 jobs:
   lint:
@@ -57,7 +57,7 @@ jobs:
       - name: npm install
         run: npm install
       - name: release build
-        run: npm run build-release
+        run: npm run make-zip
       - name: release tests (chrome)
         run: npm run test -- --browsers ChromeHeadless --failTaskOnError --webgl-stub --release --suppressPassed
       - name: cloc

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,7 +1,7 @@
 name: main
 on: 
   workflow_run:
-    workflows: [dev]
+    workflows: [dev, prod]
     types: [completed]
     branches: 
       - main

diff --git a/Apps/SampleData/ClampToGround.czml b/Apps/SampleData/ClampToGround.czml
@@ -5,7 +5,7 @@
     "clock": {
       "interval": "2018-07-19T15:18:00Z/2018-07-19T15:18:30Z",
       "currentTime": "2018-07-19T15:18:00Z",
-      "multiplier": 5,
+      "multiplier": 2,
       "range": "LOOP_STOP",
       "step": "SYSTEM_CLOCK_MULTIPLIER"
     }
@@ -19,14 +19,22 @@
       "interpolationAlgorithm": "LINEAR",
       "forwardExtrapolationType": "HOLD",
       "cartesian": [
-        "2018-07-19T15:18:00Z",
-        1216348.1632364073,
-        -4736348.958775471,
-        4081284.5528982095,
+        "2018-07-19T15:18:00Z", 
+        1216327.3893347275,
+        -4736164.778028102,
+        4081507.5209477833,
+        "2018-07-19T15:18:10Z", 
+        1216369.543258349,
+        -4736201.237448179,
+        4081447.3732212726,
+        "2018-07-19T15:18:20Z", 
+        1216434.7507773656,
+        -4736241.372142024,
+        4081386.1802605274,
         "2018-07-19T15:18:30Z",
-        1216369.1229444197,
-        -4736377.467107148,
-        4081240.888485707
+        1216525.7792628652,
+        -4736271.927759278,
+        4081319.744558958
       ]
     },
     "orientation": {
@@ -43,26 +51,29 @@
     "polyline": {
       "positions": {
         "cartesian": [
-          1216348.1632364073,
-          -4736348.958775471,
-          4081284.5528982095,
-          1216369.1229444197,
-          -4736377.467107148,
-          4081240.888485707
+          1216327.3893347275,
+        -4736164.778028102,
+        4081507.5209477833,
+        1216369.543258349,
+        -4736201.237448179,
+        4081447.3732212726,
+        1216434.7507773656,
+        -4736241.372142024,
+        4081386.1802605274,
+        1216525.7792628652,
+        -4736271.927759278,
+        4081319.744558958
         ]
       },
       "material": {
         "polylineOutline": {
           "color": {
-              "rgba": [255, 255, 0, 255]
+              "rgba": [100, 149, 237, 140]
           },
-          "outlineColor": {
-              "rgba": [0, 0, 0, 255]
-          },
-          "outlineWidth": 2
+          "outlineWidth": 0
         }
       },
-      "width": 10,
+      "width": 12,
       "clampToGround": true
     }
   }

diff --git a/Apps/Sandcastle/gallery/3D Tiles BIM.html b/Apps/Sandcastle/gallery/3D Tiles BIM.html
@@ -187,7 +187,9 @@
         }
 
         try {
-          const tileset = await Cesium.Cesium3DTileset.fromIonAssetId(1240402);
+          const tileset = await Cesium.Cesium3DTileset.fromIonAssetId(1240402, {
+            disableCollision: true,
+          });
           scene.primitives.add(tileset);
 
           viewer.zoomTo(

diff --git a/Apps/Sandcastle/gallery/3D Tiles Clipping Planes.html b/Apps/Sandcastle/gallery/3D Tiles Clipping Planes.html
@@ -291,7 +291,9 @@
         }
 
         // Power Plant design model provided by Bentley Systems
-        const bimUrl = Cesium.IonResource.fromAssetId(1240402);
+        const bimUrl = Cesium.IonResource.fromAssetId(1240402, {
+          disableCollision: true,
+        });
         const pointCloudUrl = Cesium.IonResource.fromAssetId(16421);
         const instancedUrl =
           "../../SampleData/Cesium3DTiles/Instanced/InstancedOrientation/tileset.json";

diff --git a/Apps/Sandcastle/gallery/3D Tiles Interior.html b/Apps/Sandcastle/gallery/3D Tiles Interior.html
@@ -40,7 +40,9 @@
         const viewer = new Cesium.Viewer("cesiumContainer");
 
         try {
-          const tileset = await Cesium.Cesium3DTileset.fromIonAssetId(125737);
+          const tileset = await Cesium.Cesium3DTileset.fromIonAssetId(125737, {
+            disableCollision: true,
+          });
           viewer.scene.primitives.add(tileset);
         } catch (error) {
           console.log(`Error loading tileset: ${error}`);

diff --git a/Apps/Sandcastle/gallery/Ambient Occlusion.html b/Apps/Sandcastle/gallery/Ambient Occlusion.html
@@ -192,7 +192,9 @@
 
         try {
           // Power Plant design model provided by Bentley Systems
-          const tileset = await Cesium.Cesium3DTileset.fromIonAssetId(1240402);
+          const tileset = await Cesium.Cesium3DTileset.fromIonAssetId(1240402, {
+            disableCollision: true,
+          });
           viewer.scene.primitives.add(tileset);
         } catch (error) {
           console.log(`Error loading tileset: ${error}`);