Skip to content

Commit e8c9857

Browse files
committed
merge from main
2 parents 6976c82 + e0794b0 commit e8c9857

218 files changed

Lines changed: 4422 additions & 1346 deletions

File tree

Some content is hidden

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

.clang-format

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ PointerAlignment: Left
3232
ConstructorInitializerAllOnOneLineOrOnePerLine: true
3333

3434
# Do not break comment lines that contain the given regex. This
35-
# is here to avoid breaking lines within "{@link SomeClass}"
36-
# which would cause doxygen to fail.
35+
# is here to avoid breaking lines within braced expressions in
36+
# Doxygen comments, which would cause doxygen to fail.
3737
CommentPragmas: '{.*}'
3838

3939
# Disregard any exising include order, and re-order the headers

CHANGES.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# Change Log
22

3-
### ? - ?
3+
### v0.63.0 - 2026-08-03
44

55
##### Additions :tada:
66

7+
- Added support for the [`BENTLEY_materials_line_style`](https://github.com/CesiumGS/glTF/pull/89) extension in `CesiumGltf`, `CesiumGltfReader`, and `CesiumGltfWriter`.
78
- Added support for the [`BENTLEY_materials_point_style`](https://github.com/CesiumGS/glTF/pull/91) extension in `CesiumGltf`, `CesiumGltfReader`, and `CesiumGltfWriter`.
9+
- Added support for the [`KHR_lights_punctual`](https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_lights_punctual) extension in `CesiumGltf`, `CesiumGltfReader`, and `CesiumGltfWriter`.
810
- Added support for reading arrays of arbitrary JSON values in `CesiumJsonReader::ArrayJsonHandler`.
911

1012
##### Fixes :wrench:

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ endif()
194194
include("cmake/defaults.cmake")
195195

196196
project(cesium-native
197-
VERSION 0.62.0
197+
VERSION 0.63.0
198198
LANGUAGES CXX C
199199
)
200200

Cesium3DTiles/generated/include/Cesium3DTiles/Availability.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ struct CESIUM3DTILES_API Availability final
4949
* @brief Integer indicating whether all of the elements are available (1) or
5050
* all are unavailable (0).
5151
*
52-
* Known values are defined in {@link Constant}.
52+
* Known values are defined in @ref Constant.
5353
*
5454
*/
5555
std::optional<int32_t> constant;

Cesium3DTiles/generated/include/Cesium3DTiles/BufferSpec.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ struct CESIUM3DTILES_API BufferSpec : public CesiumUtility::ExtensibleObject {
6161

6262
protected:
6363
/**
64-
* @brief This class is not meant to be instantiated directly. Use {@link Buffer} instead.
64+
* @brief This class is not meant to be instantiated directly. Use @ref Buffer
65+
* instead.
6566
*/
6667
BufferSpec() = default;
6768
friend struct Buffer;

Cesium3DTiles/generated/include/Cesium3DTiles/ClassProperty.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ struct CESIUM3DTILES_API ClassProperty final
105105
/**
106106
* @brief The element type.
107107
*
108-
* Known values are defined in {@link Type}.
108+
* Known values are defined in @ref Type.
109109
*
110110
*/
111111
std::string type = Type::SCALAR;
@@ -114,7 +114,7 @@ struct CESIUM3DTILES_API ClassProperty final
114114
* @brief The datatype of the element's components. Required for `SCALAR`,
115115
* `VECN`, and `MATN` types, and disallowed for other types.
116116
*
117-
* Known values are defined in {@link ComponentType}.
117+
* Known values are defined in @ref ComponentType.
118118
*
119119
*/
120120
std::optional<std::string> componentType;

Cesium3DTiles/generated/include/Cesium3DTiles/Enum.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ struct CESIUM3DTILES_API Enum final : public CesiumUtility::ExtensibleObject {
6262
/**
6363
* @brief The type of the integer enum value.
6464
*
65-
* Known values are defined in {@link ValueType}.
65+
* Known values are defined in @ref ValueType.
6666
*
6767
*/
6868
std::string valueType = ValueType::UINT16;

Cesium3DTiles/generated/include/Cesium3DTiles/ExtensionSchemaMaxarContentGeoJsonGeometryValue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ struct CESIUM3DTILES_API ExtensionSchemaMaxarContentGeoJsonGeometryValue final
4646
/**
4747
* @brief Type of GeoJSON geometry inside the group
4848
*
49-
* Known values are defined in {@link Type}.
49+
* Known values are defined in @ref Type.
5050
*
5151
*/
5252
std::string type = Type::Point;

Cesium3DTiles/generated/include/Cesium3DTiles/ExtensionSchemaMaxarContentGeoJsonPropertiesValue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ struct CESIUM3DTILES_API ExtensionSchemaMaxarContentGeoJsonPropertiesValue final
5252
* @brief Expected datatype of the property value in the GeoJSON Feature's
5353
* 'properties' object
5454
*
55-
* Known values are defined in {@link Type}.
55+
* Known values are defined in @ref Type.
5656
*
5757
*/
5858
std::string type = Type::Integer;

Cesium3DTiles/generated/include/Cesium3DTiles/ImplicitTiling.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ struct CESIUM3DTILES_API ImplicitTiling final
3737
/**
3838
* @brief A string describing the subdivision scheme used within the tileset.
3939
*
40-
* Known values are defined in {@link SubdivisionScheme}.
40+
* Known values are defined in @ref SubdivisionScheme.
4141
*
4242
*/
4343
std::string subdivisionScheme = SubdivisionScheme::QUADTREE;

0 commit comments

Comments
 (0)