CityJSON 2.0, CGAL 5.6

tudelft3d · Sep 28, 2023 · 82a64c8 · 82a64c8
1 parent 51a2732
commit 82a64c8
Show file tree

Hide file tree

Showing 26 changed files with 59 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # ![Icon](https://3d.bk.tudelft.nl/ken/img/azul-small.png) azul
 
-azul is a 3D city model viewer It is intended for viewing 3D city models in CityGML 1.0 and 2.0, CityJSON 1.0 and 1.1, IndoorGML, OBJ, OFF and POLY. It supports loading multiple files, selecting objects by clicking them or selecting them in the sidebar, toggling the visibility of individual items, and browsing their attributes. It is research software, but it is pretty stable and most datasets already work without problems. It is available under the GPLv3 licence.
+azul is a 3D city model viewer It is intended for viewing 3D city models in CityGML 1.0 and 2.0, CityJSON 1.0, 1.1 and 2.0, IndoorGML, OBJ, OFF and POLY. It supports loading multiple files, selecting objects by clicking them or selecting them in the sidebar, toggling the visibility of individual items, and browsing their attributes. It is research software, but it is pretty stable and most datasets already work without problems. It is available under the GPLv3 licence.
 
-The current version of azul is for macOS 12 and higher and supports both Apple Silicon and Intel Macs.
+The current version of azul is for macOS 13 and higher and supports both Apple Silicon and Intel Macs.
 
 ## Controls
 
@@ -69,7 +69,7 @@ azul is written in a mix of C++17, Swift 5, Objective-C 2 and Objective-C++. The
 
 ## Compilation
 
-We have included an Xcode 13 project to easily compile azul. It should be possible to compile azul on older macOS versions (from 10.14 onwards), but old versions of Xcode (older than 10) cannot compile Swift 5.
+We have included an Xcode 15 project to easily compile azul. It should be possible to compile azul on older macOS versions (from 10.14 onwards), but old versions of Xcode (older than 10) cannot compile Swift 5.
 
 azul depends on the following libraries: [Boost](http://www.boost.org), [CGAL](http://www.cgal.org), [GMP](https://gmplib.org), [MPFR](http://www.mpfr.org), [pugixml](http://pugixml.org) and [simdjson](https://github.com/simdjson/simdjson). Most of these can be easily obtained using [Homebrew](http://brew.sh), but we provide fat libraries (arm64 + x86_64) of them all for convenience.
 

diff --git a/azul.xcodeproj/project.pbxproj b/azul.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 48;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -224,8 +224,9 @@
 		BEF69F351F6AA0520079531B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 0900;
-				LastUpgradeCheck = 1410;
+				LastUpgradeCheck = 1500;
 				ORGANIZATIONNAME = "Ken Arroyo Ohori";
 				TargetAttributes = {
 					BEF69F3C1F6AA0520079531B = {
@@ -310,6 +311,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
@@ -344,6 +346,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = c11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -373,6 +376,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
@@ -407,6 +411,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = c11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -418,8 +423,9 @@
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
+				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OBJC_BRIDGING_HEADER = "/Users/ken/Versioned/azul/src/Azul-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
@@ -433,9 +439,10 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
 				CODE_SIGN_ENTITLEMENTS = azul.entitlements;
 				CODE_SIGN_IDENTITY = "-";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1100;
+				CURRENT_PROJECT_VERSION = 1110;
 				DEAD_CODE_STRIPPING = YES;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_TEAM = UD3V83TPY7;
@@ -444,19 +451,21 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				HEADER_SEARCH_PATHS = (
-					"$(SRCROOT)/libs\\ src/boost_1_77_0",
+					"$(SRCROOT)/include",
 					"$(SRCROOT)/src/DataManager",
-					/usr/local/Cellar/cgal/5.5/include,
-					"$(SRCROOT)/libs\\ src/pugixml-1.11/src",
 				);
 				INFOPLIST_FILE = src/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/libs",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.1;
+				MARKETING_VERSION = 1.1.1;
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				PRODUCT_BUNDLE_IDENTIFIER = tudelft3d.azul;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -475,29 +484,32 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
 				CODE_SIGN_ENTITLEMENTS = azul.entitlements;
 				CODE_SIGN_IDENTITY = "-";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1100;
+				CURRENT_PROJECT_VERSION = 1110;
 				DEAD_CODE_STRIPPING = YES;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_TEAM = UD3V83TPY7;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_C_LANGUAGE_STANDARD = c11;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				HEADER_SEARCH_PATHS = (
-					"$(SRCROOT)/libs\\ src/boost_1_77_0",
+					"$(SRCROOT)/include",
 					"$(SRCROOT)/src/DataManager",
-					/usr/local/Cellar/cgal/5.5/include,
-					"$(SRCROOT)/libs\\ src/pugixml-1.11/src",
 				);
 				INFOPLIST_FILE = src/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/libs",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.1;
+				MARKETING_VERSION = 1.1.1;
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				PRODUCT_BUNDLE_IDENTIFIER = tudelft3d.azul;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/azul.xcodeproj/xcuserdata/ken.xcuserdatad/xcschemes/azul.xcscheme b/azul.xcodeproj/xcuserdata/ken.xcuserdatad/xcschemes/azul.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1410"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/src/Assets.xcassets/Contents.json b/src/Assets.xcassets/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/src/Azul-Bridging-Header.h b/src/Azul-Bridging-Header.h
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/src/Controller.swift b/src/Controller.swift
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/src/DataManager/DataManager.cpp b/src/DataManager/DataManager.cpp
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/src/DataManager/DataManager.hpp b/src/DataManager/DataManager.hpp
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/src/DataManager/DataManagerWrapperWrapper.h b/src/DataManager/DataManagerWrapperWrapper.h
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/src/DataManager/DataManagerWrapperWrapper.mm b/src/DataManager/DataManagerWrapperWrapper.mm
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/src/DataManager/DataModel.hpp b/src/DataManager/DataModel.hpp
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/src/DataManager/Enhanced_constrained_triangulation_2.h b/src/DataManager/Enhanced_constrained_triangulation_2.h
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -86,7 +86,7 @@ class Enhanced_constrained_triangulation_2 : public T {
   }
 
   void odd_even_insert_constraint(Vertex_handle va, Vertex_handle vb) {
-    CGAL_triangulation_precondition(va != vb);
+    CGAL_precondition(va != vb);
 
 //    std::cout << "Triangulation:" << std::endl;
 //    for (typename T::All_faces_iterator current_face = T::all_faces_begin(); current_face != T::all_faces_end(); ++current_face) {

diff --git a/src/DataManager/GMLParsingHelper.hpp b/src/DataManager/GMLParsingHelper.hpp
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/src/DataManager/JSONParsingHelper.hpp b/src/DataManager/JSONParsingHelper.hpp
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -413,7 +413,8 @@ class JSONParsingHelper {
     if (docType == "CityJSON") {
       std::cout << docType << " " << docVersion << " detected" << std::endl;
       if (docVersion == "1.0" ||
-          docVersion == "1.1") {
+          docVersion == "1.1" ||
+          docVersion == "2.0") {
 
         simdjson::ondemand::object object;
 

diff --git a/src/DataManager/OBJParsingHelper.hpp b/src/DataManager/OBJParsingHelper.hpp
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/src/DataManager/OFFParsingHelper.hpp b/src/DataManager/OFFParsingHelper.hpp
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/src/DataManager/POLYParsingHelper.hpp b/src/DataManager/POLYParsingHelper.hpp
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/src/DataManager/PerformanceHelper.hpp b/src/DataManager/PerformanceHelper.hpp
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/src/DataManager/PerformanceHelperWrapperWrapper.h b/src/DataManager/PerformanceHelperWrapperWrapper.h
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/src/DataManager/PerformanceHelperWrapperWrapper.mm b/src/DataManager/PerformanceHelperWrapperWrapper.mm
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/src/DataManager/TableCellView.h b/src/DataManager/TableCellView.h
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/src/DataManager/TableCellView.m b/src/DataManager/TableCellView.m
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/src/Info.plist b/src/Info.plist
@@ -112,7 +112,7 @@
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016-2019 Ken Arroyo Ohori. All rights reserved.</string>
+	<string>Copyright © 2016-2023 Ken Arroyo Ohori. All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

diff --git a/src/Math.swift b/src/Math.swift
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/src/MetalView.swift b/src/MetalView.swift
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/src/Shaders.metal b/src/Shaders.metal
@@ -1,5 +1,5 @@
 // azul
-// Copyright © 2016-2022 Ken Arroyo Ohori
+// Copyright © 2016-2023 Ken Arroyo Ohori
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by