Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: CesiumGS/cesium
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.110.1
Choose a base ref
...
head repository: CesiumGS/cesium
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: caa30bdbcb3916c8951b6241fa6f558e04859a21
Choose a head ref

Commits on Sep 19, 2023

  1. Copy the full SHA
    cda6cbe View commit details

Commits on Oct 3, 2023

  1. Fix typo in CHANGES.md

    ggetz committed Oct 3, 2023
    Copy the full SHA
    45300f3 View commit details
  2. Fix scaling of UniformState.normal

    Jeshurun Hembd committed Oct 3, 2023
    Copy the full SHA
    64cad8d View commit details
  3. Fix scaling of UniformState.normal3D

    Jeshurun Hembd committed Oct 3, 2023
    Copy the full SHA
    9b04518 View commit details

Commits on Oct 4, 2023

  1. Add support for Bing Maps mapLayer template parameters

    Bing Maps [mapLayer template parameters](https://learn.microsoft.com/en-us/bingmaps/rest-services/imagery/get-imagery-metadata#template-parameters)
    allow users to customize imagery to enable certain features, such as
    traffic flow. This change updates `BingMapsImageryProvider.fromUrl`
    to take an optional `mapLayer` string parameter which is then
    maps directly to the equivalent Bing query parameter.
    mramato committed Oct 4, 2023
    Copy the full SHA
    c56a279 View commit details
  2. Fix inverse normal matrices in UniformState

    Jeshurun Hembd committed Oct 4, 2023
    Copy the full SHA
    f52a861 View commit details
  3. Update CHANGES.md

    Jeshurun Hembd committed Oct 4, 2023
    Copy the full SHA
    9dcbc66 View commit details
  4. Fix copy-paste error in uniformState.inverseNormal3D

    Jeshurun Hembd committed Oct 4, 2023
    Copy the full SHA
    9556061 View commit details

Commits on Oct 5, 2023

  1. Merge pull request #11553 from CesiumGS/fix-normal-scaling

    Fix scaling of czm_normal
    lilleyse authored Oct 5, 2023
    Copy the full SHA
    4ce2d16 View commit details

Commits on Oct 9, 2023

  1. Fix clustered Label only hide foreground.

    toggle dataSource.show,clustered Label's foreground and background hiding is inconsistencies
    yieryi committed Oct 9, 2023
    Copy the full SHA
    5d91e6d View commit details
  2. Copy the full SHA
    d9aae9b View commit details

Commits on Oct 10, 2023

  1. Copy the full SHA
    d3bd82a View commit details

Commits on Oct 19, 2023

  1. add bug fix instruction

    yieryi committed Oct 19, 2023
    Copy the full SHA
    61a3d00 View commit details
  2. Copy the full SHA
    4a3678a View commit details
  3. Copy the full SHA
    a5fb9aa View commit details

Commits on Oct 20, 2023

  1. run-name -> name

    ggetz committed Oct 20, 2023
    Copy the full SHA
    a3b3552 View commit details
  2. Copy the full SHA
    82bedff View commit details

Commits on Oct 23, 2023

  1. Merge pull request #11560 from yieryi/main

    Fix render error  when dataSource.cluster.enabled  after toggle dataSource.show
    ggetz authored Oct 23, 2023
    Copy the full SHA
    85b8fb5 View commit details
  2. cleanup CHANGES.md

    ggetz committed Oct 23, 2023
    Copy the full SHA
    de86971 View commit details
  3. Check query in specs

    ggetz committed Oct 23, 2023
    Copy the full SHA
    66ecf62 View commit details
  4. Merge pull request #11562 from CesiumGS/bing-maplayer

    Add support for Bing Maps mapLayer template parameters
    ggetz authored Oct 23, 2023
    Copy the full SHA
    400f6e2 View commit details
  5. Copy the full SHA
    d9691e9 View commit details

Commits on Oct 24, 2023

  1. Copy the full SHA
    1443acc View commit details
  2. Copy the full SHA
    3423527 View commit details
  3. Copy the full SHA
    aba3a27 View commit details
  4. Adjust badge

    ggetz committed Oct 24, 2023
    Copy the full SHA
    85ad146 View commit details
  5. main test

    ggetz committed Oct 24, 2023
    Copy the full SHA
    487f632 View commit details
  6. Copy the full SHA
    9034e5b View commit details
  7. Tweak workflow_run

    ggetz committed Oct 24, 2023
    Copy the full SHA
    18e7ec8 View commit details
  8. Copy the full SHA
    bc979f7 View commit details
  9. Copy the full SHA
    53d4cf0 View commit details

Commits on Oct 25, 2023

  1. Copy the full SHA
    dceb5b8 View commit details
  2. Merge pull request #11527 from CesiumGS/github-actions

    Migrate from Travis CI to GitHub actions
    mramato authored Oct 25, 2023
    Copy the full SHA
    9198829 View commit details
  3. Copy the full SHA
    413ce13 View commit details
  4. Merge pull request #11585 from CesiumGS/remove-email

    Remove outdated email from package.json
    ggetz authored Oct 25, 2023
    Copy the full SHA
    25fcf0e View commit details
  5. Copy the full SHA
    aa5049e View commit details
  6. Copy the full SHA
    3ed8014 View commit details
  7. Tweak permissions

    ggetz committed Oct 25, 2023
    Copy the full SHA
    51a25f3 View commit details
  8. Make step naming more generic

    ggetz committed Oct 25, 2023
    Copy the full SHA
    18a2f40 View commit details

Commits on Oct 26, 2023

  1. Copy the full SHA
    11eebeb View commit details
  2. prettier

    ggetz committed Oct 26, 2023
    Copy the full SHA
    4b8ad9e View commit details
  3. Merge pull request #11587 from CesiumGS/google-ion

    Adjust Google Photorealistic 3D Tiles defaults
    ggetz authored Oct 26, 2023
    Copy the full SHA
    4ebc3b4 View commit details
  4. Copy the full SHA
    5cb8f0c View commit details
  5. Update CHANGES.md

    ggetz committed Oct 26, 2023
    Copy the full SHA
    63bfcdc View commit details

Commits on Oct 27, 2023

  1. Copy the full SHA
    42f68ac View commit details

Commits on Oct 30, 2023

  1. Fix deployment url

    mramato committed Oct 30, 2023
    Copy the full SHA
    1fff80a View commit details
  2. Node 18/16 --> Node 20/18

    ggetz committed Oct 30, 2023
    Copy the full SHA
    53e6d6a View commit details
  3. Merge pull request #11594 from CesiumGS/new-bucket

    Update S3 CI location and public URLs
    ggetz authored Oct 30, 2023
    Copy the full SHA
    31ee891 View commit details
  4. Update dev dependencies

    ggetz committed Oct 30, 2023
    Copy the full SHA
    48f32b5 View commit details
  5. Fix typo

    Jeshurun Hembd committed Oct 30, 2023
    Copy the full SHA
    f5f3637 View commit details
Showing with 881 additions and 255 deletions.
  1. +7 −0 .github/actions/verify-package/action.yml
  2. +21 −0 .github/actions/verify-package/script.sh
  3. +120 −0 .github/workflows/dev.yml
  4. +47 −0 .github/workflows/main.yml
  5. +54 −0 .github/workflows/prod.yml
  6. +0 −2 .npmignore
  7. +0 −42 .travis.yml
  8. +422 −0 Apps/Sandcastle/gallery/3D Tiles 1.1 Photogrammetry.html
  9. BIN Apps/Sandcastle/gallery/3D Tiles 1.1 Photogrammetry.jpg
  10. +18 −1 CHANGES.md
  11. +27 −39 Documentation/Contributors/BuildGuide/README.md
  12. BIN Documentation/Contributors/BuildGuide/branches.png
  13. BIN Documentation/Contributors/BuildGuide/checks_failed.jpg
  14. BIN Documentation/Contributors/BuildGuide/environment.jpg
  15. BIN Documentation/Contributors/BuildGuide/github_action_checks.png
  16. BIN Documentation/Contributors/BuildGuide/github_branches.png
  17. BIN Documentation/Contributors/BuildGuide/github_environment_variables.png
  18. BIN Documentation/Contributors/BuildGuide/token.jpg
  19. +2 −2 Documentation/Contributors/CodeReviewGuide/README.md
  20. BIN Documentation/Contributors/CodeReviewGuide/Travis.jpg
  21. BIN Documentation/Contributors/CodeReviewGuide/github_action_checks.png
  22. +1 −1 README.md
  23. +2 −6 Specs/karma.conf.cjs
  24. +19 −31 gulpfile.js
  25. +8 −9 package.json
  26. +1 −1 packages/engine/README.md
  27. +10 −4 packages/engine/Source/Core/EllipsoidRhumbLine.js
  28. +1 −1 packages/engine/Source/Core/Ion.js
  29. +7 −6 packages/engine/Source/Core/PolygonGeometry.js
  30. +1 −1 packages/engine/Source/DataSources/EntityCluster.js
  31. +8 −18 packages/engine/Source/Renderer/UniformState.js
  32. +1 −1 packages/engine/Source/Scene/ArcGisMapService.js
  33. +27 −6 packages/engine/Source/Scene/BingMapsImageryProvider.js
  34. +2 −1 packages/engine/Source/Scene/LabelCollection.js
  35. +0 −1 packages/engine/Source/Scene/createGooglePhotorealistic3DTileset.js
  36. +41 −0 packages/engine/Specs/Core/EllipsoidRhumbLineSpec.js
  37. +28 −5 packages/engine/Specs/Scene/BingMapsImageryProviderSpec.js
  38. +1 −1 packages/engine/Specs/Scene/ShadowVolumeAppearanceSpec.js
  39. +1 −1 packages/engine/package.json
  40. +1 −1 packages/widgets/README.md
  41. +2 −2 packages/widgets/package.json
  42. +1 −1 scripts/build.js
  43. +0 −12 travis/coverage.sh
  44. +0 −13 travis/deploy.sh
  45. +0 −5 travis/prepare.sh
  46. +0 −23 travis/release.sh
  47. +0 −6 travis/test-release.sh
  48. +0 −12 travis/verify.sh
7 changes: 7 additions & 0 deletions .github/actions/verify-package/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name: verify node package
description: verifies Node.js use of the npm package
runs:
using: "composite"
steps:
- run: $GITHUB_ACTION_PATH/script.sh
shell: bash
21 changes: 21 additions & 0 deletions .github/actions/verify-package/script.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/bin/bash
set -ev

node -e "const Cesium = require('./');"
NODE_ENV=development node Specs/test.cjs
NODE_ENV=production node Specs/test.cjs
node Specs/test.mjs

for filename in packages/**/Specs/test.mjs; do
node $filename
done

mkdir ../test
cp cesium*.tgz ../test
cp Specs/test.*js ../test
cd ../test

npm install cesium*.tgz
NODE_ENV=development node test.cjs
NODE_ENV=production node test.cjs
node test.mjs
120 changes: 120 additions & 0 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
name: dev
on:
push:
branches-ignore:
- 'cesium.com'
- production
concurrency:
group: ${{ github.ref }}
cancel-in-progress: true
jobs:
lint:
runs-on: ubuntu-latest
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: lint *.js
run: npm run eslint
- name: lint *.md
run: npm run markdownlint
- name: format code
run: npm run prettier-check
coverage:
runs-on: ubuntu-latest
env:
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 }}
steps:
- uses: actions/checkout@v3
- name: install node 18
uses: actions/setup-node@v3
with:
node-version: '18'
- name: npm install
run: npm install
- name: build
run: npm run build
- name: coverage (firefox)
run: npm run coverage -- --browsers FirefoxHeadless --webgl-stub --failTaskOnError --suppressPassed
- name: upload coverage artifacts
if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
run: aws s3 sync ./Build/Coverage s3://cesium-public-builds/cesium/$BRANCH/Build/Coverage --delete --color on
release-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: install node 18
uses: actions/setup-node@v3
with:
node-version: '18'
- name: npm install
run: npm install
- name: release build
run: npm run build-release
- name: release tests (chrome)
run: npm run test -- --browsers ChromeHeadless --failTaskOnError --webgl-stub --release --suppressPassed
- name: cloc
run: npm run cloc
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 18
uses: actions/setup-node@v3
with:
node-version: '18'
- 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: npm run deploy-s3 -- -b "cesium-public-builds" -d cesium/$BRANCH -c 'no-cache' --confirm
- name: set status
if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
run: npm run deploy-status -- --status success --message Deployed
node-16:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: install node 18
uses: actions/setup-node@v3
with:
node-version: '18'
- name: npm install
run: npm install
- name: release build
run: npm run build-release
- name: package cesium module
run: npm pack &> /dev/null
- name: package workspace modules
run: npm pack --workspaces &> /dev/null
- uses: ./.github/actions/verify-package
47 changes: 47 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: main
on:
workflow_run:
workflows: [dev]
types: [completed]
branches:
- main
- 'cesium.com'
- production
jobs:
if_error_or_failure:
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'failure' }}
steps:
- name: message result in slack
id: slack
uses: slackapi/slack-github-action@v1.24.0
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
with:
channel-id: cesiumjs
payload: |
{
"blocks": [
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": ":gh-failed: Last commit on \"${{ github.ref_name }}\" failed"
}
},
{
"type": "actions",
"elements": [
{
"type": "button",
"text": {
"type": "plain_text",
"text": "See commit"
},
"url": "${{ github.event.head_commit.url }}",
"action_id": "button_1"
}
]
}
]
}
54 changes: 54 additions & 0 deletions .github/workflows/prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: prod
on:
push:
branches:
- 'cesium.com'
jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: install node 18
uses: actions/setup-node@v3
with:
node-version: '18'
- name: npm install
run: npm install
- name: lint *.js
run: npm run eslint
- name: lint *.md
run: npm run markdownlint
- name: format code
run: npm run prettier-check
deploy:
runs-on: ubuntu-latest
permissions:
statuses: write
env:
PROD: true
BUILD_VERSION: ${{ github.ref_name }}.${{ github.run_number }}
AWS_ACCESS_KEY_ID: ${{ secrets.PROD_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.PROD_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 18
uses: actions/setup-node@v3
with:
node-version: '18'
- name: npm install
run: npm install
- name: build website release
run: npm run website-release
- name: build apps
run: npm run build-apps
- name: deploy to cesium.com
if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
run: npm run deploy-s3 -- -b "cesium.com-next" -c 'public, max-age=1800'--skip --confirm
- name: set status
if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
run: npm run deploy-status -- --status success --message Deployed
2 changes: 0 additions & 2 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -8,7 +8,6 @@
/.npmignore
/.project
/.settings
/.travis.yml
/.vscode
/Apps
/Build/Apps
@@ -32,7 +31,6 @@
/server.js
/Source/copyrightHeader.js
/Specs
/travis
/ThirdParty
/Tools
/web.config
42 changes: 0 additions & 42 deletions .travis.yml

This file was deleted.

Loading