Skip to content

Commit

Permalink
Merge tag '1.119' into cesium.com
Browse files Browse the repository at this point in the history
1.119 release
  • Loading branch information
ggetz committed Jul 1, 2024
2 parents 7457344 + e0fb750 commit 9978128
Show file tree
Hide file tree
Showing 142 changed files with 1,374 additions and 693 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ To ensure your Pull Request is reviewed and accepted quickly, please refer to ou
- [ ] I have added my name to `CONTRIBUTORS.md`
- [ ] I have updated `CHANGES.md` with a short summary of my change
- [ ] I have added or updated unit tests to ensure consistent code coverage
- [ ] I have update the inline documentation, and included code examples where relevant
- [ ] I have updated the inline documentation, and included code examples where relevant
- [ ] I have performed a self-review of my code
12 changes: 6 additions & 6 deletions .slackbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ releaseSchedule:
- jjspace, 4/1/2024
- ggetz, 5/1/2024
- jjhembd, 6/1/2024
- jjspace, 7/1/2024
- ggetz, 8/1/2024
- jjhembd, 9/1/2024
- jjspace, 10/1/2024
- ggetz, 11/1/2024
- jjhembd, 12/1/2024
- ggetz, 7/1/2024
- jjhembd, 8/1/2024
- jjspace, 9/1/2024
- ggetz, 10/1/2024
- jjhembd, 11/1/2024
- jjspace, 12/1/2024

41 changes: 38 additions & 3 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,41 @@
# Change Log

## 1.118.2 - 2024-06-03
### 1.119 - 2024-07-01

#### @cesium/engine

##### Additions :tada:

- Added `Ellipsoid.default` to allow a central place to specify a default ellipsoid value to be used throughout the API where an ellipsoid is not otherwise specified. [#4245](https://github.com/CesiumGS/cesium/issues/4245)
- Various defaults have been updated to adjust when `Ellipsoid.default` is changed to a value other than the WGS84 ellipsoid.
- Added `Scene.ellipsoid`, `CesiumWidget.ellipsoid`, and `Viewer.ellipsoid` to set the default ellipsoid used for rendering.
- Added `SkyBox.createEarthSkyBox` which creates a skybox instance with the default starmap for the Earth.
- Added support for the `scale` property of a normal texture in a glTF material. [#12018](https://github.com/CesiumGS/cesium/pull/12018)

##### Fixes :wrench:

- Fixed diffuse color calculation for PBR materials. Many models will now appear slightly brighter. [#12043](https://github.com/CesiumGS/cesium/pull/12043)
- Fixed the calculation of base color in materials using the KHR_materials_specular extension [#12041](https://github.com/CesiumGS/cesium/issues/12041).
- Fixed issue where Entities would not use a custom ellipsoid. [#3543](https://github.com/CesiumGS/cesium/issues/3543)
- Adjusted spacing for on screen Credits and updated recommendations for positioning custom ones. [#11912](https://github.com/CesiumGS/cesium/issues/11912)
- Fixed issue where Property 'availability' is missing in type 'CustomHeightmapTerrainProvider' but required in type 'TerrainProvider' when using with typescript

##### Breaking Changes :mega:

- `CircleGeometry.unpack` now defaults to `Ellipsoid.default` rather than `Ellipsoid.UNIT_SPHERE`.

##### Deprecated :hourglass_flowing_sand:

- `SceneTransforms.wgs84ToDrawingBufferCoordinates` has been deprecated. It will be removed in 1.121. Use `SceneTransforms.worldToDrawingBufferCoordinates` instead.
- `SceneTransforms.wgs84ToWindowCoordinates` has been deprecated. It will be removed in 1.21. Use `SceneTransforms.worldToWindowCoordinates` instead.

#### @cesium/widgets

##### Breaking Changes :mega:

- `BaseLayerPicker` no longer overrides the default imagery or terrain unless `options.selectedImageryProviderViewModel` or `options.selectedTerrainProviderViewModel` is provided respectively.

### 1.118.2 - 2024-06-03

This is an npm-only release to fix a dependency issue published in 1.118.1

Expand All @@ -12,13 +47,13 @@ This is an npm-only release to fix a dependency issue published in 1.118

#### @cesium/engine

###### Additions :tada:
##### Additions :tada:

- Added support for glTF models with the [KHR_materials_specular extension](https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_materials_specular). [#11970](https://github.com/CesiumGS/cesium/pull/11970)
- Added support for glTF models with the [KHR_materials_anisotropy extension](https://github.com/KhronosGroup/glTF/blob/main/extensions/2.0/Khronos/KHR_materials_anisotropy/README.md). [#11988](https://github.com/CesiumGS/cesium/pull/11988)
- Added support for glTF models with the [KHR_materials_clearcoat extension](https://github.com/KhronosGroup/glTF/blob/main/extensions/2.0/Khronos/KHR_materials_clearcoat/README.md). [#12006](https://github.com/CesiumGS/cesium/pull/12006)

#### Fixes :wrench:
##### Fixes :wrench:

- Fixed a bug where `scene.pickPosition` returned incorrect results against the globe when `depthTestAgainstTerrain` is `false`. [#4368](https://github.com/CesiumGS/cesium/issues/4368)
- Fixed a bug where `TaskProcessor` worker loading would check the worker module ID rather than the absolute URL when determining if it is cross-origin. [#11833](https://github.com/CesiumGS/cesium/pull/11833)
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -390,3 +390,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
- [dslming](https://github.com/dslming)
- [Peter A. Jonsson](https://github.com/pjonsson)
- [Zhongxiang Wang](https://github.com/plainheart)
- [Tim Schneider](https://github.com/Tim-S)
9 changes: 5 additions & 4 deletions Documentation/Contributors/ReleaseGuide/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ There is no release manager; instead, our community shares the responsibility. A
6. Update the Cesium ion demo token in `Ion.js` with a new token from the CesiumJS ion team account with read and geocode permissions. These tokens are named like this: `1.85 Release - Delete on November 1st, 2021`. Delete the token from 2 releases ago.
7. Update the ArcGIS Developer API key in `ArcGisMapService.js` with a new API key from the CesiumJS ArcGIS Developer account. These API keys are named like this: `1.85 Release - Delete on November 1st, 2021`. Delete the API key from the last release.
8. Proofread [`CHANGES.md`](../../../CHANGES.md) with the date of the release. Adjust the order of changes so that prominent/popular changes come first. Ensure each change is in the section for the relevant workspace.
9. Based on `CHANGES.md`, update each workspace version following the rules of [semantic versioning](https://semver.org/), e.g.,
- `npm version minor -w @cesium/engine --no-git-tag-version`
9. Based on `CHANGES.md`, update each workspace version following the rules of [semantic versioning](https://semver.org/), e.g.,
`npm version minor -w @cesium/engine --no-git-tag-version`.
Changes in one workspace may require version updates in other workspaces that depend on it. For example, if `CHANGES.md` reports changes in `@cesium/engine` only, the version for `@cesium/widgets` should also be incremented to reflect the updated dependency.
10. Update the version in `package.json` to match, e.g. `1.115.0` -> `1.116.0`.
11. Commit these changes.
12. Make sure the repository is clean `git clean -d -x -f --exclude="/Specs/e2e/*-snapshots/"`. **This will delete all files not already in the repository, excluding end to end testing snapshots.**
Expand Down Expand Up @@ -54,10 +55,10 @@ There is no release manager; instead, our community shares the responsibility. A
- Look at a [previous release](https://github.com/CesiumGS/cesium/releases/tag/1.79) for an example. Don't use emoji, headings, or other formatting
- Attach the `Cesium-1.xx` release zip file
- Publish the release
28. Publish to npm by running `npm publish` in the repository root (not the unzipped file directory) (the first time you do this, you will need to authorize the machine using `npm adduser`)
29. Use `npm publish -w <WORKSPACE>` in the repository root (not the unzipped file directory) to publish the workspace. Repeat this step for each **updated** workspace, in the following order:
28. Use `npm publish -w <WORKSPACE>` in the repository root (not the unzipped file directory) to publish the workspaces. Repeat this step for each **updated** workspace, in the following order:
- `npm publish -w @cesium/engine`
- `npm publish -w @cesium/widgets`
29. Publish the top-level `cesium` package to npm by running `npm publish` in the repository root (not the unzipped file directory) (the first time you do this, you will need to authorize the machine using `npm adduser`).
30. Check out the `cesium.com` branch. Merge the new release tag into the `cesium.com` branch `git merge origin <tag-name>`. CI will deploy the hosted release, Sandcastle, and the updated doc when you push the branch up.
31. After the `cesium.com` branch is live on cesium.com, comment in the `#comms-chat` slack channel to notify comms that the release is done so they can add these highlights and publish the monthly blog post
- Note, it may take a little while for the new version of CesiumJS to be live on cesium.com (~30 minutes after the branch builds). You can check the version of Cesium in [sandcastle](https://sandcastle.cesium.com/) by looking at the tab above the cesium pane.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@
"index": 0
},
"clearcoatNormalTexture": {
"index": 0
"index": 0,
"scale": 0.5
}
}
}
Expand Down
7 changes: 7 additions & 0 deletions Specs/Data/Models/glTF-2.0/BoxScaledNormalTexture/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Box with Scaled Normal Texture

## License Information

Developed by Cesium for testing a scaled normal texture. Please follow the [Cesium Trademark Terms and Conditions](https://github.com/AnalyticalGraphicsInc/cesium/wiki/CesiumTrademark.pdf).

This model is licensed under a [Creative Commons Attribution 4.0 International License](http://creativecommons.org/licenses/by/4.0/).
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
{
"asset": {
"generator": "COLLADA2GLTF",
"version": "2.0"
},
"scene": 0,
"scenes": [
{
"nodes": [
0
]
}
],
"nodes": [
{
"children": [
1
],
"matrix": [
1.0,
0.0,
0.0,
0.0,
0.0,
0.0,
-1.0,
0.0,
0.0,
1.0,
0.0,
0.0,
0.0,
0.0,
0.0,
1.0
]
},
{
"mesh": 0
}
],
"meshes": [
{
"primitives": [
{
"attributes": {
"NORMAL": 1,
"POSITION": 2,
"TEXCOORD_0": 3
},
"indices": 0,
"mode": 4,
"material": 0
}
],
"name": "Mesh"
}
],
"accessors": [
{
"bufferView": 0,
"byteOffset": 0,
"componentType": 5123,
"count": 36,
"max": [
23
],
"min": [
0
],
"type": "SCALAR"
},
{
"bufferView": 1,
"byteOffset": 0,
"componentType": 5126,
"count": 24,
"max": [
1.0,
1.0,
1.0
],
"min": [
-1.0,
-1.0,
-1.0
],
"type": "VEC3"
},
{
"bufferView": 1,
"byteOffset": 288,
"componentType": 5126,
"count": 24,
"max": [
0.5,
0.5,
0.5
],
"min": [
-0.5,
-0.5,
-0.5
],
"type": "VEC3"
},
{
"bufferView": 2,
"byteOffset": 0,
"componentType": 5126,
"count": 24,
"max": [
6.0,
1.0
],
"min": [
0.0,
0.0
],
"type": "VEC2"
}
],
"materials": [
{
"pbrMetallicRoughness": {
"baseColorTexture": {
"index": 0
},
"metallicFactor": 0.0
},
"normalTexture": {
"index": 0,
"scale": 0.5
},
"name": "Texture"
}
],
"textures": [
{
"sampler": 0,
"source": 0
}
],
"images": [
{
"uri": "CesiumLogoFlat.png"
}
],
"samplers": [
{
"magFilter": 9729,
"minFilter": 9986,
"wrapS": 10497,
"wrapT": 10497
}
],
"bufferViews": [
{
"buffer": 0,
"byteOffset": 768,
"byteLength": 72,
"target": 34963
},
{
"buffer": 0,
"byteOffset": 0,
"byteLength": 576,
"byteStride": 12,
"target": 34962
},
{
"buffer": 0,
"byteOffset": 576,
"byteLength": 192,
"byteStride": 8,
"target": 34962
}
],
"buffers": [
{
"byteLength": 840,
"uri": "BoxScaledNormalTexture.bin"
}
],
"extensionsRequired": [
"KHR_draco_mesh_compression"
],
"extensionsUsed": [
"KHR_draco_mesh_compression"
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ThirdParty.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
"license": [
"MIT"
],
"version": "0.20.0",
"version": "0.21.0",
"url": "https://www.npmjs.com/package/meshoptimizer"
},
{
Expand All @@ -158,7 +158,7 @@
"license": [
"BSD-3-Clause"
],
"version": "7.3.0",
"version": "7.3.2",
"url": "https://www.npmjs.com/package/protobufjs"
},
{
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -1690,7 +1690,7 @@ async function buildSandcastle() {

if (isProduction) {
const fileStream = gulp
.src(["ThirdParty/**"])
.src(["ThirdParty/**"], { encoding: false })
.pipe(gulp.dest("Build/Sandcastle/ThirdParty"));
streams.push(fileStream);

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cesium",
"version": "1.118.0",
"version": "1.119.0",
"description": "CesiumJS is a JavaScript library for creating 3D globes and 2D maps in a web browser without a plugin.",
"homepage": "http://cesium.com/cesiumjs/",
"license": "Apache-2.0",
Expand Down Expand Up @@ -50,8 +50,8 @@
"./Specs/**/*"
],
"dependencies": {
"@cesium/engine": "^9.2.0",
"@cesium/widgets": "^6.1.2"
"@cesium/engine": "^10.0.0",
"@cesium/widgets": "^7.0.0"
},
"devDependencies": {
"@playwright/test": "^1.41.1",
Expand Down Expand Up @@ -158,4 +158,4 @@
"packages/engine",
"packages/widgets"
]
}
}
Loading

0 comments on commit 9978128

Please sign in to comment.