[geogram] update to 1.3.9

Author: simogasp

CMakeLists.txt

@@ -30,7 +30,7 @@ include(cmake/geogram.cmake)
 
 set(VORPALINE_VERSION_MAJOR 1)
 set(VORPALINE_VERSION_MINOR 3)
-set(VORPALINE_VERSION_PATCH 8)
+set(VORPALINE_VERSION_PATCH 9)
 set(VORPALINE_VERSION ${VORPALINE_VERSION_MAJOR}.${VORPALINE_VERSION_MINOR}.${VORPALINE_VERSION_PATCH})
 
 set(VORPALINE_INCLUDE_SUBPATH geogram${VORPALINE_VERSION_MAJOR})

cmake/FindGeogram.cmake

@@ -5,8 +5,9 @@
 #
 # This module defines the following variables:
 #
-#   Geogram_FOUND       - True if geogram has been found.
-#   Geogram::geogram    - Imported target for the main Geogram library.
+#   Geogram_FOUND        - True if geogram has been found.
+#   Geogram::geogram     - Imported target for the main Geogram library.
+#   Geogram::geogram_gfx - Imported target for Geogram graphics library.
 #
 # This module reads hints about the Geogram location from the following
 # environment variables:

src/bin/geobox/main.cpp

@@ -55,6 +55,7 @@
 #include <geogram/mesh/mesh_decimate.h>
 #include <geogram/mesh/mesh_tetrahedralize.h>
 #include <geogram/mesh/mesh_topology.h>
+#include <geogram/mesh/mesh_AABB.h>
 
 #include <geogram/delaunay/LFS.h>
 
@@ -101,7 +102,7 @@ namespace {
                     );
                 ImGui::Image(
                     convert_to_ImTextureID(geogram_logo_texture_),
-                    ImVec2(256, 256)
+                    ImVec2(256.0f * scaling(), 256.0f * scaling())
                 );
                 ImGui::Text(
                     "\n"
@@ -128,6 +129,15 @@ namespace {
                     "       (C)opyright 2006-2016\n"
                     "      The ALICE project, Inria\n"
                 );
+                ImGui::Text("\n");
+                ImGui::Separator();
+                ImGui::Text(
+                    "%s",
+                    (
+                        "GEOGRAM version:" +
+                        Environment::instance()->get_value("version")
+                    ).c_str()
+                );
                 ImGui::EndMenu();
             }
         }
@@ -340,6 +350,12 @@ namespace {
                         this, &GeoBoxApplication::compute_local_feature_size
                     );
                 }
+                if(ImGui::MenuItem("compute distance to border")) {
+                    Command::set_current(
+                        "compute_distance_to_border(std::string attribute_name=\"distance\")",
+                        this, &GeoBoxApplication::compute_distance_to_border
+                    );
+                }
                 ImGui::EndMenu();
             }
         }
@@ -842,6 +858,27 @@ namespace {
             set_attribute("vertices." + attribute_name);
             show_attributes();
         }
+
+        void compute_distance_to_border(std::string attribute_name) {
+            if(mesh()->cells.nb() == 0) {
+                Logger::err("Distance") << "Mesh has no cell"
+                                        << std::endl;
+                return;
+            }
+            begin();
+            Attribute<double> distance(
+                mesh()->vertices.attributes(), attribute_name
+            );
+            MeshFacetsAABB AABB(*mesh());
+            for(index_t v=0; v<mesh()->vertices.nb(); ++v) {
+                distance[v] = ::sqrt(
+                    AABB.squared_distance(vec3(mesh()->vertices.point_ptr(v)))
+                );
+            }
+            end();
+            set_attribute("vertices." + attribute_name);
+            show_attributes();
+        }
 
     protected:
 

src/bin/geodump/main.cpp

@@ -87,6 +87,11 @@ int main(int argc, char** argv) {
                         << file.read_string()
                         << std::endl;
                 }
+            } else if(chunk_class == "CMNT") {
+                GEO::Logger::out("GeoFile")
+                    << "comment: "
+                    << file.current_comment()
+                    << std::endl;
             } else if(
                 chunk_class == "GROB" ||
                 chunk_class == "SHDR" ||

src/demos/demo_Evert/main.cpp

@@ -632,7 +632,7 @@ namespace {
                 ImGui::Text("\n");
                 ImGui::Image(
                     convert_to_ImTextureID(geogram_logo_texture_),
-                    ImVec2(256, 256)
+                    ImVec2(256.0f * scaling(), 256.0f * scaling())
                 );
                 ImGui::Text("\n");
                 ImGui::Text(

src/lib/geogram/NL/OpenNL.psm

@@ -12,6 +12,7 @@ nl_blas.h \
 nl_iterative_solvers.h \
 nl_preconditioners.h \
 nl_superlu.h \
+nl_cholmod.h \
 nl_cnc_gpu_cuda.h \
 nl_os.c \
 nl_matrix.c \
@@ -20,6 +21,7 @@ nl_blas.c \
 nl_iterative_solvers.c \
 nl_preconditioners.c \
 nl_superlu.c \
+nl_cholmod.c \
 nl_cnc_gpu_cuda.c \
 nl_api.c" 
 

src/lib/geogram/NL/nl_api.c

@@ -49,6 +49,7 @@
 #include "nl_preconditioners.h"
 #include "nl_cnc_gpu_cuda.h"
 #include "nl_superlu.h"
+#include "nl_cholmod.h"
 
 /*****************************************************************************/
 
@@ -57,7 +58,9 @@ NLboolean nlInitExtension(const char* extension) {
     nl_arg_used(extension);
 
     if(!strcmp(extension, "SUPERLU")) {
-        return nlInitExtension_SUPERLU() ;
+        return nlInitExtension_SUPERLU();
+    } else if(!strcmp(extension, "CHOLMOD")) {
+        return nlInitExtension_CHOLMOD();
     }
 
 #ifdef NL_USE_CNC
@@ -535,8 +538,8 @@ static void nlEndMatrix() {
         nlCurrentContext->preconditioner != NL_PRECOND_SSOR &&
         nlCurrentContext->solver != NL_SUPERLU_EXT       &&
         nlCurrentContext->solver != NL_PERM_SUPERLU_EXT  &&
-        nlCurrentContext->solver != NL_SYMMETRIC_SUPERLU_EXT 
-       
+        nlCurrentContext->solver != NL_SYMMETRIC_SUPERLU_EXT &&
+        nlCurrentContext->solver != NL_CHOLMOD_EXT
     ) {
         if(getenv("NL_LOW_MEM") == NULL) {
             nlSparseMatrixCompress(&nlCurrentContext->M);