From dde333daaefc99335eb124518cf3f3eca9ced9a8 Mon Sep 17 00:00:00 2001 From: Bruno Levy Date: Wed, 1 Nov 2023 12:50:48 +0100 Subject: [PATCH] Fixed warnings: - forward declaration of IsectInfo as class (and it is a struct) - moved SCALING and INV_SCALING to mesh_surface_intersection.cpp --- src/lib/geogram/mesh/mesh_surface_intersection.cpp | 3 +++ src/lib/geogram/mesh/mesh_surface_intersection.h | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/geogram/mesh/mesh_surface_intersection.cpp b/src/lib/geogram/mesh/mesh_surface_intersection.cpp index fb16077298ea..9448a4ae9b0b 100644 --- a/src/lib/geogram/mesh/mesh_surface_intersection.cpp +++ b/src/lib/geogram/mesh/mesh_surface_intersection.cpp @@ -140,6 +140,9 @@ namespace { vec3 q3(M.vertices.point_ptr(M.facets.vertex(f2,2))); return triangles_intersections(p1,p2,p3,q1,q2,q3,I); } + + static constexpr double SCALING = double(1ull << 20); + static constexpr double INV_SCALING = 1.0/SCALING; } diff --git a/src/lib/geogram/mesh/mesh_surface_intersection.h b/src/lib/geogram/mesh/mesh_surface_intersection.h index 4175ba77c0a6..c8deca2a85a2 100644 --- a/src/lib/geogram/mesh/mesh_surface_intersection.h +++ b/src/lib/geogram/mesh/mesh_surface_intersection.h @@ -68,7 +68,7 @@ namespace GEO { - class IsectInfo; + struct IsectInfo; /********************************************************************/ @@ -566,8 +566,6 @@ namespace GEO { bool detect_intersecting_neighbors_; bool use_radial_sort_; - static constexpr double SCALING = double(1ull << 20); - static constexpr double INV_SCALING = 1.0/SCALING; PCK::SOSMode SOS_bkp_; bool normalize_; vec3 normalize_center_;