Fix unexpected recursions in geometry splitting

.github/workflows/autobuild.yml

@@ -0,0 +1,140 @@
+name: Continuous Integration
+on:
+  push:
+    branches: [ main ]
+
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  Build-on-Ubuntu-Qt5:
+    name: "Build on Ubuntu for Qt5"
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          aqtversion: '==3.1.*'
+          version: '5.15.2'
+          host: 'linux'
+          target: 'desktop'
+          arch: 'gcc_64'
+          tools: 'tools_ninja'
+          cache: true
+
+      - name: Set up compiler cache
+        uses: chocobo1/setup-ccache-action@v1
+        with:
+          ccache_options: |
+            max_size=100M
+          override_cache_key: ccache-linux-gcc-x86_64
+          update_packager_index: false
+
+      - name: Configure project
+        run: >
+          mkdir build && cd build && cmake -GNinja
+          -DCMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc
+          -DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++
+          -DCMAKE_MAKE_PROGRAM:FILEPATH=$IQTA_TOOLS/Ninja/ninja
+          ..
+
+      - name: Build project
+        run: cd build && cmake --build . --target all -- -k0
+
+      - name: Test project
+        run: cd build && ctest --rerun-failed --output-on-failure
+        env:
+          QT_QPA_PLATFORM: offscreen
+
+  Build-on-Ubuntu-Qt6:
+    name: "Build on Ubuntu for Qt6"
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          aqtversion: '==3.1.*'
+          version: '6.6.1'
+          host: 'linux'
+          target: 'desktop'
+          arch: 'gcc_64'
+          modules: 'qt3d'
+          tools: 'tools_ninja'
+          cache: true
+
+      - name: Set up compiler cache
+        uses: chocobo1/setup-ccache-action@v1
+        with:
+          ccache_options: |
+            max_size=100M
+          override_cache_key: ccache-linux-clang-x86_64
+          update_packager_index: false
+
+      - name: Configure project
+        run: >
+          mkdir build && cd build && cmake -GNinja
+          -DCMAKE_C_COMPILER:FILEPATH=/usr/bin/clang-15
+          -DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/clang++-15
+          -DCMAKE_MAKE_PROGRAM:FILEPATH=$IQTA_TOOLS/Ninja/ninja
+          ..
+
+      - name: Build project
+        run: cd build && cmake --build . --target all -- -k0
+
+      - name: Test project
+        run: cd build && ctest --rerun-failed --output-on-failure
+        env:
+          QT_QPA_PLATFORM: offscreen
+
+  Build-on-Windows-Qt6:
+    name: "Build on Windows for Qt6"
+    runs-on: windows-2022
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          aqtversion: '==3.1.*'
+          version: '6.6.1'
+          host: 'windows'
+          target: 'desktop'
+          arch: 'win64_mingw'
+          modules: 'qt3d'
+          tools: 'tools_mingw90 tools_ninja'
+          cache: true
+
+      - name: Set up compiler cache
+        uses: chocobo1/setup-ccache-action@v1
+        with:
+          ccache_options: |
+            max_size=100M
+          override_cache_key: ccache-windows-mingw64
+          windows_compile_environment: msvc # guess "windows_package_manager: choco" would be a better name
+
+      - name: Configure project
+        run: >
+          mkdir build && cd build && cmake -GNinja
+          -DCMAKE_C_COMPILER:FILEPATH=$env:IQTA_TOOLS/mingw1120_64/bin/gcc.exe
+          -DCMAKE_CXX_COMPILER:FILEPATH=$env:IQTA_TOOLS/mingw1120_64/bin/g++.exe
+          -DCMAKE_MAKE_PROGRAM:FILEPATH=$env:IQTA_TOOLS/Ninja/ninja.exe
+          ..
+
+      - name: Build project
+        run: cd build && cmake --build . --target all -- -k0
+
+      - name: Test project
+        run: cd build && ctest --rerun-failed --output-on-failure

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.18)
 
 project(QtCSG VERSION 0.1 LANGUAGES CXX)
 enable_testing()
@@ -10,36 +10,63 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050f00)
-add_compile_options(-Werror=switch -Werror=unused)
+list(PREPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
+option(QTCSG_IGNORE_ERRORS "Ignore errors when building CSG trees")
+
+if (QTCSG_IGNORE_ERRORS)
+    add_compile_definitions(QTCSG_IGNORE_ERRORS=1)
+endif()
+
+add_compile_definitions(
+    QT_DISABLE_DEPRECATED_BEFORE=0x050f00
+    QT_NO_CONTEXTLESS_CONNECT=1
+)
+
+add_compile_options(
+    $<$<COMPILE_LANGUAGE:CXX>:-Werror=missing-declarations>
+    -Wall -Wextra
+    -Werror=parentheses
+    -Werror=sign-compare
+    -Werror=switch
+    -Werror=unused
+    -Werror=type-limits
+)
+
+include(QtCSGDebug)
+include(QtCSGEnableAlternateLinker)
+qtcsg_enable_alternate_linker()
 
 # Find Qt5 or Qt6
 set(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC)
 set(CMAKE_FIND_PACKAGE_SORT_ORDER NAME)
 
 set(QT_MODULES Core Gui Test Widgets 3DCore 3DExtras 3DRender)
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS ${QT_MODULES})
-find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ${QT_MODULES})
-
-foreach(module ${QT_MODULES})
-    add_library(Qt::${module} ALIAS Qt${QT_VERSION_MAJOR}::${module})
-endforeach()
-
-# Very minimal backport of qt_add_executable for Qt
-if (NOT COMMAND qt_add_executable)
-    function(qt_add_executable NAME)
-        if (ANDROID)
-            add_library(${NAME} SHARED ${ARGN})
-        else()
-            add_executable(${NAME} ${ARGN})
-        endif()
-    endfunction()
-endif()
+message(STATUS "Building for Qt ${QT_VERSION} from ${QT_DIR}")
+set(Qt${QT_VERSION_MAJOR}_DIR "${QT_DIR}")
+
+find_package(Qt${QT_VERSION_MAJOR} ${QT_VERSION} REQUIRED COMPONENTS ${QT_MODULES})
+
+include(QtCSGBackports)
 
 add_subdirectory(qtcsg)
 add_subdirectory(qt3dcsg)
 
+add_subdirectory(assets)
 add_subdirectory(demo)
 add_subdirectory(tests)
 
-add_custom_target(docs SOURCES README.md docs/demo.png)
+add_custom_target(
+    docs SOURCES
+    LICENSE.md
+    LICENSE.spdx
+    licenses/BSD-3-Clause.md
+    licenses/GPL-3.0-or-later.md
+    README.md
+    docs/demo.png
+)
+add_custom_target(
+    github SOURCES
+    .github/workflows/autobuild.yml
+)

LICENSE.md

@@ -0,0 +1,18 @@
+# Licensing information
+
+Unless otherwise noted, the files in this project are provided under the 
+terms of the [GNU General Public  License](licenses/GPL-3.0-or-later.md).
+
+As an exception to this, the following files are provided under the 
+terms of the [revised BSD 3-Clause License](licenses/BSD-3-Clause.md):
+
+- [demo/shaders/gl3/robustwireframe.frag](demo/shaders/gl3/robustwireframe.frag)
+- [demo/shaders/gl3/robustwireframe.geom](demo/shaders/gl3/robustwireframe.geom)
+- [demo/shaders/gl3/robustwireframe.vert](demo/shaders/gl3/robustwireframe.vert)
+
+As with any licensing, the license offered here is a starting point
+for negotiations. Contact me if this offer doesn't work for you:
+
+    Mathias Hasselmann <mathias+qtcsg@taschenorakel.de>
+
+PackageLicenseDeclared: GPL-3.0-or-later AND BSD-3-Clause

LICENSE.spdx

@@ -0,0 +1,18 @@
+SPDXVersion: SPDX-2.1
+DataLicense: CC0-1.0
+PackageName: QtCSG
+PackageOriginator: Person: Mathias Hasselmann
+PackageHomePage: https://github.com/hasselmm/qtcsg.git
+PackageLicenseDeclared: GPL-3.0-or-later AND BSD-3-Clause
+
+FileName: demo/shaders/gl3/robustwireframe.frag
+FileContributor: Klaralvdalens Datakonsult AB (KDAB)
+LicenseConcluded: BSD-3-Clause
+
+FileName: demo/shaders/gl3/robustwireframe.geom
+FileContributor: Klaralvdalens Datakonsult AB (KDAB)
+LicenseConcluded: BSD-3-Clause
+
+FileName: demo/shaders/gl3/robustwireframe.vert
+FileContributor: Klaralvdalens Datakonsult AB (KDAB)
+LicenseConcluded: BSD-3-Clause

README.md

@@ -74,8 +74,7 @@ The code has been tested with Qt 5.15 and Qt 6.2.
 
 ## Legal Notice
 
-QtCSG is released under the terms of the GNU General Public License v3.0 or later
+QtCSG is provided under the terms of the
+[GNU General Public License v3.0 or later](licenses/GPL-3.0-or-later.md)
 
-Copyright Ⓒ 2022 Mathias Hasselmann
-
-SPDX-License-Identifier: GPL-3.0-or-later
+See [LICENSE.md](LICENSE.md) for detailed licensing information.

assets/CMakeLists.txt

@@ -0,0 +1 @@
+qt_add_library(QtCSGAssets OBJECT qtcsgassets.qrc)