Merge pull request #33 from AlpineMapsOrg/dag-builder

Dag builder

Author: adam-ce

.github/workflows/ci.yml

@@ -88,10 +88,10 @@ jobs:
     - name: Install LLVM 23
       if: matrix.cxx == 'clang++-23'
       run: |
-        wget -qO /tmp/llvm.sh https://apt.llvm.org/llvm.sh
-        chmod +x /tmp/llvm.sh
-        sudo /tmp/llvm.sh 23
-        sudo apt-get install -y --no-install-recommends libclang-rt-23-dev
+        wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc > /dev/null
+        echo "deb https://apt.llvm.org/noble/ llvm-toolchain-noble-23 main" | sudo tee /etc/apt/sources.list.d/llvm-23.list
+        sudo apt-get update
+        sudo apt-get install -y --no-install-recommends clang-23 lld-23 libclang-rt-23-dev
 
     - name: Install GCC ${{ matrix.cxx }}
       if: matrix.cxx == 'g++-16'

src/CMakeLists.txt

@@ -1,3 +1,7 @@
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+message(STATUS "C++ Standard: ${CMAKE_CXX_STANDARD}")
+
 # Dependencies used by the unconditional terrainlib umbrella target.
 find_package(ZLIB REQUIRED)
 
@@ -10,7 +14,7 @@ target_include_directories(Eigen3 SYSTEM INTERFACE ${eigen_SOURCE_DIR})
 alp_setup_cmake_project(boost URL https://github.com/boostorg/boost.git COMMITISH "boost-1.88.0" CMAKE_ARGUMENTS -DBOOST_ENABLE_PYTHON=OFF -DBUILD_TESTING=OFF "-DBOOST_INCLUDE_LIBRARIES='graph\;multiprecision\;heap\;format\;logic'")
 find_package(Boost CONFIG REQUIRED)
 
-alp_setup_cmake_project(tbb URL https://github.com/uxlfoundation/oneTBB.git COMMITISH v2023.1.0 CMAKE_ARGUMENTS -DTBB_TEST=OFF)
+alp_setup_cmake_project(tbb URL https://github.com/uxlfoundation/oneTBB.git COMMITISH v2023.1.0 CMAKE_ARGUMENTS -DTBB_TEST=OFF -DTBBMALLOC_BUILD=OFF)
 find_package(TBB REQUIRED)
 
 include(../cmake/SetupGDAL.cmake)
@@ -41,6 +45,7 @@ target_include_directories(tl_expected SYSTEM INTERFACE ${tl_expected_SOURCE_DIR
 
 set(SPDLOG_FMT_EXTERNAL ON CACHE BOOL "SPDLOG_FMT_EXTERNAL" FORCE)
 alp_add_git_repository(spdlog URL https://github.com/gabime/spdlog.git COMMITISH v1.17.0)
+add_compile_definitions(SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE)
 
 alp_add_git_repository(zpp_bits URL https://github.com/eyalz800/zpp_bits.git COMMITISH v4.7.3 DO_NOT_ADD_SUBPROJECT)
 add_library(zpp_bits INTERFACE)
@@ -50,6 +55,8 @@ alp_add_git_repository(libassert URL https://github.com/jeremy-rifkin/libassert.
 alp_add_git_repository(magic_enum URL https://github.com/Neargye/magic_enum.git COMMITISH v0.9.7)
 alp_add_git_repository(meshoptimizer URL https://github.com/zeux/meshoptimizer.git COMMITISH v1.0.1)
 
+alp_add_git_repository(wideinteger URL https://github.com/ckormanyos/wide-integer.git COMMITISH 719cbbd557fe974f48b055568e2b149b2444bee9)
+
 set(LIBIGL_COPYLEFT_CORE ON)
 set(LIBIGL_RESTRICTED_TRIANGLE ON)
 alp_add_git_repository(libigl URL https://github.com/libigl/libigl.git COMMITISH v2.6.0)

src/dag_builder/Partitioning.h

@@ -6,5 +6,6 @@
 
 struct [[nodiscard]] Partitioning {
     uint32_t partition_count = 0;
+    uint32_t clusters_per_partition = 0; // nominal size the partitioning targeted
     std::vector<uint32_t> cluster_partitions; // original cluster index -> partition index
 };

src/dag_builder/atlas/Packer.cpp

@@ -38,13 +38,10 @@ inline void normalize_uvs(std::span<glm::dvec2> uvs) {
 
 struct Packer::Impl {
     std::unique_ptr<xatlas::Atlas, decltype(&xatlas::Destroy)> atlas;
-    double total_effective_pixel_area = 0.0;
 
     Impl() : atlas(xatlas::Create(), xatlas::Destroy) {}
 
     void add_uv_mesh(const UvMesh& mesh) {
-        this->total_effective_pixel_area += glm::compMul(glm::dvec2(mesh.texture_size));
-
         std::vector<glm::vec2> scaled_uvs = transform_vector(mesh.uvs, [&](const glm::dvec2 &uv) {
             const glm::dvec2 scaled = uv * glm::dvec2(mesh.texture_size);
             return glm::vec2(scaled);
@@ -91,7 +88,11 @@ struct Packer::Impl {
 
         normalize_uvs(uvs.flat());
 
-        return Packing(uvs, this->atlas->utilization[0]);
+        const glm::dvec2 atlas_size(this->atlas->width, this->atlas->height);
+        const double aspect = atlas_size.y > 0 ? atlas_size.x / atlas_size.y : 1.0;
+        const double utilization = this->atlas->utilization[0];
+
+        return Packing(uvs, utilization, aspect);
     }
 };
 

src/dag_builder/atlas/Packer.h

@@ -7,7 +7,6 @@
 
 #include <glm/glm.hpp>
 
-#include "number_utils.h"
 #include "SegmentedBuffer.h"
 
 namespace atlas {
@@ -21,10 +20,10 @@ struct UvMesh {
 class Packing {
 public:
     Packing() = default;
-    Packing(std::vector<glm::dvec2> uvs, const double effective_pixel_area, const float utilization = 1.0f)
-        : Packing(SegmentedBuffer<glm::dvec2>(std::move(uvs)), effective_pixel_area, utilization) {}
-    Packing(SegmentedBuffer<glm::dvec2> uvs, const double effective_pixel_area, const float utilization = 1.0f)
-        : _uvs(std::move(uvs)), _effective_pixel_area(effective_pixel_area), _utilization(utilization) {}
+    Packing(std::vector<glm::dvec2> uvs, const double utilization = 1.0, const double aspect = 1.0)
+        : Packing(SegmentedBuffer<glm::dvec2>(std::move(uvs)), utilization, aspect) {}
+    Packing(SegmentedBuffer<glm::dvec2> uvs, const double utilization = 1.0, const double aspect = 1.0)
+        : _uvs(std::move(uvs)), _utilization(utilization), _aspect(aspect) {}
 
     std::span<const glm::dvec2> uvs_for_mesh(const uint32_t mesh_index) const {
         return this->_uvs.segment(mesh_index);
@@ -37,22 +36,18 @@ class Packing {
         return this->_uvs.backing();
     }
 
-    // Sum of effective input pixels (source-texture pixels actually covered by UVs) across all packed meshes.
-    double effective_pixel_area() const {
-        return this->_effective_pixel_area;
+    double utilization() const {
+        return this->_utilization;
     }
 
-    // Fraction of the packed atlas actually covered by charts. 1.0 for
-    // packings that were not produced by the chart packer (e.g. a single
-    // mesh's own UVs), since there is no wasted atlas space to account for.
-    float utilization() const {
-        return this->_utilization;
+    double aspect() const {
+        return this->_aspect;
     }
 
 private:
     SegmentedBuffer<glm::dvec2> _uvs;
-    double _effective_pixel_area = 0.0;
-    float _utilization = 1.0f;
+    double _utilization = 1.0;
+    double _aspect = 1.0;
 };
 
 class Packer {