[delaunay-psm] Update to 1.5.4

Author: simogasp

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1.3)
 
-project(delaunay-psm LANGUAGES C CXX VERSION 1.5.3)
+project(delaunay-psm LANGUAGES C CXX VERSION 1.5.4)
 
 set(CMAKE_CXX_STANDARD 11)
 

delaunay-psm/Delaunay_psm.cpp

@@ -3640,6 +3640,10 @@ namespace {
             "one of auto, GLUP150, GLUP440, VanillaGL"
         );
         declare_arg("gfx:full_screen", false, "full screen mode");
+	declare_arg(
+	    "gfx:transparent", false,
+	    "use transparent backsgroung (desktop integration)"
+	);
         declare_arg(
             "gfx:GLSL_tesselation", true, "use tesselation shaders if available"
         );
@@ -4190,7 +4194,7 @@ namespace GEO {
 
     void Logger::unregister_client(LoggerClient* c) {
         geo_debug_assert(clients_.find(c) != clients_.end());
-        clients_.erase(c);
+	clients_.erase(c);
     }
 
     void Logger::unregister_all_clients() {
@@ -7245,48 +7249,26 @@ namespace GEO {
 #pragma GCC diagnostic ignored "-Wc++11-long-long"
 #endif
 
-#ifdef GEO_COMPILER_MSVC
-#define isnan _isnan
-#define isfinite _finite
-#else
-#ifndef isnan
-#define isnan std::isnan
-#endif
-#ifndef isfinite
-#define isfinite std::isfinite
-#endif
-#endif
-
 namespace GEO {
 
     namespace Numeric {
 
-        // Note: do not add global scope (::isnan) for calling
-        // this function, since it is a macro in some implementations.
-
         bool is_nan(float32 x) {
-            return isnan(x) || !isfinite(x);
+#ifdef GEO_COMPILER_MSVC
+            return _isnan(x) || !_finite(x);	    
+#else	    
+            return std::isnan(x) || !std::isfinite(x);
+#endif	    
         }
 
-
-// Under GCC, to work for both floats and doubles, isnan() is a macro
-// that calls both isnanf() and isnan(), based on operator size (using ?:),
-// thus it generates a conversion warning (that we ignore using the following
-// pragmas).
-            
-#ifdef GEO_COMPILER_GCC
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wfloat-conversion"
-#endif            
-        
         bool is_nan(float64 x) {
-            return isnan(x) || !isfinite(x);
+#ifdef GEO_COMPILER_MSVC
+            return _isnan(x) || !_finite(x);	    	    
+#else	    
+            return std::isnan(x) || !std::isfinite(x);
+#endif	    
         }
 
-#ifdef GEO_COMPILER_GCC
-#pragma GCC diagnostic pop            
-#endif            
-
         void random_reset() {
 #ifdef GEO_OS_WINDOWS
             srand(1);
@@ -8696,10 +8678,6 @@ namespace GEO {
 #endif
 
 
-#if defined(GEO_OS_APPLE) && defined(__MAC_10_12)
-#include <os/lock.h>
-#endif
-
 namespace {
 
     using namespace GEO;
@@ -20692,11 +20670,13 @@ namespace GEO {
 
 	if(keeps_infinite()) {
 
-	    // Process the infinite vertex at index nb_vertices().
-	    signed_index_t t = v_to_cell_[nb_vertices()];
-	    if(t != -1) {
-		index_t lv = index(index_t(t), -1);
-		set_next_around_vertex(index_t(t), lv, index_t(t));
+	    {
+		// Process the infinite vertex at index nb_vertices().
+		signed_index_t t = v_to_cell_[nb_vertices()];
+		if(t != -1) {
+		    index_t lv = index(index_t(t), -1);
+		    set_next_around_vertex(index_t(t), lv, index_t(t));
+		}
 	    }
 
 	    for(index_t t = 0; t < nb_cells(); ++t) {

delaunay-psm/Delaunay_psm.h

@@ -404,7 +404,7 @@ namespace GEO {
 #ifndef GEOGRAM_BASIC_NUMERIC
 #define GEOGRAM_BASIC_NUMERIC
 
-#include <math.h>
+#include <cmath>
 #include <float.h>
 #include <limits.h>
 
@@ -1828,11 +1828,11 @@ inline char atomic_bittestandreset_x86(volatile unsigned int* ptr, unsigned int
 #include <vector>
 
 #ifdef GEO_OS_APPLE
-#  define GEO_USE_DEFAULT_SPINLOCK_ARRAY
-#  include <Availability.h>
-#  ifdef __MAC_10_12
-#    include <os/lock.h>
-#  endif
+# define GEO_USE_DEFAULT_SPINLOCK_ARRAY
+# include <AvailabilityMacros.h>
+# if defined(MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12
+#   include <os/lock.h>
+# endif
 #endif
 
 #ifdef geo_debug_assert
@@ -1889,7 +1889,7 @@ namespace GEO {
 
 #elif defined(GEO_OS_APPLE)
 
-#ifdef __MAC_10_12
+#if defined(MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12
 
         typedef os_unfair_lock spinlock;
 
@@ -1963,11 +1963,7 @@ namespace GEO {
             }
 
             void resize(index_t size_in) {
-#if defined(GEO_OS_APPLE) && defined(__MAC_10_12)
-                spinlocks_.assign(size_in, OS_UNFAIR_LOCK_INIT);
-#else
-                spinlocks_.assign(size_in, 0);
-#endif
+                spinlocks_.assign(size_in, GEOGRAM_SPINLOCK_INIT);
             }
 
             void clear() {

example/main.cpp

@@ -335,19 +335,25 @@ int main(int argc, char** argv) {
 
 	Logger::out("Delaunay")
 	    << "Loaded " << nb_points << " points" << std::endl;
-	
+
+	double time = 0.0;
 	{
 	    Stopwatch Wdel("Delaunay");
 	    // Note: this does not transfer ownership of memory, caller
 	    // is still responsible of the memory of the points (here the
     	    // vector<double>). No memory is copied, Delaunay just keeps
 	    // a pointer.
 	    delaunay->set_vertices(nb_points, points.data());
+	    time = Wdel.elapsed_time();
 	}
 
         Logger::out("Delaunay") << delaunay->nb_cells() << " tetrahedra"
             << std::endl;
 
+	Logger::out("Delaunay") << double(delaunay->nb_cells()) / time
+				<< " tetrahedra / second"
+				<< std::endl;
+	
         if(output) {
 	    save_Delaunay(delaunay, output_filename, convex_hull_only);
 	}