[geogram] update to 1.3.10

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 9)
+set(VORPALINE_VERSION_PATCH 10)
 set(VORPALINE_VERSION ${VORPALINE_VERSION_MAJOR}.${VORPALINE_VERSION_MINOR}.${VORPALINE_VERSION_PATCH})
 
 set(VORPALINE_INCLUDE_SUBPATH geogram${VORPALINE_VERSION_MAJOR})

cmake/platforms/Emscripten-clang.cmake

@@ -51,7 +51,8 @@ endif()
 #https://kripken.github.io/emscripten-site/docs/optimizing/Optimizing-Code.html
 # Note: they are added to CMAKE CXX and C flags later on, because the
 # way add_flags() works may remove the second "-s" argument.
-set(EM_FLAGS -O3 -s USE_GLFW=3 -s TOTAL_MEMORY=256000000 )
+set(EM_FLAGS_RELEASE -O3 -s USE_GLFW=3 -s TOTAL_MEMORY=256000000 )
+set(EM_FLAGS_DEBUG -O2 -g -s USE_GLFW=3 -s TOTAL_MEMORY=256000000 )
 
 
 # Profiler compilation flags
@@ -99,11 +100,11 @@ endif()
 # Thus we do that here, making sure that there is no
 # call to add_flags() after.
 
-add_flags_no_remove_duplicates(CMAKE_CXX_FLAGS_RELEASE ${EM_FLAGS})
-add_flags_no_remove_duplicates(CMAKE_C_FLAGS_RELEASE ${EM_FLAGS})
+add_flags_no_remove_duplicates(CMAKE_CXX_FLAGS_RELEASE ${EM_FLAGS_RELEASE})
+add_flags_no_remove_duplicates(CMAKE_C_FLAGS_RELEASE ${EM_FLAGS_RELEASE})
 
-add_flags_no_remove_duplicates(CMAKE_CXX_FLAGS_DEBUG ${EM_FLAGS})
-add_flags_no_remove_duplicates(CMAKE_C_FLAGS_DEBUG ${EM_FLAGS})
+add_flags_no_remove_duplicates(CMAKE_CXX_FLAGS_DEBUG ${EM_FLAGS_DEBUG})
+add_flags_no_remove_duplicates(CMAKE_C_FLAGS_DEBUG ${EM_FLAGS_DEBUG})
 
 # Reset the warning level for third parties
 function(vor_reset_warning_level)

src/lib/geogram/basic/attributes.cpp

@@ -63,7 +63,7 @@ namespace GEO {
 
     AttributeStoreCreator::~AttributeStoreCreator() {
     }
-    
+
     /******************************************************************/    
 
     std::map<std::string, AttributeStoreCreator_var>

src/lib/geogram/basic/attributes.h

@@ -51,6 +51,8 @@
 #include <geogram/basic/memory.h>
 #include <geogram/basic/numeric.h>
 #include <geogram/basic/process.h>
+#include <geogram/basic/geofile.h>
+#include <geogram/basic/logger.h>
 #include <map>
 #include <typeinfo>
 #include <set>
@@ -152,7 +154,8 @@ namespace GEO {
          * \return a pointer to the newly created AttributeStore
          */
         virtual AttributeStore* create_attribute_store(index_t dimension) = 0;
-        
+
+
     private:
         std::string element_type_name_;            
         std::string element_typeid_name_;
@@ -405,7 +408,6 @@ namespace GEO {
                 create_attribute_store(dimension);
         }
 
-
         /**
          * \brief Gets an element type name from its mangled name
          * \param[in] element_typeid_name a const reference to a
@@ -437,7 +439,8 @@ namespace GEO {
 
         /**
          * \brief Registers a new element type
-         * \note One should use geo_register_attribute_type instead
+         * \note Internal use function, one should use 
+         *  geo_register_attribute_type instead
          * \param[in] creator a pointer to the AttributeStoreCreator
          * \param[in] element_type_name a const reference to a string with the 
          *  C++ type name of the elements
@@ -449,13 +452,23 @@ namespace GEO {
             const std::string& element_type_name,
             const std::string& element_typeid_name
         ) {
-            geo_assert(!element_type_name_is_known(element_type_name));
-            geo_assert(!element_typeid_name_is_known(element_typeid_name));   
+            if(element_type_name_is_known(element_type_name)) {
+                Logger::warn("Attributes") << element_type_name
+                                           << " already registered"
+                                           << std::endl;
+                if(element_typeid_name_is_known(element_typeid_name)) {
+                    bool already_registered_attribute_has_same_type = (
+                        type_name_to_typeid_name_[element_type_name] ==
+                        element_typeid_name
+                    );
+                    geo_assert(already_registered_attribute_has_same_type);
+                }
+            }
             type_name_to_creator_[element_type_name] = creator;
             typeid_name_to_type_name_[element_typeid_name] = element_type_name;
             type_name_to_typeid_name_[element_type_name] = element_typeid_name;
         }
-        
+
     protected:
         /**
          * \brief If size or base address differ from the
@@ -628,11 +641,20 @@ namespace GEO {
          * \brief geo_register_attribute_type constructor
          * \param[in] type_name a const reference to a string with
          *  the C++ type name.
+         * \details If the attribute is already registered with the same
+         *  \p type_name and same \p T, then a warning message is issued.
+         *  If the attribute is already registered with the same \p type_name
+         *  but a different \p T, then an assertion failure is triggered.
          */
         geo_register_attribute_type(const std::string& type_name) {
             AttributeStore::register_attribute_creator(
                 new TypedAttributeStoreCreator<T>, type_name, typeid(T).name()
             );
+            GeoFile::register_ascii_attribute_serializer(
+                type_name,
+                read_ascii_attribute<T>,
+                write_ascii_attribute<T>
+            );
         }
     };
 

src/lib/geogram/basic/common.cpp

@@ -57,6 +57,10 @@
 #include <sstream>
 #include <iomanip>
 
+#ifdef GEO_OS_EMSCRIPTEN
+#include <emscripten.h>
+#endif
+
 namespace GEO {
 
     void initialize() {
@@ -99,7 +103,25 @@ namespace GEO {
         geo_register_attribute_type<double>("double");
 
         geo_register_attribute_type<vec2>("vec2");
-        geo_register_attribute_type<vec3>("vec3");                
+        geo_register_attribute_type<vec3>("vec3");
+
+#ifdef GEO_OS_EMSCRIPTEN
+        
+        // This mounts the local file system when an emscripten-compiled
+        // program runs in node.js.
+        // Current working directory is mounted in /working,
+        // and root directory is mounted in /root
+        
+        EM_ASM(
+            if(typeof module !== 'undefined' && this.module !== module) {
+                FS.mkdir('/working');
+                FS.mkdir('/root');            
+                FS.mount(NODEFS, { root: '.' }, '/working');
+                FS.mount(NODEFS, { root: '/' }, '/root');
+            }
+        );
+#endif        
+        
     }
 
     void terminate() {