Remove GLM_FORCE_SIZE_T_LENGTH

CHANGES.md

@@ -2,6 +2,10 @@
 
 ### v0.44.0 - 2025-02-03
 
+##### Breaking Changes :mega:
+
+- cesium-native no longer uses the `GLM_FORCE_SIZE_T_LENGTH` option with the `glm` library
+
 ##### Additions :tada:
 
 - Added conversion of I3dm batch table metadata to `EXT_structural_metadata` and `EXT_instance_features` extensions.

Cesium3DTilesContent/src/I3dmToGltfConverter.cpp

@@ -23,6 +23,7 @@
 #include <CesiumUtility/Uri.h>
 
 #include <fmt/format.h>
+#include <glm/detail/setup.hpp>
 #include <glm/ext/matrix_double4x4.hpp>
 #include <glm/ext/matrix_transform.hpp>
 #include <glm/ext/vector_double3.hpp>
@@ -492,7 +493,7 @@ CesiumAsync::Future<ConvertedI3dm> convertI3dmContent(
         decodedInstances.positions.begin(),
         [&parsedContent](auto&& posQuantized) {
           glm::vec3 position;
-          for (unsigned j = 0; j < 3; ++j) {
+          for (glm::length_t j = 0; j < 3; ++j) {
             position[j] = static_cast<float>(
                 posQuantized[j] / 65535.0 *
                     (*parsedContent.quantizedVolumeScale)[j] +

CesiumGeometry/src/IntersectionTests.cpp

@@ -7,6 +7,7 @@
 #include <CesiumUtility/Math.h>
 
 #include <glm/common.hpp>
+#include <glm/detail/setup.hpp>
 #include <glm/exponential.hpp>
 #include <glm/ext/matrix_double3x3.hpp>
 #include <glm/ext/vector_double2.hpp>
@@ -16,7 +17,6 @@
 #include <glm/matrix.hpp>
 
 #include <cmath>
-#include <cstdint>
 #include <limits>
 #include <optional>
 #include <utility>
@@ -205,7 +205,7 @@ std::optional<double> IntersectionTests::rayAABBParametric(
   double tmin = greatestMin;
   double tmax = smallestMax;
 
-  for (uint32_t i = 0; i < 3; ++i) {
+  for (glm::length_t i = 0; i < 3; ++i) {
     if (glm::abs(dir[i]) < Math::Epsilon6) {
       continue;
     } else {

CesiumGltfReader/test/TestGltfReader.cpp

@@ -137,7 +137,7 @@ T getRange(const CesiumGltf::AccessorView<T>& accessorView) {
   T max{std::numeric_limits<float>::lowest()};
   for (int32_t i = 0; i < accessorView.size(); ++i) {
     const T& value = accessorView[i];
-    for (uint32_t j = 0; j < static_cast<uint32_t>(value.length()); ++j) {
+    for (glm::length_t j = 0; j < value.length(); ++j) {
       min[j] = glm::min<float>(min[j], value[j]);
       max[j] = glm::max<float>(max[j], value[j]);
     }
@@ -181,7 +181,7 @@ VertexAttributeRange getVertexAttributeRange(const Model& model) {
 
 template <typename T>
 bool epsilonCompare(const T& v1, const T& v2, double epsilon) {
-  for (uint32_t i = 0; i < static_cast<uint32_t>(v1.length()); ++i) {
+  for (glm::length_t i = 0; i < v1.length(); ++i) {
     if (!CesiumUtility::Math::equalsEpsilon(v1[i], v2[i], epsilon)) {
       return false;
     }

CesiumRasterOverlays/src/RasterOverlayUtilities.cpp

@@ -25,6 +25,7 @@
 #include <CesiumUtility/Tracing.h>
 
 #include <glm/common.hpp>
+#include <glm/detail/setup.hpp>
 #include <glm/ext/matrix_double4x4.hpp>
 #include <glm/ext/vector_double3.hpp>
 #include <glm/ext/vector_float2.hpp>
@@ -1477,9 +1478,11 @@ void addSkirt(
         position -= center;
 
         for (uint32_t c = 0; c < 3; ++c) {
-          output.push_back(static_cast<float>(position[c]));
-          attribute.minimums[c] = glm::min(attribute.minimums[c], position[c]);
-          attribute.maximums[c] = glm::max(attribute.maximums[c], position[c]);
+          output.push_back(static_cast<float>(position[glm::length_t(c)]));
+          attribute.minimums[c] =
+              glm::min(attribute.minimums[c], position[glm::length_t(c)]);
+          attribute.maximums[c] =
+              glm::max(attribute.maximums[c], position[glm::length_t(c)]);
         }
       } else {
         for (uint32_t c = 0;

cmake/macros/configure_cesium_library.cmake

@@ -22,7 +22,6 @@ function(configure_cesium_library targetName)
             PUBLIC
                 GLM_FORCE_XYZW_ONLY # Disable .rgba and .stpq to make it easier to view values from debugger
                 GLM_FORCE_EXPLICIT_CTOR # Disallow implicit conversions between dvec3 <-> dvec4, dvec3 <-> fvec3, etc
-                GLM_FORCE_SIZE_T_LENGTH # Make vec.length() and vec[idx] use size_t instead of int
         )
     endif()
 

doc/topics/developer-setup.md

@@ -159,7 +159,7 @@ cmake -B build -S .
 3. Next, we run the clang-tidy target of Cesium Native's cmake build, which will run clang-tidy. clang-tidy produces a lot of not-very-useful output, so we send it to a file instead of the console:
 
 ```
-cmake --build build-tidy --target clang-tidy > clang-tidy.log
+cmake --build build --target clang-tidy > clang-tidy.log
 ```
 
 4. Finally, we use `sed` to extract the errors and warnings from the log:
@@ -187,7 +187,7 @@ cmake -B build -S . -DCLANG_TIDY_PATH=$(brew --prefix llvm)/bin/clang-tidy -DCLA
 3. Next, we run the clang-tidy target of Cesium Native's cmake build, which will run clang-tidy. clang-tidy produces a lot of not-very-useful output, so we send it to a file instead of the console:
 
 ```
-cmake --build build-tidy --target clang-tidy > clang-tidy.log
+cmake --build build --target clang-tidy > clang-tidy.log
 ```
 
 4. Finally, we use `sed` to extract the errors and warnings from the log: