Merge branch 'development'

tudelft3d · Aug 27, 2019 · b0a6eea · b0a6eea
2 parents 51a7aa4 + ecf1d93
commit b0a6eea
Show file tree

Hide file tree

Showing 36 changed files with 396 additions and 1,191 deletions.
diff --git a/.gitignore b/.gitignore
@@ -43,14 +43,11 @@ vs_build/.vs
 *.lib
 
 # Folders
-/vendor
-/_site
-x64/
-x86/
-
-#Folders
-/vendor
-/_site
+x64
+x86
+vendor
+_site
+.sass-cache
 /resources/convert-to-simulation/simulatorready
 /resources/convert-to-simulation/out.off
 /resources/convert-to-simulation/bin/

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,9 +34,10 @@ if ( NOT GDAL_FOUND )
   message(SEND_ERROR "3dfier requires the GDAL library")
 endif()
 
-# LIBLAS
-find_package(libLAS REQUIRED)
-find_package (LASzip QUIET)
+# LASLIB
+# find_package(libLAS REQUIRED)
+# find_package (LASzip QUIET)
+find_package (LASlib REQUIRED)
 
 # YamlCpp
 find_package(YamlCpp REQUIRED)
@@ -53,15 +54,15 @@ include( ${CGAL_USE_FILE} )
 
 include_directories( ${CMAKE_SOURCE_DIR}/thirdparty )
 
-include_directories( ${CGAL_INCLUDE_DIR} ${CGAL_3RD_PARTY_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${LIBLAS_INCLUDE_DIR} ${LASZIP_INCLUDE_DIR} ${YAMLCPP_INCLUDE_DIR} ${GDAL_INCLUDE_DIR})
+include_directories( ${CGAL_INCLUDE_DIR} ${CGAL_3RD_PARTY_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${YAMLCPP_INCLUDE_DIR} ${GDAL_INCLUDE_DIR} ${LASLIB_INCLUDE_DIR})
 link_directories(${YamlCpp_LIBRARY_DIRS})
 
-# build ptinpoly as static lib
-add_library(ptinpoly STATIC thirdparty/ptinpoly.c)
-set_target_properties(
-  ptinpoly
-  PROPERTIES C_STANDARD 11
-)
+# # build ptinpoly as static lib
+# add_library(ptinpoly STATIC thirdparty/ptinpoly.c)
+# set_target_properties(
+#   ptinpoly
+#   PROPERTIES C_STANDARD 11
+# )
 
 # Creating entries for target: 3dfier
 FILE(GLOB SRC_FILES src/*.cpp)
@@ -71,6 +72,6 @@ set_target_properties(
   PROPERTIES CXX_STANDARD 11
 )
 
-target_link_libraries( 3dfier ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${GDAL_LIBRARY} ${LIBLAS_LIBRARY} ${LASZIP_LIBRARY} ${YAMLCPP_LIBRARY} Boost::program_options Boost::filesystem Boost::locale ptinpoly)
+target_link_libraries( 3dfier ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${GDAL_LIBRARY} ${YAMLCPP_LIBRARY} Boost::program_options Boost::filesystem Boost::locale ${LASLIB_LIBRARY})
 
 install(TARGETS 3dfier DESTINATION bin)
diff --git a/cmake/Modules/FindLASlib.cmake b/cmake/Modules/FindLASlib.cmake
@@ -0,0 +1,45 @@
+###############################################################################
+#
+# CMake module to search for LASlib library
+#
+# On success, the macro sets the following variables:
+# LASLIB_FOUND       = if the library found
+# LASLIB_LIBRARY   = full path to the library
+# LASLIB_INCLUDE_DIR = where to find the library headers also defined,
+#                       but not for general use are
+# LASLIB_LIBRARY     = where to find the library.
+# LASLIB_VERSION     = version of library which was found, e.g. "1.2.5"
+#
+###############################################################################
+MESSAGE(STATUS "Searching for LASlib library")
+
+IF(LASLIB_INCLUDE_DIR)
+  # Already in cache, be silent
+  SET(LASLIB_FIND_QUIETLY TRUE)
+ENDIF()
+
+# IF(APPLE)
+#   SET(LASLIB_ROOT_DIR /usr/local/)
+#   MESSAGE(STATUS "Trying LasZip using default location LASLIB_ROOT=c:/laszip")
+# ENDIF()
+
+FIND_PATH(LASLIB_INCLUDE_DIR laszip.hpp
+  PATH_PREFIXES laszip
+  PATHS
+  /usr/include
+  /usr/local/include
+  /usr/local/include/LASlib
+  # ${LASLIB_ROOT_DIR}/include
+  NO_DEFAULT_PATH)
+
+SET(LASLIB_NAMES ${LASLIB_LIBRARY} LASlib)
+
+FIND_LIBRARY(LASLIB_LIBRARY
+  NAMES ${LASLIB_NAMES}
+  PATHS
+  /usr/lib
+  /usr/local/lib
+  /usr/local/lib/LASlib
+  ${LASLIB_ROOT_DIR}/lib)
+
+
diff --git a/cmake/Modules/FindLASzip.cmake b/cmake/Modules/FindLASzip.cmake
diff --git a/cmake/Modules/FindlibLAS.cmake b/cmake/Modules/FindlibLAS.cmake
diff --git a/resources/config_files/myconfig.yml b/resources/config_files/myconfig.yml
@@ -96,3 +96,4 @@ options:
   building_radius_vertex_elevation: 3.0
   radius_vertex_elevation: 1.0
   threshold_jump_edges: 0.5
+  threshold_bridge_jump_edges: 0.5
diff --git a/resources/config_files/myconfig_DEFAULTS.yml b/resources/config_files/myconfig_DEFAULTS.yml
@@ -36,4 +36,5 @@ input_elevation:
 options:
   building_radius_vertex_elevation: 3.0
   radius_vertex_elevation: 1.0
-  threshold_jump_edges: 0.5
+  threshold_jump_edges: 0.5
+  threshold_bridge_jump_edges: 0.5
diff --git a/resources/config_files/myconfig_README.yml b/resources/config_files/myconfig_README.yml
@@ -90,4 +90,5 @@ options:                                                # Global options
   building_radius_vertex_elevation: 3.0                 # Radius in meters used for point-vertex distance between 3D points and vertices of building polygons, radius_vertex_elevation used when not specified
   radius_vertex_elevation: 1.0                          # Radius in meters used for point-vertex distance between 3D points and vertices of polygons
   threshold_jump_edges: 0.5                             # Threshold in meters for stitching adjacent objects, when the height difference is larger then the threshold a vertical wall is created 
+  threshold_bridge_jump_edges: 0.5                      # Threshold in meters for stitching bridges to adjacent objects, if not specified it falls back to threshold_jump_edges
   extent: xmin, ymin, xmax, ymax                        # Filter the input polygons to this extent
diff --git a/src/Bridge.cpp b/src/Bridge.cpp
@@ -1,7 +1,7 @@
 /*
   3dfier: takes 2D GIS datasets and "3dfies" to create 3D city models.
 
-  Copyright (C) 2015-2018  3D geoinformation research group, TU Delft
+  Copyright (C) 2015-2019  3D geoinformation research group, TU Delft
 
   This file is part of 3dfier.
 

diff --git a/src/Bridge.h b/src/Bridge.h
@@ -1,7 +1,7 @@
 /*
   3dfier: takes 2D GIS datasets and "3dfies" to create 3D city models.
 
-  Copyright (C) 2015-2018  3D geoinformation research group, TU Delft
+  Copyright (C) 2015-2019  3D geoinformation research group, TU Delft
 
   This file is part of 3dfier.
 

diff --git a/src/Building.cpp b/src/Building.cpp
@@ -1,7 +1,7 @@
 /*
   3dfier: takes 2D GIS datasets and "3dfies" to create 3D city models.
 
-  Copyright (C) 2015-2018  3D geoinformation research group, TU Delft
+  Copyright (C) 2015-2019  3D geoinformation research group, TU Delft
 
   This file is part of 3dfier.
 

diff --git a/src/Building.h b/src/Building.h
@@ -1,7 +1,7 @@
 /*
   3dfier: takes 2D GIS datasets and "3dfies" to create 3D city models.
 
-  Copyright (C) 2015-2018  3D geoinformation research group, TU Delft
+  Copyright (C) 2015-2019  3D geoinformation research group, TU Delft
 
   This file is part of 3dfier.
 

diff --git a/src/Forest.cpp b/src/Forest.cpp
@@ -1,7 +1,7 @@
 /*
   3dfier: takes 2D GIS datasets and "3dfies" to create 3D city models.
 
-  Copyright (C) 2015-2018  3D geoinformation research group, TU Delft
+  Copyright (C) 2015-2019  3D geoinformation research group, TU Delft
 
   This file is part of 3dfier.
 

diff --git a/src/Forest.h b/src/Forest.h
@@ -1,7 +1,7 @@
 /*
   3dfier: takes 2D GIS datasets and "3dfies" to create 3D city models.
 
-  Copyright (C) 2015-2018  3D geoinformation research group, TU Delft
+  Copyright (C) 2015-2019  3D geoinformation research group, TU Delft
 
   This file is part of 3dfier.