Skip to content

Commit e7916be

Browse files
authored
Merge branch 'main' into edge_line_unique_VAO
2 parents 17b7dd6 + ed6f310 commit e7916be

File tree

64 files changed

+366
-169
lines changed

Some content is hidden

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

64 files changed

+366
-169
lines changed

Apps/Sandcastle/gallery/Custom DataSource.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
/**
6565
* Gets a human-readable name for this instance.
6666
* @memberof WebGLGlobeDataSource.prototype
67-
* @type {String}
67+
* @type {string}
6868
*/
6969
name: {
7070
get: function () {
@@ -93,7 +93,7 @@
9393
/**
9494
* Gets a value indicating if the data source is currently loading data.
9595
* @memberof WebGLGlobeDataSource.prototype
96-
* @type {Boolean}
96+
* @type {boolean}
9797
*/
9898
isLoading: {
9999
get: function () {
@@ -150,7 +150,7 @@
150150
* so that only one series is viewed at a time. Valid values are defined
151151
* in the seriesNames property.
152152
* @memberof WebGLGlobeDataSource.prototype
153-
* @type {String}
153+
* @type {string}
154154
*/
155155
seriesToDisplay: {
156156
get: function () {
@@ -174,7 +174,7 @@
174174
/**
175175
* Gets or sets the scale factor applied to the height of each line.
176176
* @memberof WebGLGlobeDataSource.prototype
177-
* @type {Number}
177+
* @type {number}
178178
*/
179179
heightScale: {
180180
get: function () {
@@ -190,7 +190,7 @@
190190
/**
191191
* Gets whether or not this data source should be displayed.
192192
* @memberof WebGLGlobeDataSource.prototype
193-
* @type {Boolean}
193+
* @type {boolean}
194194
*/
195195
show: {
196196
get: function () {

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
- Improved performance of `scene.drillPick`. [#12916](https://github.com/CesiumGS/cesium/pull/12916)
2626
- Improved performance when removing primitives. [#3018](https://github.com/CesiumGS/cesium/pull/3018)
2727
- Improved performance of terrain Quadtree handling of custom data [#12907](https://github.com/CesiumGS/cesium/pull/12907)
28+
- Fixed picking of `GroundPrimitive` with multiple `PolygonGeometry` instances selecting the wrong instance. [#12978](https://github.com/CesiumGS/cesium/pull/12978)
2829

2930
## 1.134.1 - 2025-10-10
3031

packages/engine/Source/Core/ArcGISTiledElevationTerrainProvider.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import WebMercatorTilingScheme from "./WebMercatorTilingScheme.js";
2222
const ALL_CHILDREN = 15;
2323

2424
/**
25-
* @typedef {Object} ArcGISTiledElevationTerrainProvider.ConstructorOptions
25+
* @typedef {object} ArcGISTiledElevationTerrainProvider.ConstructorOptions
2626
*
2727
* Initialization options for the ArcGISTiledElevationTerrainProvider constructor
2828
*
@@ -339,7 +339,7 @@ Object.defineProperties(ArcGISTiledElevationTerrainProvider.prototype, {
339339
* Creates a {@link TerrainProvider} that produces terrain geometry by tessellating height maps
340340
* retrieved from Elevation Tiles of an an ArcGIS ImageService.
341341
*
342-
* @param {Resource|String|Promise<Resource>|Promise<String>} url The URL of the ArcGIS ImageServer service.
342+
* @param {Resource|string|Promise<Resource>|Promise<string>} url The URL of the ArcGIS ImageServer service.
343343
* @param {ArcGISTiledElevationTerrainProvider.ConstructorOptions} [options] A url or an object describing initialization options.
344344
* @returns {Promise<ArcGISTiledElevationTerrainProvider>}
345345
*

packages/engine/Source/Core/CesiumTerrainProvider.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function LayerInformation(layer) {
3939
}
4040

4141
/**
42-
* @typedef {Object} CesiumTerrainProvider.ConstructorOptions
42+
* @typedef {object} CesiumTerrainProvider.ConstructorOptions
4343
*
4444
* Initialization options for the CesiumTerrainProvider constructor
4545
*
@@ -1198,7 +1198,7 @@ CesiumTerrainProvider.fromIonAssetId = async function (assetId, options) {
11981198
* <li> {@link https://github.com/AnalyticalGraphicsInc/cesium/wiki/heightmap-1.0 Height Map} </li>
11991199
* </ul>
12001200
*
1201-
* @param {Resource|String|Promise<Resource>|Promise<String>} url The URL of the Cesium terrain server.
1201+
* @param {Resource|string|Promise<Resource>|Promise<string>} url The URL of the Cesium terrain server.
12021202
* @param {CesiumTerrainProvider.ConstructorOptions} [options] An object describing initialization options.
12031203
* @returns {Promise<CesiumTerrainProvider>}
12041204
*

packages/engine/Source/Core/EllipsoidalOccluder.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ EllipsoidalOccluder.prototype.computeHorizonCullingPointPossiblyUnderEllipsoid =
247247
* A reasonable direction to use is the direction from the center of the ellipsoid to
248248
* the center of the bounding sphere computed from the positions. The direction need not
249249
* be normalized.
250-
* @param {number[]} vertices The vertices from which to compute the horizon culling point. The positions
250+
* @param {number[]|Float32Array|Float64Array} vertices The vertices from which to compute the horizon culling point. The positions
251251
* must be expressed in a reference frame centered at the ellipsoid and aligned with the
252252
* ellipsoid's axes.
253253
* @param {number} [stride=3]
@@ -277,7 +277,7 @@ EllipsoidalOccluder.prototype.computeHorizonCullingPointFromVertices =
277277
* A reasonable direction to use is the direction from the center of the ellipsoid to
278278
* the center of the bounding sphere computed from the positions. The direction need not
279279
* be normalized.
280-
* @param {number[]} vertices The vertices from which to compute the horizon culling point. The positions
280+
* @param {number[]|Float32Array|Float64Array} vertices The vertices from which to compute the horizon culling point. The positions
281281
* must be expressed in a reference frame centered at the ellipsoid and aligned with the
282282
* ellipsoid's axes.
283283
* @param {number} [stride=3]

packages/engine/Source/Core/GoogleEarthEnterpriseMetadata.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Object.defineProperties(GoogleEarthEnterpriseMetadata.prototype, {
140140
* Creates a metadata object using the Google Earth Enterprise REST API. This is used by the GoogleEarthEnterpriseImageryProvider
141141
* and GoogleEarthEnterpriseTerrainProvider to share metadata requests.
142142
*
143-
* @param {Resource|String} resourceOrUrl The url of the Google Earth Enterprise server hosting the imagery.
143+
* @param {Resource|string} resourceOrUrl The url of the Google Earth Enterprise server hosting the imagery.
144144
*
145145
* @returns {Promise<GoogleEarthEnterpriseMetadata>} A promise which resolves to the created GoogleEarthEnterpriseMetadata instance/
146146
*/

packages/engine/Source/Core/GoogleEarthEnterpriseTerrainData.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ GoogleEarthEnterpriseTerrainData.prototype.upsample = function (
380380

381381
/**
382382
* Determines if a given child tile is available, based on the
383-
* {@link HeightmapTerrainData.childTileMask}. The given child tile coordinates are assumed
383+
* {@link GoogleEarthEnterpriseTerrainData.childTileMask}. The given child tile coordinates are assumed
384384
* to be one of the four children of this tile. If non-child tile coordinates are
385385
* given, the availability of the southeast child tile is returned.
386386
*

packages/engine/Source/Core/GoogleEarthEnterpriseTerrainProvider.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ TerrainCache.prototype.tidy = function () {
6565
};
6666

6767
/**
68-
* @typedef {Object} GoogleEarthEnterpriseTerrainProvider.ConstructorOptions
68+
* @typedef {object} GoogleEarthEnterpriseTerrainProvider.ConstructorOptions
6969
*
7070
* Initialization options for GoogleEarthEnterpriseTerrainProvider constructor
7171
*

packages/engine/Source/Core/ITwinPlatform.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,21 +114,21 @@ ITwinPlatform.apiEndpoint = new Resource({
114114
});
115115

116116
/**
117-
* @typedef {Object} ExportRequest
117+
* @typedef {object} ExportRequest
118118
* @private
119119
* @property {string} iModelId
120120
* @property {string} changesetId
121121
* @property {ITwinPlatform.ExportType} exportType Type of the export. CesiumJS only supports the 3DTILES type
122122
*/
123123

124124
/**
125-
* @typedef {Object} Link
125+
* @typedef {object} Link
126126
* @private
127127
* @property {string} href
128128
*/
129129

130130
/**
131-
* @typedef {Object} ExportRepresentation
131+
* @typedef {object} ExportRepresentation
132132
* The export objects from get-exports when using return=representation
133133
* @private
134134
* @property {string} id Export id
@@ -140,7 +140,7 @@ ITwinPlatform.apiEndpoint = new Resource({
140140
*/
141141

142142
/**
143-
* @typedef {Object} GetExportsResponse
143+
* @typedef {object} GetExportsResponse
144144
* @private
145145
* @property {ExportRepresentation[]} exports The list of exports for the current page
146146
* @property {{self: Link, next: Link | undefined, prev: Link | undefined}} _links Pagination links
@@ -224,14 +224,14 @@ ITwinPlatform.getExports = async function (iModelId, changesetId) {
224224
};
225225

226226
/**
227-
* @typedef {Object} RealityDataExtent
227+
* @typedef {object} RealityDataExtent
228228
* @private
229229
* @property {{latitude: number, longitude: number}} southWest
230230
* @property {{latitude: number, longitude: number}} northEast
231231
*/
232232

233233
/**
234-
* @typedef {Object} RealityDataRepresentation
234+
* @typedef {object} RealityDataRepresentation
235235
* @private
236236
* @property {string} id "95d8dccd-d89e-4287-bb5f-3219acbc71ae",
237237
* @property {string} displayName "Name of reality data",

packages/engine/Source/Core/PixelFormat.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,8 @@ PixelFormat.alignmentInBytes = function (pixelFormat, pixelDatatype, width) {
464464
* @private
465465
* @param {PixelFormat} pixelFormat The pixel format.
466466
* @param {PixelDatatype} pixelDatatype The pixel datatype.
467-
* @param {Number} width The width of the texture.
468-
* @param {Number} height The height of the texture.
467+
* @param {number} width The width of the texture.
468+
* @param {number} height The height of the texture.
469469
* @returns {TypedArray} The typed array.
470470
*/
471471
PixelFormat.createTypedArray = function (

0 commit comments

Comments
 (0)