Merge branch 'main' of github.com:M2-TE/chad_tsdf

CMakeLists.txt

@@ -35,8 +35,9 @@ if (NOT DEFINED CHAD_LEAF_BITS)
 endif()
 
 # create executable/library
-file(GLOB_RECURSE CPP_SOURCE_FILES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
+file(GLOB_RECURSE CPP_SOURCE_FILES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/dag/*.cpp")
 if (CHAD_TOP_LEVEL)
+    set(CPP_SOURCE_FILES ${CPP_SOURCE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp")
     add_executable(${PROJECT_NAME} ${CPP_SOURCE_FILES})
     target_compile_definitions(${PROJECT_NAME} PRIVATE CHAD_MAIN)
     set_target_properties(${PROJECT_NAME} PROPERTIES 

include/dag/morton.hpp

@@ -228,6 +228,7 @@ auto MortonCode::normals(std::vector<std::pair<MortonCode, glm::vec3>>& morton_c
                     }
                 }
 
+
                 // figure out index
                 std::size_t normal_idx = point_it - morton_codes.cbegin();
 

src/dag/dag.cpp

@@ -15,8 +15,7 @@ auto insert_octree(
     std::vector<glm::vec3>& normals, 
     std::array<NodeLevel, 63/3-1>& node_levels, 
     LeafLevel& leaf_level)
--> uint32_t
-{
+-> uint32_t {
     auto beg = std::chrono::steady_clock::now();
 
     // trackers that will be updated during traversal
@@ -415,7 +414,7 @@ void DAG::print_stats() {
     fmt::println("total hashing memory: {:.6f} MiB", total_hashing);
     fmt::println("total combined memory: {:.6f} MiB", total_vector + total_hashing);
 }
-double DAG::get_readonly_size() {
+auto DAG::get_readonly_size() -> double {
     double total_vector = 0.0;
     for (std::size_t i = 0; i < _node_levels_p->size(); i++) {
         double mem_vector = (double)((*_node_levels_p)[i]._raw_data.size() * sizeof(uint32_t)) / 1024.0 / 1024.0;

src/main.cpp

@@ -8,11 +8,11 @@
 #include "dag/dag.hpp"
 // // DEBUG
 // #include <dag/leaf_cluster.hpp>
-#include <vk/vk.hpp>
-#include <vulkan/vulkan.hpp>
-VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
-#define VMA_IMPLEMENTATION
-#include <vk_mem_alloc.hpp>
+// #include <vk/vk.hpp>
+// #include <vulkan/vulkan.hpp>
+// VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
+// #define VMA_IMPLEMENTATION
+// #include <vk_mem_alloc.hpp>
 
 void static read_pcl_file() {
     std::ifstream file;
@@ -72,7 +72,7 @@ void static do_sphere_thing() {
     // dag.merge_all_subtrees();
 }
 int main() {
-    init_vk();
+    // init_vk();
     exit(0);
     if (false) read_pcl_file();
     else do_sphere_thing();