Merge pull request #1 from geoflow3d/master

Update codebase
ignfab · Apr 15, 2024 · 339e884 · 339e884
2 parents e528c9f + 0d463f9
commit 339e884
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.21)
 
-project (Geoflow-bundle VERSION 2023.09.16)
+project (Geoflow-bundle VERSION 2024.03.08)
 
 option(GF_BUILD_GUI "Build the GUI components of geoflow" TRUE)
 add_subdirectory(geoflow)

diff --git a/base.dockerfile b/base.dockerfile
@@ -45,7 +45,7 @@ RUN cd /tmp && \
     rm -rf /tmp/* && \
     mkdir /tmp/geoflow-bundle
 
-ARG CGAL_VERSION=5.4
+ARG CGAL_VERSION=5.5
 RUN cd /tmp && \
     apt-get install -y libboost-system-dev libboost-thread-dev libgmp-dev libmpfr-dev zlib1g-dev && \
     wget https://github.com/CGAL/cgal/releases/download/v${CGAL_VERSION}/CGAL-${CGAL_VERSION}.tar.xz && \
@@ -58,8 +58,9 @@ RUN cd /tmp && \
     rm -rf /tmp/*
 
 ARG FGDB_VERSION=1.5.2
-ARG GDAL_VERSION=3.6.2
+ARG GDAL_VERSION=3.7.3
 RUN cd /tmp && \
+    apt-get install -y libexpat-dev && \
     git clone https://github.com/Esri/file-geodatabase-api.git && \
     tar -xf file-geodatabase-api/FileGDB_API_${FGDB_VERSION}/FileGDB_API-RHEL7-64gcc83.tar.gz && \
     rm -rf /tmp/FileGDB_API-RHEL7-64gcc83/lib/libstdc++.so* && \

diff --git a/build.bat b/build.bat
@@ -2,6 +2,6 @@ git submodule update --init --recursive
 
 mkdir build-clang
 cd .\build-clang\
-cmake .. -DGF_BUILD_GUI=ON -DCMAKE_TOOLCHAIN_FILE=C:\Users\ravi\git\vcpkg\scripts\buildsystems\vcpkg.cmake -Dlaslib_DIR=C:\Users\ravi\git\geoflow-bundle\build\vcpkg_installed\x64-windows\share\lastools\LASlib -DPROJ_DATA_DIR=C:\Users\ravi\git\geoflow-bundle\build-clang\vcpkg_installed\x64-windows\share\proj4 -DCMAKE_BUILD_TYPE=Release -T ClangCL
+cmake .. -DGF_BUILD_GUI=ON -DCMAKE_TOOLCHAIN_FILE=C:\Users\ravi\git\vcpkg\scripts\buildsystems\vcpkg.cmake -Dlaslib_DIR=C:\Users\ravi\git\geoflow-bundle\build\vcpkg_installed\x64-windows\share\lastools\LASlib -DPROJ_DATA_DIR=C:\Users\ravi\git\geoflow-bundle\build-clang\vcpkg_installed\x64-windows\share\proj -DCMAKE_BUILD_TYPE=Release -T ClangCL
 cmake --build . --parallel 32 --config Release
 cpack -C Release --verbose
diff --git a/plugins/gfp-basic3d b/plugins/gfp-basic3d
diff --git a/plugins/gfp-building-reconstruction b/plugins/gfp-building-reconstruction
diff --git a/plugins/gfp-gdal b/plugins/gfp-gdal
diff --git a/vcpkg.json b/vcpkg.json
@@ -1,22 +1,21 @@
 {
   "name": "geoflow-bundle",
-  "version-date": "2023-03-21",
+  "version-date": "2024-03-08",
   "dependencies": [
     "glfw3",
-    { "name": "boost-geometry", "version>=": "1.77.0" },
+    "boost-geometry",
+    "boost-format",
     "glm",
-    { "name":  "lastools", "version>=": "2020-05-09" },
-    { "name": "cgal", "version>=":  "5.5" },
+    "lastools",
+    "cgal",
     "eigen3",
-    { "name": "nlohmann-json", "version>=": "3.11.2" },
-    { "name": "proj"},
-    { "name": "geos", "version>=": "3.10.2" },
+    "nlohmann-json",
+    "proj",
+    "geos",
     {
       "name": "gdal",
-      "default-features": false,
-      "features": [ "postgresql" ],
-      "version>=": "3.6.3"
+      "features": ["recommended-features", "postgresql"]
     }
   ],
-  "builtin-baseline": "b86c0c35b88e2bf3557ff49dc831689c2f085090"
+  "builtin-baseline": "ab887c562326c686478284d9076d722c1ec4b48c"
 }
+1 −1		CMakeLists.txt
+2 −3		nodes.hpp
+38 −19		nodes_cityjson.cpp
+3 −2		CMakeLists.txt
+1 −0		register.hpp
+1 −1		src/Mesh2TriangleCollectionNode.cpp
+88 −64		src/MeshClipperNode.cpp
+3 −3		src/MeshGridSimplify.cpp
+21 −0		src/MeshProcessingNodes.hpp
+187 −2		src/MeshSimplify.cpp
+44 −0		src/heightfield_nodes.cpp
+12 −4		src/polygon_triangulate.cpp
+23 −0		src/polygon_util.cpp
+1 −0		src/polygon_util.hpp
+227 −0		src/tinsimp.cpp
+55 −0		src/tinsimp.hpp