Merge branch 'dev'

Author: otto-link

.gitignore

@@ -1,3 +1,4 @@
 build/
+build_clang/
 .cache
-.vscode
+.vscode

.gitmodules

@@ -29,3 +29,6 @@
 [submodule "external/nanoflann"]
 	path = external/nanoflann
 	url = https://github.com/jlblancoc/nanoflann.git
+[submodule "external/terrain-descriptors"]
+	path = external/terrain-descriptors
+	url = git@github.com:otto-link/terrain-descriptors.git

CMakeLists.txt

@@ -1,57 +1,139 @@
 cmake_minimum_required(VERSION 3.22)
 
-project(highmap-root)
+# -----------------------------------------------------------------------------
+# Optional: force clang Usage: cmake -B build -DCMAKE_C_COMPILER=clang
+# -DCMAKE_CXX_COMPILER=clang++
+# -----------------------------------------------------------------------------
+
+project(highmap-root LANGUAGES C CXX)
+
+# -----------------------------------------------------------------------------
+# Options
+# -----------------------------------------------------------------------------
 
 option(HIGHMAP_ENABLE_OPENCL "" ON)
 option(HIGHMAP_ENABLE_EXAMPLES "" ON)
 option(HIGHMAP_ENABLE_TESTS "" ON)
+option(HIGHMAP_ENABLE_BENCHMARKS "" ON)
+
+# -----------------------------------------------------------------------------
+# C++
+# -----------------------------------------------------------------------------
 
 set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+# -----------------------------------------------------------------------------
+# Compiler flags
+# -----------------------------------------------------------------------------
+
+if(MSVC)
+
+  message(STATUS "Compiler: MSVC")
+
+  add_definitions(-DHMAP_MSVC)
+
+  add_compile_options(/W4 /Od)
+
+  add_compile_definitions(M_PI=3.14159265358979323846)
+
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+
+  message(STATUS "Compiler: Clang")
+
+  add_compile_options(
+    -Wall
+    -Wextra
+    -Wpedantic
+    -O3
+    -Ofast
+    -ffast-math
+    -pthread
+    -fPIC
+    -Wno-deprecated-enum-enum-conversion)
+
+  add_compile_definitions(LOG_LEVEL=3)
+
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+
+  message(STATUS "Compiler: GCC")
+
+  add_compile_options(
+    -Wall
+    -Wextra
+    -O3
+    -Ofast
+    -ffast-math
+    -pthread
+    -fPIC
+    -Wno-free-nonheap-object
+    -Wno-deprecated-enum-enum-conversion)
+
+  add_compile_definitions(LOG_LEVEL=3)
 
-if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-  # MSVC compiler options
-  set(CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} /W4 /Od /D M_PI=3.14159265358979323846")
-
-  message(STATUS "MSVC compiler...")
-  add_definitions("-DHMAP_MSVC")
-else()
-  # GNU compiler options
-  set(CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} -Wall -Wextra -O3 -Ofast -ffast-math -pthread -fPIC -DLOG_LEVEL=3 -Wno-free-nonheap-object -Wno-deprecated-enum-enum-conversion"
-  )
 endif()
 
+# -----------------------------------------------------------------------------
+# Output
+# -----------------------------------------------------------------------------
+
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
 
-# --- dependencies
+# -----------------------------------------------------------------------------
+# Dependencies
+# -----------------------------------------------------------------------------
 
 find_package(GSL REQUIRED COMPONENTS gsl gslcblas)
 find_package(assimp REQUIRED)
 find_package(glm REQUIRED)
 find_package(OpenMP REQUIRED)
 find_package(OpenCV REQUIRED)
 find_package(OpenCL REQUIRED)
+
 include_directories(${OpenCV_INCLUDE_DIRS})
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+# OpenMP
+add_compile_options(${OpenMP_CXX_FLAGS})
 
+# OpenCL
 add_compile_definitions(CL_HPP_MINIMUM_OPENCL_VERSION=120
                         CL_HPP_TARGET_OPENCL_VERSION=120)
 
+# -----------------------------------------------------------------------------
+# External libs
+# -----------------------------------------------------------------------------
+
 add_subdirectory(external)
 
-# --- library
+# -----------------------------------------------------------------------------
+# Library
+# -----------------------------------------------------------------------------
 
 add_subdirectory(HighMap)
 
-# --- everything else...
+# -----------------------------------------------------------------------------
+# Examples
+# -----------------------------------------------------------------------------
 
 if(HIGHMAP_ENABLE_EXAMPLES)
-  add_subdirectory(${PROJECT_SOURCE_DIR}/examples)
+  add_subdirectory(examples)
 endif()
 
+# -----------------------------------------------------------------------------
+# Tests
+# -----------------------------------------------------------------------------
+
 if(HIGHMAP_ENABLE_TESTS)
   message(STATUS "HighMap tests enabled")
-  add_subdirectory(${PROJECT_SOURCE_DIR}/tests)
+  add_subdirectory(tests)
+endif()
+
+# -----------------------------------------------------------------------------
+# Benchmarks
+# -----------------------------------------------------------------------------
+
+if(HIGHMAP_ENABLE_BENCHMARKS)
+  message(STATUS "HighMap benchmarks enabled")
+  add_subdirectory(benchmarks)
 endif()

HighMap/CMakeLists.txt

@@ -38,6 +38,7 @@ target_link_libraries(
   nanoflann::nanoflann
   nn-c::nn-c
   NoiseLib
+  terrain-descriptors
   OpenMP::OpenMP_CXX
   ${OpenCV_LIBS}
   point_sampler

HighMap/include/highmap.hpp

@@ -16,6 +16,7 @@
 #include "highmap/authoring.hpp"
 #include "highmap/blending.hpp"
 #include "highmap/boundary.hpp"
+#include "highmap/carving.hpp"
 #include "highmap/colorize.hpp"
 #include "highmap/colormaps.hpp"
 #include "highmap/convolve.hpp"
@@ -40,12 +41,14 @@
 #include "highmap/interpolate_array.hpp"
 #include "highmap/interpolate_curve.hpp"
 #include "highmap/kernels.hpp"
-#include "highmap/math.hpp"
+#include "highmap/local_metrics.hpp"
+#include "highmap/math/core.hpp"
 #include "highmap/morphology.hpp"
 #include "highmap/multiscale/downscaling.hpp"
 #include "highmap/multiscale/pyramid.hpp"
 #include "highmap/multiscale/upscaling.hpp"
 #include "highmap/opencl/gpu_opencl.hpp"
+#include "highmap/openmp.hpp"
 #include "highmap/operator.hpp"
 #include "highmap/primitives.hpp"
 #include "highmap/random.hpp"
@@ -55,6 +58,7 @@
 #include "highmap/selector.hpp"
 #include "highmap/shadows.hpp"
 #include "highmap/shortest_path.hpp"
+#include "highmap/statistics.hpp"
 #include "highmap/synthesis.hpp"
 #include "highmap/tensor.hpp"
 #include "highmap/terrain_tri_mesh.hpp"

HighMap/include/highmap/algebra.hpp

@@ -123,6 +123,14 @@ struct IVec2Hash
   }
 };
 
+struct IVec2Eq
+{
+  bool operator()(const glm::ivec2 &a, const glm::ivec2 &b) const noexcept
+  {
+    return a == b;
+  }
+};
+
 // for glm::ivec4 map
 struct IVec4Hash
 {
@@ -154,6 +162,11 @@ inline glm::vec4 adjust(const glm::vec4 &v,
   return glm::vec4{v.x + dx, v.y + dy, v.z + dz, v.w + dw};
 }
 
+inline glm::vec4 adjust(const glm::vec4 &v, float dr)
+{
+  return glm::vec4{v.x - dr, v.y + dr, v.z - dr, v.w + dr};
+}
+
 /**
  * @brief Mat class for basic manipulation of 2D matrices.
  *

HighMap/include/highmap/array.hpp

@@ -14,9 +14,10 @@
 typedef unsigned int uint;
 
 #include <functional>
-#include <opencv2/core/mat.hpp>
 #include <random>
 
+#include <opencv2/core/mat.hpp>
+
 #include "highmap/algebra.hpp"
 #include "highmap/colormaps.hpp"
 
@@ -60,6 +61,9 @@ class Array
   Array(glm::ivec2 shape);                                 ///< @overload
   Array(glm::ivec2 shape, float value);                    ///< @overload
   Array(const std::string &filename, bool flip_j = false); ///< @overload
+  Array(const std::vector<std::vector<float>> &data);      ///< @overload
+  Array(const std::initializer_list<std::initializer_list<float>>
+            &data); ///< @overload
 
   //----------------------------------------
   // overload
@@ -99,7 +103,6 @@ class Array
    * @return       Array& Reference to the current Array object.
    */
   Array &operator+=(const float value);
-
   Array &operator+=(const Array &array); ///< @overload
 
   /**
@@ -304,13 +307,6 @@ class Array
    */
   std::vector<float> col_to_vector(int j);
 
-  /**
-   * @brief Return the number of non-zero elements in the array.
-   *
-   * @return int The number of non-zero elements.
-   */
-  int count_non_zero();
-
   /**
    * @brief Distribute a value 'amount' around the four cells (i, j), (i + 1,
    * j), (i, j + 1), (i + 1, j + 1) by "reversing" the bilinear interpolation.
@@ -352,7 +348,7 @@ class Array
   /**
    * @brief Debug tool, dump array content as an ASCII histogram to the consol.
    */
-  void dump_histogram(const std::string &msg = "") const;
+  void dump_histogram(int bins = 32, const std::string &msg = "") const;
 
   /**
    * @brief Extracts a subarray defined by the slice indices {i1, i2, j1, j2}
@@ -640,6 +636,12 @@ class Array
    */
   float mean() const;
 
+  /**
+   * @brief Return the median value of the elements in the array.
+   * @return float The median value of the elements in the array.
+   */
+  float median() const;
+
   /**
    * @brief Return the value of the smallest element in the array.
    *
@@ -990,6 +992,24 @@ class Array
   std::vector<float> unique_values() const;
 };
 
+// ==========================================================================
+//  Functions
+// ==========================================================================
+
+/**
+ * @brief Count the number of non-zero elements in the array.
+ * @param  array Input array.
+ * @return       Number of elements not equal to 0.
+ */
+size_t count_non_zero(const Array &array);
+
+/**
+ * @brief Count the number of zero elements in the array.
+ * @param  array Input array.
+ * @return       Number of elements equal to 0.
+ */
+size_t count_zero(const Array &array);
+
 /**
  * @brief Converts an OpenCV `cv::Mat` to a 2D `Array` with optional value
  * scaling to \[0, 1\].
@@ -1018,9 +1038,9 @@ Array cv_mat_to_array(const cv::Mat &mat,
                       bool           remap_values = true,
                       bool           flip_j = false);
 
-//-----------------------------------
+// ==========================================================================
 // per cell operations wrapper(s)
-//-----------------------------------
+// ==========================================================================
 
 /// Apply a function to every cell (mutable).
 template <typename Fn> inline void for_each_cell(Array &a, Fn &&fn)