Skip to content

Commit

Permalink
Merge branch 'main' into quantized-and-implicit
Browse files Browse the repository at this point in the history
  • Loading branch information
j9liu committed Nov 15, 2023
2 parents 96b632b + 007fe0b commit b12ae77
Show file tree
Hide file tree
Showing 17 changed files with 419 additions and 441 deletions.
5 changes: 5 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@

- Fixed a bug in `OrientedBoundingBox::contains` where it didn't account for the bounding box's center.

##### Fixes :wrench:

- Fixed compiler error when calling `PropertyAttributeView::forEachProperty`.

### v0.29.0 - 2023-11-01

##### Breaking Changes :mega:
Expand All @@ -43,6 +47,7 @@

- Added `getClass` to `PropertyTableView`, `PropertyTextureView`, and `PropertyAttributeView`. This can be used to retrieve the metadata `Class` associated with the view.
- Added `PropertyViewStatus::EmptyPropertyWithDefault` to indicate when a property contains no data, but has a valid default value.
- A glTF `bufferView` with a `byteStride` of zero is now treated as if the `byteStride` is not defined at all. Such a glTF technically violates the spec (the minimum value is 4), but the new behavior is sensible enough and consistent with CesiumJS.

##### Fixes :wrench:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class TileBoundingVolumes {
*
* @param boundingVolume The bounding volume from which to get the region.
* @return The region, or `std::nullopt` if the bounding volume does not
* define a region. The box is defined in geographic coordinates.
* define a region. The region is defined in geographic coordinates.
*/
static std::optional<CesiumGeospatial::BoundingRegion>
getBoundingRegion(const Cesium3DTiles::BoundingVolume& boundingVolume);
Expand Down
2 changes: 0 additions & 2 deletions Cesium3DTilesSelection/src/TilesetContentManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1173,8 +1173,6 @@ bool TilesetContentManager::tileNeedsMainThreadLoading(
tile.isRenderContent();
}

namespace {}

void TilesetContentManager::finishLoading(
Tile& tile,
const TilesetOptions& tilesetOptions) {
Expand Down
1 change: 0 additions & 1 deletion Cesium3DTilesSelection/test/TestTilesetJsonLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
using namespace CesiumAsync;
using namespace Cesium3DTilesSelection;
using namespace CesiumNativeTests;
using namespace CesiumNativeTests;

namespace {
std::filesystem::path testDataPath = Cesium3DTilesSelection_TEST_DATA_DIR;
Expand Down
2 changes: 1 addition & 1 deletion CesiumGeometry/include/CesiumGeometry/BoundingSphere.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class CESIUMGEOMETRY_API BoundingSphere final {
* 4x4 matrix.
*
* If the transformation has non-uniform scale, the bounding sphere's radius
* is scaled by the scale of the transformation's axis with the largest scale.
* is scaled by the largest scale value among the transformation's axes.
*
* @param transformation The transformation.
* @return The bounding sphere in the new coordinate system.
Expand Down
6 changes: 3 additions & 3 deletions CesiumGltf/include/CesiumGltf/PropertyAttributePropertyView.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace CesiumGltf {
*
* The {@link PropertyAttributePropertyView} constructor always completes
* successfully. However it may not always reflect the actual content of the
* corresponding property texture property. This enumeration provides the
* corresponding property attribute property. This enumeration provides the
* reason.
*/
class PropertyAttributePropertyViewStatus : public PropertyViewStatus {
Expand Down Expand Up @@ -190,7 +190,7 @@ class PropertyAttributePropertyView<ElementType, false>
: 0} {}

/**
* @brief Gets the value of the property for the given texture coordinates
* @brief Gets the value of the property for the given vertex index
* with all value transforms applied. That is, if the property specifies an
* offset and scale, they will be applied to the value before the value is
* returned.
Expand Down Expand Up @@ -346,7 +346,7 @@ class PropertyAttributePropertyView<ElementType, true>
: 0} {}

/**
* @brief Gets the value of the property for the given texture coordinates
* @brief Gets the value of the property for the given vertex index
* with all value transforms applied. That is, if the property specifies an
* offset and scale, they will be applied to the value before the value is
* returned.
Expand Down
Loading

0 comments on commit b12ae77

Please sign in to comment.