Move SimpleSets files out of core.

.gitignore

@@ -16,4 +16,5 @@ cmake-build-release/
 cmake-build-relwithdebinfo/
 cmake-build-minsizerel/
 html/
-latex/
+latex/
+wasm_build/

CMakeLists.txt

@@ -40,6 +40,7 @@ endif()
 
 ### DEPENDENCIES ###
 if(EMSCRIPTEN)
+    # If you modify anything in this Emscripten build setup, do not forget to also adjust cmake/CartoCrowConfig.cmake appropriately.
     add_compile_definitions(
         USE_BOOST_HEADERS=1
         CGAL_ALWAYS_ROUND_TO_NEAREST
@@ -48,7 +49,7 @@ if(EMSCRIPTEN)
     add_compile_options(-fwasm-exceptions)
     add_link_options(-g -fwasm-exceptions -lembind --preload-file ${CMAKE_CURRENT_SOURCE_DIR}/data@/data)
     if (NOT DEFINED EMSCRIPTEN_INCLUDE_DIR)
-        message(FATAL_ERROR "Please set EMSCRIPTEN_INCLUDE_DIR to the folder with all header files needed for emscripten compilation")
+        message(FATAL_ERROR "Please set EMSCRIPTEN_INCLUDE_DIR to the folder with all header files needed for Emscripten compilation")
     endif()
     include_directories(${EMSCRIPTEN_INCLUDE_DIR})
 else()
@@ -79,9 +80,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 
 add_subdirectory(cartocrow)
-if (EMSCRIPTEN)
-    add_subdirectory(wasm_frontend)
-else()
+if (NOT EMSCRIPTEN)
     add_subdirectory(demos)
     add_subdirectory(frontend)
     add_subdirectory(test)

cartocrow/CMakeLists.txt

@@ -13,7 +13,6 @@ endmacro(cartocrow_install_module)
 add_subdirectory(core)
 add_subdirectory(circle_segment_helpers)
 add_subdirectory(renderer)
-add_subdirectory(simplesets)
 add_subdirectory(necklace_map)
 add_subdirectory(flow_map)
 if (NOT EMSCRIPTEN)
@@ -33,7 +32,6 @@ target_link_libraries(
     necklace_map
     flow_map
     isoline_simplification
-    simplesets
     chorematic_map
 )
 else()
@@ -44,7 +42,6 @@ target_link_libraries(
     renderer
     necklace_map
     flow_map
-    simplesets
 )
 endif()
 

cartocrow/core/cropped_voronoi.h

@@ -1,12 +1,10 @@
 #ifndef CARTOCROW_CROPPED_VORONOI_H
 #define CARTOCROW_CROPPED_VORONOI_H
 
-#include "cartocrow/core/core.h"
-#include "cartocrow/simplesets/types.h"
+#include "core.h"
 #include <list>
 
 using namespace cartocrow;
-using namespace cartocrow::simplesets;
 
 std::optional<Segment<Exact>> intersectionConvex(const Polygon<Exact>& polygon, const Ray<Exact>& ray) {
 	auto sourceInside = polygon.has_on_bounded_side(ray.source());