4dsound · CasimirGeelhoed · Aug 28, 2025 · Aug 28, 2025 · Aug 29, 2025 · Aug 29, 2025
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -0,0 +1,53 @@
+# This starter workflow is for a CMake project running on a single platform. There is a different starter workflow if you need cross-platform coverage.
+# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-multi-platform.yml
+name: Build and test
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  workflow_dispatch:
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [windows-latest, ubuntu-latest, macos-latest]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Install prerequisites
+      shell: bash
+      if: matrix.os == 'ubuntu-latest'
+      run: |
+        sudo apt update --fix-missing
+        sudo apt install -f
+        sudo apt install -y libx11-dev mesa-vulkan-drivers build-essential libxcb-xinerama0 libxcb-cursor0 libglu1-mesa-dev libxkbcommon-dev xvfb
+
+    - name: Check build environment
+      shell: bash
+      run: sh check_build_environment.sh
+
+    - name: Build and test linux
+      shell: bash
+      if: matrix.os == 'ubuntu-latest'
+      run: xvfb-run sh package_app.sh helloworld -b build -t -d
+
+    - name: Build and test win
+      shell: bash
+      if: matrix.os == 'windows-latest'
+      run: sh package_app.sh helloworld -b build
+
+    - name: Build and test macos
+      shell: bash
+      if: matrix.os == 'macos-latest'
+      run: sh package_app.sh helloworld -b build -t -d
+
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,7 +19,7 @@ add_subdirectory(system_modules/napcolor)
 add_subdirectory(system_modules/naprender)
 add_subdirectory(system_modules/napsdlinput)
 add_subdirectory(system_modules/napapp)
-#add_subdirectory(system_modules/napimgui)
+add_subdirectory(system_modules/napimgui)
 add_subdirectory(system_modules/napparameter)
 add_subdirectory(system_modules/napparametergui)
 add_subdirectory(system_modules/napcameracontrol)
@@ -33,6 +33,7 @@ add_subdirectory(system_modules/napapi)
 add_subdirectory(system_modules/napcalendar)
 add_subdirectory(system_modules/napsequence)
 add_subdirectory(system_modules/napsequencegui)
+add_subdirectory(system_modules/naprenderadvanced)
 
 set(NAP_BUILD_CONTEXT source) # This is here just to guarantee backwards compatibility with 0.6 style NAP modules
 add_subdirectory_modules(modules)
@@ -44,12 +45,15 @@ add_subdirectory(demos/audioanalysis)
 add_subdirectory(demos/oscmidi)
 add_subdirectory(demos/udpsend)
 add_subdirectory(demos/udpreceive)
+add_subdirectory(demos/computeflocking)
+add_subdirectory(demos/lightsandshadow)
+add_subdirectory(demos/spotlight)
+add_subdirectory(demos/skybox)
 
 add_subdirectory(tools/fbxconverter)
-
 if (DEFINED ENV{QT_DIR})
     add_subdirectory(qt)
     add_subdirectory(tools/napkin)
 else ()
     message(WARNING "QT_DIR environment variable not provided, skipping napkin target. Set QT_DIR to Qt location to build Napkin.")
-endif ()
+endif ()
diff --git a/apps/test/CMakeLists.txt b/apps/test/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.18.4)
+
+project(test)
+
+file(GLOB_RECURSE SOURCES src/*.cpp)
+file(GLOB_RECURSE HEADERS src/*.h src/*.hpp)
+
+add_executable(${PROJECT_NAME} ${SOURCES} ${HEADERS})
diff --git a/apps/test/src/main.cpp b/apps/test/src/main.cpp
@@ -0,0 +1,5 @@
+#include <iostream>
+
+int main(int argc, char *argv[]) {
+	std::cout << "Hello world!" << std::endl;
+}
diff --git a/check_build_environment.sh b/check_build_environment.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+nap_root=$( cd "$(dirname -- "$0")" ; pwd -P )
+#. $nap_root/tools/buildsystem/common/sh_shared.sh
+#configure_python $nap_root
+python3 $nap_root/tools/buildsystem/check_build_environment/source_user_onboarding.py
+
+
diff --git a/cmake/default_path_mapping.json b/cmake/default_path_mapping.json
@@ -7,7 +7,7 @@
   [
     "{ROOT}",
     "{ROOT}/lib",
-    "{ROOT}/../Resources"
+    "{ROOT}/../Resources/lib"
   ],
   "BuildPath": "{PROJECT_DIR}",
   "DataPath":  "{PROJECT_DIR}/../Resources/"

diff --git a/cmake/find_modules/Findnapcore.cmake b/cmake/find_modules/Findnapcore.cmake
@@ -49,20 +49,18 @@ if(WIN32)
 endif()
 
 # Install into packaged app for macOS/Linux
-if(NOT WIN32)
+if(UNIX)
     install(FILES ${NAPCORE_LIBS_RELEASE} DESTINATION lib CONFIGURATIONS Release)
 
     # On Linux use lib directory for RPATH
-    if(NOT APPLE)
-        install(CODE "message(\"Setting RPATH on ${CMAKE_INSTALL_PREFIX}/lib/napcore.so\")
-                      execute_process(COMMAND patchelf
-                                              --set-rpath
-                                              $ORIGIN/.
-                                              ${CMAKE_INSTALL_PREFIX}/lib/napcore.so
-                                      RESULT_VARIABLE EXIT_CODE)
-                      if(NOT \${EXIT_CODE} EQUAL 0)
-                          message(FATAL_ERROR \"Failed to fetch RPATH on napcore.so using patchelf\")
-                      endif()
-                      ")
-    endif()
+    install(CODE "message(\"Setting RPATH on ${CMAKE_INSTALL_PREFIX}/lib/napcore.so\")
+                  execute_process(COMMAND patchelf
+                                          --set-rpath
+                                          $ORIGIN/.
+                                          ${CMAKE_INSTALL_PREFIX}/lib/napcore.so
+                                  RESULT_VARIABLE EXIT_CODE)
+                  if(NOT \${EXIT_CODE} EQUAL 0)
+                      message(FATAL_ERROR \"Failed to fetch RPATH on napcore.so using patchelf\")
+                  endif()
+                  ")
 endif()
diff --git a/cmake/find_modules/Findnaprtti.cmake b/cmake/find_modules/Findnaprtti.cmake
@@ -74,7 +74,7 @@ if(WIN32)
 endif()
 
 # Package naprtti and RTTR into apps for macOS/Linux
-if(NOT WIN32)
+if(UNIX)
     install(FILES ${NAPRTTI_LIBS_RELEASE} DESTINATION lib CONFIGURATIONS Release)
     install(FILES $<TARGET_FILE:RTTR::Core> DESTINATION lib CONFIGURATIONS Release)
 
@@ -88,18 +88,16 @@ if(NOT WIN32)
     endif()
 
     # On Linux use lib directory for RPATH
-    if(UNIX AND NOT APPLE)
-        install(CODE "message(\"Setting RPATH on ${CMAKE_INSTALL_PREFIX}/lib/naprtti.so\")
-                      execute_process(COMMAND patchelf
-                                              --set-rpath
-                                              $ORIGIN/.
-                                              ${CMAKE_INSTALL_PREFIX}/lib/naprtti.so
-                                      RESULT_VARIABLE EXIT_CODE)
-                      if(NOT \${EXIT_CODE} EQUAL 0)
-                          message(FATAL_ERROR \"Failed to fetch RPATH on naprtti.so using patchelf\")
-                      endif()
-                      ")
-    endif()
+    install(CODE "message(\"Setting RPATH on ${CMAKE_INSTALL_PREFIX}/lib/naprtti.so\")
+                  execute_process(COMMAND patchelf
+                                          --set-rpath
+                                          $ORIGIN/.
+                                          ${CMAKE_INSTALL_PREFIX}/lib/naprtti.so
+                                  RESULT_VARIABLE EXIT_CODE)
+                  if(NOT \${EXIT_CODE} EQUAL 0)
+                      message(FATAL_ERROR \"Failed to fetch RPATH on naprtti.so using patchelf\")
+                  endif()
+                  ")
 
     # Package our Python dylib from thirdparty. Doing this here instead of in nappython as RTTI (and as a result Core)
     # depends on Python. The Python modules however are only installed if we're using nappython as they're not required

diff --git a/cmake/nap_app.cmake b/cmake/nap_app.cmake
@@ -33,7 +33,7 @@ if (TARGET nap${PROJECT_NAME})
     target_link_libraries(${PROJECT_NAME} nap${PROJECT_NAME})
 endif()
 
-set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/lib")
+set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/${LIB_RPATH}")
 
 # Create the cache directory in source
 set(cache_dir ${CMAKE_CURRENT_SOURCE_DIR}/cache)
@@ -135,19 +135,21 @@ add_custom_command(
         ${cache_dir}/build_app.json
         ${BIN_DIR}/${PROJECT_NAME}.json)
 
+set(source_data_dir ${CMAKE_CURRENT_SOURCE_DIR}/data)
+
+## Run FBX converter post-build within bin data dir
+#add_dependencies(${PROJECT_NAME} fbxconverter)
+#add_custom_command(TARGET ${PROJECT_NAME}
+#        POST_BUILD
+#        COMMAND ${BIN_DIR}/fbxconverter -o ${source_data_dir} ${source_data_dir}/*.fbx
+#        COMMENT "Exporting FBX in '${source_data_dir}'")
+
 # Copy data directory to app specific bin
 set(bin_data_dir ${app_install_data_dir}/data)
 add_custom_command(
         TARGET ${PROJECT_NAME} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${CMAKE_CURRENT_SOURCE_DIR}/data ${bin_data_dir})
-
-# Run FBX converter post-build within bin data dir
-add_dependencies(${PROJECT_NAME} fbxconverter)
-add_custom_command(TARGET ${PROJECT_NAME}
-        POST_BUILD
-        COMMAND ${BIN_DIR}/fbxconverter -o ${bin_data_dir} ${bin_data_dir}/*.fbx
-        COMMENT "Exporting FBX in '${bin_data_dir}'")
+        ${source_data_dir} ${bin_data_dir})
 
 # Copy core license files
 set(bin_license_dir ${BIN_DIR}/license)

diff --git a/cmake/nap_module.cmake b/cmake/nap_module.cmake
@@ -82,4 +82,4 @@ codesign_target(${PROJECT_NAME})
 
 # Install library and module json
 install(FILES $<TARGET_FILE:${PROJECT_NAME}> TYPE LIB OPTIONAL)
-install(FILES ${LIB_DIR}/${PROJECT_NAME}.json TYPE DATA OPTIONAL)
+install(FILES ${LIB_DIR}/${PROJECT_NAME}.json DESTINATION ${CMAKE_INSTALL_MODULEINFODIR} OPTIONAL)
diff --git a/cmake/nap_utilities.cmake b/cmake/nap_utilities.cmake
@@ -7,7 +7,7 @@ function(target_link_import_library target library)
     endif()
     get_target_property(library_path ${library} IMPORTED_LOCATION)
     get_target_property(library_path_debug ${library} IMPORTED_LOCATION_DEBUG)
-    if (DEFINED ${CMAKE_BUILD_TYPE})
+    if (DEFINED CMAKE_BUILD_TYPE)
         if (${CMAKE_BUILD_TYPE} STREQUAL "Debug" AND EXISTS ${library_path_debug})
             set(library_path ${library_path_debug})
         endif()

diff --git a/cmake/qt_checker/CMakeLists.txt b/cmake/qt_checker/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.18.4)
+project(qt_checker)
+
+# Add possible Qt installation paths to the HINTS section
+find_path(QT_DIR lib/cmake/Qt6/Qt6Config.cmake
+          HINTS
+          $ENV{QT_DIR}
+          )
+# Find_package for Qt6 will pick up the Qt installation from CMAKE_PREFIX_PATH
+set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_DIR})
+
+find_package(Qt6Core REQUIRED)
+find_package(Qt6Widgets REQUIRED)
+find_package(Qt6Gui REQUIRED)
+find_package(Qt6OpenGL REQUIRED)
+message(STATUS "Found Qt ${Qt6Core_VERSION}")
diff --git a/cmake/qtconfig.cmake b/cmake/qtconfig.cmake
@@ -20,10 +20,7 @@ macro(find_qt)
     endif()
 
     # Set vulkan SDK environment variable so QT to can find and use Vulkan
-    if(NOT DEFINED ENV{VULKAN_SDK})
-        set(ENV{VULKAN_SDK} "${NAP_ROOT}/system_modules/naprender/thirdparty/vulkansdk/${NAP_THIRDPARTY_PLATFORM_DIR}/${ARCH}")
-        message(STATUS "Using VULKAN_SDK environment variable: $ENV{VULKAN_SDK}")
-    endif()
+    set(ENV{VULKAN_SDK} "${NAP_ROOT}/system_modules/naprender/thirdparty/vulkansdk/${NAP_THIRDPARTY_PLATFORM_DIR}/${ARCH}")
 
     # Add possible Qt installation paths to the HINTS section
     # The version probably doesn't have to match exactly (5.8.? is probably fine)
@@ -33,17 +30,7 @@ macro(find_qt)
               )
 
     if(QT_DIR)
-        if(APPLE AND DEFINED NAP_PACKAGED_BUILD)
-              # Ensure we're not using Qt from homebrew as we don't know the legal situation with packaging homebrew's packages.
-              # Plus Qt's own opensource packages should have wider macOS version support.
-              if(EXISTS ${QT_DIR}/INSTALL_RECEIPT.json)
-                  message(FATAL_ERROR "Homebrew's Qt packages aren't allowed due largely to a legal unknown.
-                          Install Qt's own opensource release and point environment variable QT_DIR there.")
-              endif()
-        endif()
-
         # TODO Ensure we're not packaging system Qt on Linux, we only want to use a download from qt.io
-
         # Find_package for Qt6 will pick up the Qt installation from CMAKE_PREFIX_PATH
         set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_DIR})
     else()

diff --git a/cmake/setup.cmake b/cmake/setup.cmake
@@ -23,7 +23,11 @@ macro(setup)
 
     # Rpath for searching dynamic libraries
     file(RELATIVE_PATH LIB_RPATH ${BIN_DIR} ${LIB_DIR})
-    set(CMAKE_BUILD_RPATH_USE_ORIGIN TRUE)
+    if (APPLE)
+#        set(CMAKE_SKIP_BUILD_RPATH TRUE)
+    else ()
+        set(CMAKE_BUILD_RPATH_USE_ORIGIN TRUE)
+    endif ()
 
     # Set the app installation directories
     if (NOT DEFINED APP_INSTALL_NAME)
@@ -39,6 +43,7 @@ macro(setup)
         set(CMAKE_INSTALL_LIBDIR ${APP_INSTALL_NAME})
         set(CMAKE_INSTALL_DATADIR ${APP_INSTALL_NAME})
         set(CMAKE_INSTALL_DOCDIR ${APP_INSTALL_NAME}/doc)
+        set(CMAKE_INSTALL_MODULEINFODIR ${APP_INSTALL_NAME}/lib)
     else()
         if (APPLE)
             # Install in app bundle structure on MacOS
@@ -47,14 +52,17 @@ macro(setup)
             set(CMAKE_INSTALL_DATADIR ${APP_INSTALL_NAME}/Contents/Resources)
             set(CMAKE_INSTALL_DOCDIR ${APP_INSTALL_NAME}/Contents/Resources/doc)
             set(CMAKE_INSTALL_INFODIR ${APP_INSTALL_NAME}/Contents) # Used for Info.plist file
+            set(CMAKE_INSTALL_MODULEINFODIR ${APP_INSTALL_NAME}/Contents/Resources/lib)
         else ()
             # Install libraries in lib, executable in app root on Linux
             set(CMAKE_INSTALL_BINDIR ${APP_INSTALL_NAME})
             set(CMAKE_INSTALL_LIBDIR ${APP_INSTALL_NAME}/lib)
             set(CMAKE_INSTALL_DATADIR ${APP_INSTALL_NAME})
             set(CMAKE_INSTALL_DOCDIR ${APP_INSTALL_NAME}/doc)
+            set(CMAKE_INSTALL_MODULEINFODIR ${APP_INSTALL_NAME}/lib)
         endif()
     endif()
+    set(CMAKE_INSTALL_MESSAGE LAZY)  # Don't tell us about up-to-date files.
 
     # Constants for searching library files
     if(APPLE)

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -18,7 +18,7 @@ if(APPLE)
                 src/nap/osx/directorywatcher.cpp
                 src/nap/osx/module.cpp
                 src/nap/osx/core_env.cpp
-                src/nap/native/modulemanager_ext.cpp
+                src/nap/native/modulecache_ext.cpp
                 src/nap/native/logger_ext.cpp
                 src/nap/native/core_ext.cpp
                 src/nap/native/resourcemanager_ext.cpp
@@ -29,7 +29,7 @@ elseif(MSVC)
                 src/nap/win32/directorywatcher.cpp
                 src/nap/win32/module.cpp
                 src/nap/win32/core_env.cpp
-                src/nap/native/modulemanager_ext.cpp
+                src/nap/native/modulecache_ext.cpp
                 src/nap/native/logger_ext.cpp
                 src/nap/native/core_ext.cpp
                 src/nap/native/resourcemanager_ext.cpp
@@ -44,7 +44,7 @@ elseif(UNIX)
                 src/nap/linux/directorywatcher.cpp
                 src/nap/linux/module.cpp
                 src/nap/linux/core_env.cpp
-                src/nap/native/modulemanager_ext.cpp
+                src/nap/native/modulecache_ext.cpp
                 src/nap/native/logger_ext.cpp
                 src/nap/native/core_ext.cpp
                 src/nap/native/resourcemanager_ext.cpp