Skip to content

Commit 64565a8

Browse files
authored
Merge branch 'main' into 3d-tileset-statistics-performance
2 parents c1b4757 + df31bf3 commit 64565a8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+2707
-891
lines changed

Apps/Sandcastle/gallery/development/Azure 2D Tiles.html renamed to Apps/Sandcastle/gallery/Azure 2D Tiles.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@
2424
window.startup = async function (Cesium) {
2525
"use strict";
2626
//Sandcastle_Begin
27-
Cesium.Ion.defaultServer = "https://api.ion-staging.cesium.com";
28-
Cesium.Ion.defaultAccessToken = "";
29-
30-
const assetId = 1683;
27+
const assetId = 3891169;
3128

3229
const azure = Cesium.ImageryLayer.fromProviderAsync(
3330
Cesium.IonImageryProvider.fromAssetId(assetId),

Apps/Sandcastle/gallery/Imagery Assets available from ion.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,9 @@
4545
{ label: "Google Maps 2D Roadmap", assetId: 3830184 },
4646
{ label: "Google Maps 2D Satellite", assetId: 3830182 },
4747
{ label: "Google Maps 2D Satellite with Labels", assetId: 3830183 },
48-
{ label: "Bing Maps Aerial", assetId: 2 },
49-
{ label: "Bing Maps Aerial with Labels", assetId: 3 },
50-
{ label: "Bing Maps Road", assetId: 4 },
51-
{ label: "Bing Maps Labels Only", assetId: 2411391 },
48+
{ label: "Azure Maps Aerial", assetId: 3891168 },
49+
{ label: "Azure Maps Roads", assetId: 3891169 },
50+
{ label: "Azure Maps Labels Only", assetId: 3891170 },
5251
{ label: "Sentinel-2", assetId: 3954 },
5352
];
5453

Apps/Sandcastle/gallery/Imagery Layers.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
"use strict";
3131
//Sandcastle_Begin
3232
const viewer = new Cesium.Viewer("cesiumContainer", {
33-
baseLayer: Cesium.ImageryLayer.fromWorldImagery({
34-
style: Cesium.IonWorldImageryStyle.AERIAL_WITH_LABELS,
35-
}),
33+
baseLayer: Cesium.ImageryLayer.fromProviderAsync(
34+
Cesium.IonImageryProvider.fromAssetId(3830183),
35+
),
3636
baseLayerPicker: false,
3737
});
3838
const layers = viewer.scene.imageryLayers;

CHANGES.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
# Change Log
22

3-
## 1.136
3+
## 1.136 - 2025-12-01
44

55
### @cesium/engine
66

77
#### Fixes :wrench:
88

9+
- Fixed depth testing bug with billboards and labels clipping through models [#13012](https://github.com/CesiumGS/cesium/issues/13012)
910
- Billboards using `imageSubRegion` now render as expected. [#12585](https://github.com/CesiumGS/cesium/issues/12585)
1011
- Improved rendering performance when a 3D tileset is loaded [#12974](https://github.com/CesiumGS/cesium/pull/12974)
12+
- Improved scaling of SVGs in billboards [#13020](https://github.com/CesiumGS/cesium/issues/13020)
13+
- Fixed unexpected outline artifacts around billboards [#13038](https://github.com/CesiumGS/cesium/issues/13038)
1114

1215
#### Additions :tada:
1316

1417
- Added `scene.pickAsync` for non GPU blocking picking using WebGL2 [#12983](https://github.com/CesiumGS/cesium/pull/12983)
18+
- Improves performance of terrain picks via new terrain picking quadtrees [#8481](https://github.com/CesiumGS/cesium/issues/8481)
1519

1620
## 1.135 - 2025-11-03
1721

CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
105105
- [Daniel Zhong](https://github.com/danielzhong)
106106
- [Mark Schlosser](https://github.com/markschlosseratbentley)
107107
- [Adam Larkeryd](https://github.com/alarkbentley)
108+
- [Don McCurdy](https://github.com/donmccurdy)
108109
- [Flightradar24 AB](https://www.flightradar24.com)
109110
- [Aleksei Kalmykov](https://github.com/kalmykov)
110111
- [BIT Systems](http://www.caci.com/bit-systems)

gulpfile.makezip.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ export const makeZip = gulp.series(
146146
gulp.src(
147147
[
148148
"Apps/**",
149-
"Apps/Sandcastle/.jshintrc",
150149
"packages/engine/index.js",
151150
"packages/engine/index.d.ts",
152151
"packages/engine/LICENSE.md",
@@ -171,6 +170,7 @@ export const makeZip = gulp.series(
171170
"CHANGES.md",
172171
"README.md",
173172
"web.config",
173+
"!Apps/Sandcastle/**",
174174
"!scripts/buildSandcastle.js",
175175
"!**/*.gitignore",
176176
"!Specs/e2e/*-snapshots/**",

index.release.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<div class="section">
4848
<a href="https://cesium.com/cesiumjs/"
4949
><img
50-
src="./Apps/Sandcastle/images/Cesium_Logo_Color_Overlay.png"
50+
src="./Apps/Sandcastle2/images/Cesium_Logo_Color_Overlay.png"
5151
style="width: 400px"
5252
/></a>
5353
</div>

packages/engine/Source/Core/AxisAlignedBoundingBox.js

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,30 @@ AxisAlignedBoundingBox.intersectPlane = function (box, plane) {
222222
return Intersect.INTERSECTING;
223223
};
224224

225+
/**
226+
* Determines whether two axis aligned bounding boxes intersect.
227+
*
228+
* @param {AxisAlignedBoundingBox} box first box
229+
* @param {AxisAlignedBoundingBox} other second box
230+
* @returns {boolean} <code>true</code> if the boxes intersect; otherwise, <code>false</code>.
231+
*/
232+
AxisAlignedBoundingBox.intersectAxisAlignedBoundingBox = function (box, other) {
233+
//>>includeStart('debug', pragmas.debug);
234+
Check.defined("box", box);
235+
Check.defined("other", other);
236+
//>>includeEnd('debug');
237+
238+
// This short circuits in favor of AABBs that do not intersect.
239+
return (
240+
box.minimum.x <= other.maximum.x &&
241+
box.maximum.x >= other.minimum.x &&
242+
box.minimum.y <= other.maximum.y &&
243+
box.maximum.y >= other.minimum.y &&
244+
box.minimum.z <= other.maximum.z &&
245+
box.maximum.z >= other.minimum.z
246+
);
247+
};
248+
225249
/**
226250
* Duplicates this AxisAlignedBoundingBox instance.
227251
*
@@ -245,6 +269,18 @@ AxisAlignedBoundingBox.prototype.intersectPlane = function (plane) {
245269
return AxisAlignedBoundingBox.intersectPlane(this, plane);
246270
};
247271

272+
/**
273+
* Determines whether some other axis aligned bounding box intersects this box.
274+
*
275+
* @param {AxisAlignedBoundingBox} other The other axis aligned bounding box.
276+
* @returns {boolean} <code>true</code> if the boxes intersect; otherwise, <code>false</code>.
277+
*/
278+
AxisAlignedBoundingBox.prototype.intersectAxisAlignedBoundingBox = function (
279+
other,
280+
) {
281+
return AxisAlignedBoundingBox.intersectAxisAlignedBoundingBox(this, other);
282+
};
283+
248284
/**
249285
* Compares this AxisAlignedBoundingBox against the provided AxisAlignedBoundingBox componentwise and returns
250286
* <code>true</code> if they are equal, <code>false</code> otherwise.

packages/engine/Source/Core/Cesium3DTilesTerrainData.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ Cesium3DTilesTerrainData.prototype.createMesh = function (options) {
305305
vertexCountWithoutSkirts,
306306
minimumHeight,
307307
maximumHeight,
308+
rectangle,
308309
boundingSphere,
309310
horizonOcclusionPoint,
310311
encoding.stride,
@@ -831,6 +832,7 @@ function upsampleMesh(
831832
vertexCountWithoutSkirts,
832833
minimumHeight,
833834
maximumHeight,
835+
upsampleRectangle,
834836
boundingSphere,
835837
horizonOcclusionPoint,
836838
stride,

0 commit comments

Comments
 (0)