Merge branch 'gltf-pbr-specular' into gltf-pbr-anisotropy

Apps/Sandcastle/gallery/Picking.html

@@ -229,12 +229,7 @@
 
  const scene = viewer.scene;
  if (scene.mode !== Cesium.SceneMode.MORPHING) {
- const pickedObject = scene.pick(movement.endPosition);
- if (
- scene.pickPositionSupported &&
- Cesium.defined(pickedObject) &&
- pickedObject.id === modelEntity
- ) {
+ if (scene.pickPositionSupported) {
  const cartesian = viewer.scene.pickPosition(
  movement.endPosition
  );

Apps/Sandcastle/gallery/development/glTF PBR Specular.html

@@ -316,9 +316,20 @@
  );
 
  let model;
- loadModel(
- "../../SampleData/models/SpecularTest/glTF-Binary/SpecularTest.glb"
- );
+ try {
+ const resource = await Cesium.IonResource.fromAssetId(2572779);
+ model = await Cesium.Model.fromGltfAsync({
+ url: resource,
+ modelMatrix: modelMatrix,
+ imageBasedLighting,
+ });
+
+ scene.primitives.add(model);
+
+ model.readyEvent.addEventListener(() => zoomToModel(model));
+ } catch (error) {
+ window.alert(`Error loading model: ${error}`);
+ }
 
  Sandcastle.addToggleButton(
  "Enable KHR_materials_specular",
@@ -329,25 +340,6 @@
  }
  );
 
- async function loadModel(modelURL) {
- try {
- model = await Cesium.Model.fromGltfAsync({
- url: modelURL,
- modelMatrix: modelMatrix,
- imageBasedLighting,
- });
-
- scene.primitives.removeAll();
- scene.primitives.add(model);
-
- model.readyEvent.addEventListener(() => {
- zoomToModel(model);
- });
- } catch (error) {
- window.alert(`Error loading model: ${error}`);
- }
- }
-
  function zoomToModel(model) {
  const controller = scene.screenSpaceCameraController;
  const r = Math.max(

CHANGES.md

@@ -1,14 +1,21 @@
 # Change Log
 
-### 1.118
+### 1.118 - 2024-06-03
 
 #### @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)
 
-### 1.117
+#### 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)
+- Fixed a bug where cross-origin workers would error when loaded with the CommonJS `importScripts` shim instead of an ESM `import`. [#11833](https://github.com/CesiumGS/cesium/pull/11833)
+- Corrected the Typescript types for `Billboard.id` and `Label.id` to be `any` [#11973](https://github.com/CesiumGS/cesium/issues/11973)
+
+### 1.117 - 2024-05-01
 
 #### @cesium/engine
 

CONTRIBUTORS.md

@@ -130,6 +130,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
  - [Andrew McDowell](https://github.com/madole)
  - [Tony Luk](https://github.com/impactblue573)
  - [Daniel Cooper](https://github.com/moodragon46)
+ - [Harry Morris](https://github.com/harrythemorris)
 - [GeoFS](https://www.geo-fs.com)
  - [Xavier Tassin](https://github.com/xtassin/)
 - [Esri](https://www.esri.com)

Specs/Data/Models/glTF-2.0/BoxSpecular/README.md

@@ -0,0 +1,11 @@
+# Box Specular
+
+## Screenshot
+
+![screenshot](screenshot/screenshot.png)
+
+## License Information
+
+Developed by Cesium for testing the KHR_materials_specular extension. 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/).