README screenshots.

+ Fix spartan path.
+ Fix triangle draw mode.

.github/workflows/all-builds.yml

@@ -1,16 +1,10 @@
-name: Build
+name: All Builds
 
 on:
   push:
-    branches:
-      - '*'
-    # Runs on tag so the release workflow can use its artifact.
-    tags:
-      - "v*"
   pull_request:
   workflow_dispatch:
 
-
 env:
   QT_VERSION: 6.6.0
 
@@ -102,16 +96,6 @@ jobs:
           cd build
           cpack -C Release -G NSIS
 
-      - name: Upload logs on failure (WIN)
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: Build-Logs
-          path: |
-            D:\a\qtk\qtk\build\packages\_CPack_Packages\win64\NSIS\NSISOutput.log
-            D:\a\qtk\qtk\build\CMakeFiles\CMakeOutput.log
-            D:\a\qtk\qtk\build\CMakeFiles\CMakeError.log
-
       - name: Upload package artifacts (WIN)
         if: matrix.os == 'windows-latest'
         uses: actions/upload-artifact@v4
@@ -138,7 +122,7 @@ jobs:
       - name: Upload Qtk install directory
         uses: actions/upload-artifact@v4
         with:
-          name: qtk-gui-${{ matrix.os }}-archive
+          name: qtk-gui-${{ matrix.os }}-install
           path: install/*
 
 # TODO: Enable after trimming resources.
@@ -198,13 +182,13 @@ jobs:
 
       - name: Build Qtk Library
         shell: bash
-        run: cmake --build build/ --config Release --target qtk -- ${{ matrix.flags }}
+        run: cmake --build build/ --config Release --target qtk_library -- ${{ matrix.flags }}
 
       # Packaging
 
       - name: Install Qtk Library
         shell: bash
-        run: cmake --install build/ --config Release --prefix=$(pwd)/install --component qtk
+        run: cmake --install build/ --config Release --prefix=$(pwd)/install --component qtk_library
 
       - name: Package Qtk Library
         shell: bash
@@ -232,21 +216,11 @@ jobs:
           cd build
           cpack -C Release -G NSIS
 
-      - name: Upload logs on failure (WIN)
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: Build-Logs
-          path: |
-            D:\a\qtk\qtk\build\packages\_CPack_Packages\win64\NSIS\NSISOutput.log
-            D:\a\qtk\qtk\build\CMakeFiles\CMakeOutput.log
-            D:\a\qtk\qtk\build\CMakeFiles\CMakeError.log
-
       - name: Upload package artifacts (WIN)
         if: matrix.os == 'windows-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: libqtk-${{ matrix.os }}
+          name: qtk-${{ matrix.os }}
           path: |
             build/packages/*.exe
 
@@ -261,7 +235,7 @@ jobs:
         if: matrix.os == 'macos-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: libqtk-${{ matrix.os }}
+          name: qtk-${{ matrix.os }}
           path: |
             build/packages/*.tar.gz
 
@@ -269,7 +243,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: libqtk-${{ matrix.os }}-archive
+          name: libqtk-${{ matrix.os }}-install
           path: install/*
 
   Qtk-Plugins:
@@ -360,29 +334,3 @@ jobs:
       - name: Build Qtk
         shell: bash
         run: cmake --build build/ --config Release
-
-  release:
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
-    needs: [Qtk, Qtk-Library, Qtk-Plugins]
-    steps:
-      - name: Download Installer Artifact
-        uses: actions/download-artifact@v4
-        with:
-          path: |
-            build/packages/*
-            install/*
-
-      - name: Create GitHub Release
-        id: create_release
-        uses: softprops/action-gh-release@v1
-        with:
-          name: Qtk ${{ github.ref_name }}
-          draft: true
-          prerelease: false
-          generate_release_notes: true
-          files: |
-            build/packages/*
-            install/*
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CMakeLists.txt

@@ -2,9 +2,9 @@
 ## Project for working with OpenGL and Qt6 widgets                            ##
 ##                                                                            ##
 ## Author: Shaun Reed | Contact: shaunrd0@gmail.com | URL: www.shaunreed.com  ##
-## All Content (c) 2025 Shaun Reed, all rights reserved                       ##
+## All Content (c) 2023 Shaun Reed, all rights reserved                       ##
 ################################################################################
-cmake_minimum_required(VERSION 3.28)
+cmake_minimum_required(VERSION 3.23)
 
 ################################################################################
 # Constants
@@ -18,7 +18,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_MACOSX_BUNDLE ON)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set(CMAKE_AUTORCC_OPTIONS --binary)
 
 if(WIN32)
   set(CMAKE_COMPILE_WARNING_AS_ERROR OFF)
@@ -31,7 +30,7 @@ add_compile_options(-fPIC)
 ################################################################################
 project(
     #[[NAME]]   Qtk
-    VERSION     0.3
+    VERSION     0.2
     DESCRIPTION "Qt OpenGL library and desktop application."
     LANGUAGES   CXX C
 )
@@ -48,10 +47,18 @@ include(GNUInstallDirs)
 ################################################################################
 option(QTK_DEBUG "Enable debugger" OFF)
 option(QTK_SUBMODULES "Update external project (assimp) submodule" OFF)
+option(QTK_GUI "Build the Qtk desktop application" ON)
+option(QTK_PLUGINS "Install Qtk plugins to Qt Creator path." OFF)
 option(QTK_EXAMPLE "Build the Qtk example desktop application" ON)
 option(QTK_CCACHE "Enable ccache" ON)
+
+if (QTK_CCACHE)
+  set(CMAKE_CXX_COMPILER_LAUNCHER ccache)
+endif()
+
 # Install Qtk for use within Qt Creator projects only, instead of system-wide.
 option(QTK_PREFIX_QTCREATOR "Install Qtk to Qt Creator. Untested." OFF)
+
 # Option for bringing your own assimp installation; Otherwise not needed
 # + If assimp is available system-wide we can just set QTK_SUBMODULES OFF
 option(
@@ -60,18 +67,6 @@ option(
     OFF
 )
 
-# Qtk Component Options
-option(QTK_PLUGINS "Install Qtk plugins to Qt Designer path." OFF)
-# Options for qtk_gui
-option(QTK_GUI "Build the Qtk desktop application" ON)
-option(QTK_GUI_SCENE
-    "Fetch model resources and build the GUI with an example scene." OFF
-)
-
-if (QTK_CCACHE)
-  set(CMAKE_CXX_COMPILER_LAUNCHER ccache)
-endif()
-
 if(QTK_DEBUG OR CMAKE_BUILD_TYPE MATCHES "^[Dd][Ee][Bb][Uu][Gg]$")
   set(QTK_DEBUG ON)
   set(CMAKE_BUILD_TYPE Debug)
@@ -88,8 +83,6 @@ endif()
 
 set(QTK_RESOURCES "${CMAKE_SOURCE_DIR}/resources")
 set(QTK_OSX_ICONS ${CMAKE_SOURCE_DIR}/resources/icons/osx/kilroy.icns)
-string(TIMESTAMP YEAR "%Y")
-set(QTK_COPYRIGHT "All Content © 2021-${YEAR} Shaun Reed, all rights reserved.")
 
 # Point CMAKE_PREFIX_PATH to Qt6 install directory
 # If Qtk is built within Qt Creator this is not required.
@@ -189,8 +182,8 @@ endif()
 add_subdirectory(src)
 
 if(QTK_EXAMPLE)
-  # Create a namespaced alias for linking with libqtk in the example.
+  # Create a namespaced alias for linking with qtk_library in the example.
-  add_library(${PROJECT_NAME}::qtk ALIAS qtk)
+  add_library(${PROJECT_NAME}::qtk_library ALIAS qtk_library)
   add_subdirectory(example-app EXCLUDE_FROM_ALL)
 endif()
 
@@ -205,25 +198,3 @@ foreach(VAR_NAME IN LISTS VAR_NAMES VAR_PATHS)
     message(STATUS "[Qtk] ${VAR_NAME}=${${VAR_NAME}}")
   endif()
 endforeach()
-message(STATUS "[Qtk] Installation prefix: ${CMAKE_INSTALL_PREFIX}")
-message(STATUS "[Qtk] Found Qt6: ${Qt6Core_VERSION}")
-
-# qt_generate_deploy_app_script is supported on Linux in QtCore >= 6.5.0.
-# qt_generate_deploy_app_script supports Windows and OSX in QtCore >= 6.3.
-# https://doc.qt.io/qt-6.5/qt-generate-deploy-app-script.html
-# https://doc.qt.io/archives/qt-6.4/qt-generate-deploy-app-script.html
-# The application can still build and run, we just can't install.
-if(QTK_GUI OR QTK_EXAMPLE)
-  if(UNIX AND NOT APPLE)
-    # Ubuntu 24.04 provides QtCore 6.4.2 in qt-base-dev.
-    # This version of qt_generate_deploy_app_script does not support Linux.
-    if (Qt6_VERSION VERSION_LESS "6.5.0")
-      message(WARNING "[Qtk] Installation is only supported on Qt >=6.5.\n")
-    endif()
-  elseif(APPLE OR WIN32)
-    # Predates qt_generate_deploy_app_script.
-    if (Qt6_VERSION VERSION_LESS "6.3.0")
-      message(WARNING "[Qtk] Installation is only supported on Qt >=6.5.\n")
-    endif()
-  endif()
-endif()

README.md

@@ -1,18 +1,13 @@
 # Qtk
 
-[![All Builds](https://github.com/shaunrd0/qtk/actions/workflows/build.yml/badge.svg)](https://github.com/shaunrd0/qtk/actions/workflows/build.yml)
+[![All Builds](https://github.com/shaunrd0/qtk/actions/workflows/all-builds.yml/badge.svg)](https://github.com/shaunrd0/qtk/actions/workflows/all-builds.yml)
 [![Linting](https://github.com/shaunrd0/qtk/actions/workflows/linting.yml/badge.svg)](https://github.com/shaunrd0/qtk/actions/workflows/linting.yml)
 
+Qtk is a Qt OpenGL graphics library that wraps some QOpenGL functionality in convenience classes
+that allow rendering geometry in 2D and 3D using custom GLSL shader programs.
+
 The Qtk desktop application provides a model loader using [Assimp](https://assimp.org/) within a Qt widget application.
-You can fly around the scene using WASD while holding down the left or right mouse button.
+You can fly around the scene using WASD while holding down the right mouse button.
-[QtkWidget](./src/designer-plugins/qtkwidget.h) is the primary QOpenGLWidget used to render the scene and handle input.
-
-The underlying shared library [libqtk](./src/qtk) wraps QOpenGL objects in convenience classes that leverage
-lower-level OpenGL APIs to handle the rendering process manually. Many of these classes offer
-ways to expand the low-level OpenGL logic within a Qt application without having to set up much scaffolding.
-
-The Qtk GUI is built using custom [Qt Designer plugins](https://doc.qt.io/qt-6/designer-creating-custom-widgets.html). These can be installed to Qt Designer for
-use in other Qt applications, or built exclusively for Qtk. See [Build Options](#build-options) for more details.
 
 Object names can be double-clicked in the tree view panel for quick camera navigation.
 Properties of the object, like shader code and translation / scale, can be viewed and modified in the side panel.
@@ -29,13 +24,7 @@ detached from the main window in this way.
 The small triangles floating near 3D models represent the light source being used for the shader.
 These appear on models using phong, specular, and diffuse lighting techniques.
 
-The example scene contains basic examples like texture mapping to make a crate from simple cube geometry.
+The default scene contains basic examples like texture mapping to make a crate from basic cube geometry
-This scene is used in the following screenshots, and can be built locally by enabling
-the `QTK_GUI_SCENE` [Build Option](#build-options) described below. Because this scene
-uses large 3D model resources, this option is disabled by default.
-
-The default scene with this option disabled is empty, but comes with a default skybox.
-Models can be added to the scene by clicking and dragging an `.obj` into the scene view.
 
 ![](resources/screenshots/screen-texture.png)
 
@@ -60,99 +49,43 @@ Key features that are planned:
 - [x] Runtime loading of `.obj` or similar 3D models.
 - [x] Drag-and-drop interaction for adding objects to the scene.
 - [x] Shader / object properties panel to modify related settings.
-- [x] Reduce size of application resources and git references.
 - [ ] Runtime reloading of modified GLSL shaders attached to objects within scenes.
 - [ ] Multiple views of a scene at one time.
 - [ ] Camera control modes such as panning, orbiting, or following objects.
-- [ ] Save / load scene data. The current model requires writing C++ code.
+- [ ] Save / load for scene data. The current inheritance model is temporary.
 - [ ] Basic text editor for quickly modifying shaders attached to objects.
+- [ ] Reduce size of application resources and git references.
 
-For examples of using libqtk, see the [example-app](./example-app)
+For examples of using the Qtk API, see the `example-app` project in the root of
-project in the root of this repository.
+this repository.
 
 To get textures loading on models look
 into [material files](http://www.paulbourke.net/dataformats/mtl/)
-and see some examples at [qtk-resources/resources/models](https://git.shaunreed.com/shaunrd0/qtk-resources/src/branch/master/models).
+and see some examples in the `resources/models/` directory.
 
 ### Source Builds
 
 Qtk was developed and tested using CLion
 and [Qt Creator](https://github.com/qt-creator/qt-creator).
-Simply open the root `CMakeLists.txt` with either of these editors and default
+Simply open the root `CMakeLists.txt` with either of these editors and
-configurations will be loaded. To simplify providing Qt to the build, Qt Creator
+configurations will be loaded.
-is the recommended option.
 
-If you have manually installed [Qt6 Open Source Binaries](https://www.qt.io/download-qt-installer)
+This project has been ported to **Qt 6.6.0**, which is not yet available in
-for your system, be sure to correctly set your `CMAKE_PREFIX_PATH` in the next steps.
+Ubuntu apt repositories.
-On Ubuntu 24.04 the default installation directory to use for this path using Qt 6.5.0 is `$HOME/Qt/6.5.0/gcc_64/lib/cmake`.
+To run this project, you will *need* to
-
+install [Qt6 Open Source Binaries](https://www.qt.io/download-qt-installer) for
-The Ubuntu apt repositories contain all the packages we need to build all targets.
+your system, **version 6.6.0** or later.
-To build Qtk desktop application with the scene in the screenshots below run the following commands.
+Be sure to take note of the Qt6 installation directory, as we will need it to
-
+correctly set our `CMAKE_PREFIX_PATH` in the next steps.
-```bash
-sudo apt update && sudo apt install cmake build-essential git ccache libxkbcommon-dev libassimp-dev qt6-base-dev qt6-tools-dev
-cmake -DQTK_GUI_SCENE=ON -B build
-cmake --build build
-./build/bin/qtk_gui
-```
-
-#### Build Options
-
-Qtk is composed of three separate components.
-
-* The shared library [libqtk](./src/qtk) provides classes that leverage QOpenGL functionality
-while still using lower-level OpenGL APIs to customize the rendering process.
-Many of these classes can be further expanded, such as [Qtk::Scene](./src/qtk/scene.h).
-This taget, `qtk` in cmake, is always selected to build and install as
-it is required by all other components in this project.
-* The [Qtk desktop application](./src/app) is built using libqtk within a Qt application.
-This target, `qtk_gui` in cmake, is optional and can be controlled using the `QTK_GUI` option below.
-* The GUI for the Qtk desktop application is constructed using a [custom set of Qt Designer widget plugins](./src/designer-plugins) that are also built using libqtk.
-If `QTK_GUI` is disabled this target (`qtk_plugins`) is optional and can be controlled using the `QTK_PLUGINS` options below.
-
-
-| Name                     | Description                                                  | Default |
-|--------------------------|--------------------------------------------------------------|:--------|
-| QTK_DEBUG                | Enable debug mode.                                           | OFF     |
-| QTK_SUBMODULES           | Use git submodules to fetch assimp dependency.               | OFF     |
-| QTK_EXAMPLE              | Build the libqtk example desktop application.                | ON      |
-| QTK_CCACHE               | Enable CCACHE.                                               | ON      |
-| QTK_ASSIMP_NEW_INTERFACE | Use the assimp::assimp interface. Recommended for WIN / OSX. | OFF     |
-| QTK_PLUGINS*             | Install Qtk plugins to Qt Designer.                          | OFF     |
-| QTK_GUI                  | Build and install Qtk desktop application.                   | ON      |
-| QTK_GUI_SCENE            | Fetch external 3D model resources for example scene.         | OFF     |
-
-*The Qtk plugins are always built if `QTK_GUI` is enabled. Disabling this option
-with QTK_GUI set will not mark the plugins for installation if we do
-`cmake --install build/` without selecting a component. If both `QTK_GUI` and
-`QTK_PLUGINS` are unset, neither will be built.
 
 If you are building on **Windows / Mac**, consider setting
 the `-DQTK_ASSIMP_NEW_INTERFACE` cmake build option.
 
-By default, the build will not initialize Assimp as a git submodule and build
+If the build is configured with all options enabled, we can subsequently install
-from source.
+individual components as needed with cmake.
-We can turn this on by setting the `-DQTK_SUBMODULES=ON` flag when running
-CMake.
-Building using this option will fetch and build Assimp for us, but builds will
-take longer as a result.
-Using `-DQTK_SUBMODULES=ON` supports providing assimp on cross-platform builds (
-Windows / Mac / Linux) and may be easier to configure.
 
 ```bash
-cmake -B build-all -DQTK_GUI=ON -DQTK_PLUGINS=ON -DQTK_EXAMPLE=ON -DQTK_SUBMODULES=ON -DCMAKE_PREFIX_PATH=$HOME/Qt/6.6.0/gcc_64
+sudo apt update -y && sudo apt install libassimp-dev cmake build-essential git ccache libgl1-mesa-dev libglvnd-dev zlib1g-dev -y
-```
-
-#### Qtk Components
-
-As described in [Build Options](#build-options), Qtk is composed of three separate components.
-Each component can be individually selected for building or installation.
-
-For this example we will configure the build with all options enabled.
-In the separate sections below we can install individual components with cmake.
-
-```bash
-sudo apt update -y && sudo apt install cmake build-essential git ccache libxkbcommon-dev libassimp-dev qt6-base-dev qt6-tools-dev -y
 git clone https://github.com/shaunrd0/qtk
 cd qtk
 # Configure the build with all components enabled
@@ -161,33 +94,54 @@ cmake -B build-all -DQTK_GUI=ON -DQTK_PLUGINS=ON -DQTK_EXAMPLE=ON -DCMAKE_PREFIX
 cmake --build build-all/
 ````
 
-Now that we have all the components fully built, the following sections will
+By default, the build will not initialize Assimp as a git submodule and build
-install each component individually.
+from source.
-If you want to uninstall previously installed components, run the following command.
+We can turn this on by setting the `-DQTK_SUBMODULES=ON` flag when running
+CMake.
+Building using this option will fetch and build Assimp for us, but builds will
+take longer as a result.
+Using `-DQTK_SUBMODULES=ON` supports providing assimp on cross-platform builds (
+Windows / Mac / Linux) and may be easier
+to configure.
 
 ```bash
-sudo xargs rm -v < install_manifest.txt
+cmake -B build-all -DQTK_GUI=ON -DQTK_PLUGINS=ON -DQTK_EXAMPLE=ON -DQTK_SUBMODULES=ON -DCMAKE_PREFIX_PATH=$HOME/Qt/6.6.0/gcc_64
 ```
 
-##### Qtk Library
+#### Qtk GUI
 
-Shared libqtk library for working with lower-level OpenGL to customize the rendering process.
+```bash
+cmake --build build-all/ --target qtk_gui -- -j $(nproc)
+# Install Qtk desktop application (output removed)
+# Installation prefix path must be absolute, since Qtk uses Qt deploy tools.
+cmake --install build-all/ --component qtk_gui --prefix=$(pwd)/install
+./install/bin/qtk_gui
+```
+
+If any errors are encountered loading plugins, we can debug plugin loading by
+setting the following environment variable -
+
+```bash
+QT_DEBUG_PLUGINS=1 ./install/bin/qtk_gui
+```
+
+#### Qtk Library
+
+Qtk provides a simple library for working with QOpenGL.
 We can install this library on a system path or a custom path and then
 set `CMAKE_PREFIX_PATH` to point to this location when building an application
 using libqtk.
 
-Here we will install to the `/usr/local/` path.
-
 ```bash
 # Install libqtk only
-cmake --build build-all/ --target qtk -- -j $(nproc)
+cmake --build build-all/ --target qtk_library -- -j $(nproc)
-cmake --install build-all/ --component qtk --prefix=/usr/local
+cmake --install build-all/ --component qtk_library --prefix=/usr/local
 -- Install configuration: "Release"
 -- Installing: /usr/local/lib/cmake/Qtk/QtkConfig.cmake
 -- Installing: /usr/local/lib/cmake/Qtk/QtkConfigVersion.cmake
 -- Installing: /usr/local/lib/cmake/Qtk/QtkTargets.cmake
 -- Installing: /usr/local/lib/cmake/Qtk/QtkTargets-release.cmake
--- Installing: /usr/local/lib/static/libqtk.a
+-- Installing: /usr/local/lib/static/libqtk_library.a
 -- Installing: /usr/local/include/qtk/camera3d.h
 -- Installing: /usr/local/include/qtk/input.h
 -- Installing: /usr/local/include/qtk/meshrenderer.h
@@ -204,26 +158,7 @@ cmake --install build-all/ --component qtk --prefix=/usr/local
 -- Installing: /usr/local/include/qtk/transform3D.h
 ```
 
-##### Qtk GUI
+#### Qtk Plugin Collection
-
-The Qtk desktop application can be built and installed with the following commands.
-
-```bash
-cmake --build build-all/ --target qtk_gui -- -j $(nproc)
-# Install Qtk desktop application (output removed)
-# Installation prefix path must be absolute, since Qtk uses Qt deploy tools.
-cmake --install build-all/ --component qtk_gui --prefix=$(pwd)/install
-./install/bin/qtk_gui
-```
-
-If any errors are encountered loading plugins, we can debug plugin loading by
-setting the following environment variable
-
-```bash
-QT_DEBUG_PLUGINS=1 ./install/bin/qtk_gui
-```
-
-##### Qtk Plugin Collection
 
 This project defines a collection of widget plugins for use with Qt Designer.
 These plugins were used to build the interface for the Qtk desktop application.
@@ -244,12 +179,19 @@ cmake --build build-all/ --target qtk_plugins -- -j $(nproc)
 # The path here should be initialized during build configuration, so no need for --prefix
 cmake --install build-all/ --component qtk_plugins
 -- Install configuration: "Release"
--- Up-to-date: /home/shaun/Qt/6.6.0/gcc_64/../../Tools/QtCreator/lib/Qt/lib/libqtk.a
+-- Up-to-date: /home/shaun/Qt/6.6.0/gcc_64/../../Tools/QtCreator/lib/Qt/lib/libqtk_library.a
 -- Up-to-date: /home/shaun/Qt/6.6.0/gcc_64/../../Tools/QtCreator/lib/Qt/lib/libqtk_plugin_library.a
 -- Up-to-date: /home/shaun/Qt/6.6.0/gcc_64/../../Tools/QtCreator/lib/Qt/plugins/designer/libqtk_collection.so
 ```
 
-#### Example libqtk Application
+To uninstall after a previous installation, we can run the following command
+from the root of the repository.
+
+```bash
+xargs rm < build/install_manifest.txt
+```
+
+#### Qtk Example
 
 There is a simple example of using libqtk in the [example-app/](example-app)
 directory. The example can be built standalone using `find_package` or as a
@@ -271,7 +213,7 @@ This project is using `clang-format` version `>=15.0.5`.
 On Ubuntu 24.04, clang-format 18 is available to install in apt repositories.
 
 ```bash
-sudo apt install clang-format clang-tidy
+sudo apt install clang-format
 ```
 
 If `clang-format --version` is any earlier than `15.0.0`, running `clang-format` will fail because this project uses configuration options made available since `15.0.0`.
@@ -284,11 +226,6 @@ Ubuntu clang-format version 18.1.3 (1ubuntu1)
 CLion has integration for IDE code reformatting actions with `clang-format`.
 If you're using CLion, the `.clang-format` configuration will be picked up by CLion automatically.
 
-This repository provides the [`tools/format.sh`](./tools/format.sh) helper script to run `clang-tidy` and `clang-format` on Ubuntu 24.04.
-Running the script will build Qtk, so it's important to ensure you can manually build from source first.
-
-If you'd still like to run these tools manually, see the instructions below.
-
 `clang-tidy` can be run with the following commands.
 
 ```bash
@@ -296,18 +233,14 @@ If you'd still like to run these tools manually, see the instructions below.
 cd qtk
 # Build
 cmake -B build && cmake --build build -- -j $(nproc)
-```
+clang-tidy -p build/ --fix --config-file=.clang-tidy src/**/*.cpp src/**/*.h example-app/*.cpp example-app/*.h
-
-```bash
-export SOURCES=src/**/*.cpp src/**/*.h example-app/*.cpp example-app/*.h
-run-clang-tidy -p build/ -j $(nproc --ignore=1) -fix -config-file=.clang-tidy $SOURCES
 ```
 
 Last we need to run `clang-format`, this can be done with the command directly.
 This will reformat all the code in the repository.
 
 ```bash
-clang-format -i --style=file:.clang-format $SOURCES
+clang-format -i --style=file:.clang-format src/**/*.cpp src/**/*.h example-app/*.cpp example-app/*.h
 ```
 
 `clang-format` can be run with git integration (or CLion if you prefer).
@@ -370,7 +303,7 @@ To generate packages for Qtk desktop application, we should
 set `-DQTK_GUI=ON`. If this option is not set we will only package libqtk.
 
 The NSIS installer will allow component-specific path modification for all of
-these installation components through a Windows GUI install application.
+these installation components through a GUI install application.
 
 ##### Resources
 

example-app/CMakeLists.txt

@@ -2,7 +2,7 @@
 ## Example client project using qtk                                           ##
 ##                                                                            ##
 ## Author: Shaun Reed | Contact: shaunrd0@gmail.com | URL: www.shaunreed.com  ##
-## All Content (c) 2025 Shaun Reed, all rights reserved                       ##
+## All Content (c) 2023 Shaun Reed, all rights reserved                       ##
 ################################################################################
 cmake_minimum_required(VERSION 3.23)
 
@@ -56,8 +56,8 @@ endif()
 
 # Allow add_subdirectory on this project to use target ALIAS if available.
 # If this example project is opened standalone we will use find_package.
-if(NOT TARGET Qtk::qtk)
+if(NOT TARGET Qtk::qtk_library)
-  find_package(Qtk 0.3 REQUIRED)
+  find_package(Qtk 0.2 REQUIRED)
 endif()
 
 find_package(Qt6 COMPONENTS Core Widgets OpenGLWidgets REQUIRED)
@@ -77,13 +77,9 @@ configure_file(
 
 qt_add_executable(qtk_example ${EXAMPLE_SOURCES})
 target_link_libraries(qtk_example PUBLIC Qt6::Widgets Qt6::OpenGLWidgets Qt6::Core)
-target_link_libraries(qtk_example PUBLIC Qtk::qtk)
+target_link_libraries(qtk_example PUBLIC Qtk::qtk_library)
 target_include_directories(qtk_example PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
 
-# qt_generate_deploy_app_script supports Windows and OSX in QtCore >= 6.3.
-# qt_generate_deploy_app_script is supported on Linux in QtCore >= 6.5.0.
-if((Qt6_VERSION VERSION_GREATER_EQUAL "6.3.0" AND (WIN32 OR APPLE))
-    OR Qt6_VERSION VERSION_GREATER_EQUAL "6.5.0")
 install(
     TARGETS qtk_example
     COMPONENT qtk_example
@@ -98,6 +94,3 @@ if((Qt6_VERSION VERSION_GREATER_EQUAL "6.3.0" AND (WIN32 OR APPLE))
     NO_UNSUPPORTED_PLATFORM_ERROR
 )
 install(SCRIPT ${QTK_EXAMPLE_DEPLOY_SCRIPT} COMPONENT qtk_example)
-elseif(NOT Qtk_IS_TOP_LEVEL)
-  message(WARNING "[Qtk] Installation is only supported on Qt >=6.5.\n")
-endif()

example-app/examplescene.cpp

@@ -22,7 +22,12 @@ ExampleScene::~ExampleScene() = default;
 
 void ExampleScene::init()
 {
-  setSkybox(new Qtk::Skybox);
+  setSkybox(new Qtk::Skybox("Skybox"));
+
+  std::string spartanPath = QTK_EXAMPLE_SOURCE_DIR;
+  spartanPath += "/../resources/models/spartan/spartan.obj";
+  auto spartan = addObject(new Model("spartan", spartanPath.c_str()));
+  spartan->getTransform().setTranslation(-4.0f, 0.0f, 0.0f);
 
   auto mesh = addObject(
       new Qtk::MeshRenderer("rightTriangle", Triangle(QTK_DRAW_ELEMENTS)));

resources/icons/linux/linux-icons.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-# $1: Input path to an image to use for generating icons.
-# Helper script to generate qtk's icons for Linux given a path to an input PNG.
-sudo apt install imagemagick
-
-convert "$1" -resize 256x256 kilroy-256.png
-convert "$1" -resize 128x128 kilroy-128.png
-convert "$1" -resize 64x64 kilroy-64.png
-convert "$1" -resize 48x48 kilroy-48.png
-convert "$1" -resize 32x32 kilroy-32.png
-convert "$1" -resize 16x16 kilroy-16.png

resources/icons/osx/README.md

@@ -0,0 +1,13 @@
+
+```bash
+sudo apt install icnsutils
+```
+
+```bash
+convert icon.png -resize 32x32 kilroy_32.png
+convert icon.png -resize 16x16 kilroy_16.png
+convert icon.png -resize 48x48 kilroy_48.png
+convert icon.png -resize 128x128 kilroy_128.png
+convert icon.png -resize 256x256 kilroy_256.png
+png2icns png2icns kilroy.icns kilroy_*.png
+```

resources/icons/osx/osx-icons.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-# $1: Input path to an image to use for generating icons.
-# Helper script to generate qtk's icons for OSX given a path to an input PNG.
-sudo apt install icnsutils imagemagick
-
-convert "$1" -resize 32x32 kilroy_32.png
-convert "$1" -resize 16x16 kilroy_16.png
-convert "$1" -resize 48x48 kilroy_48.png
-convert "$1" -resize 128x128 kilroy_128.png
-convert "$1" -resize 256x256 kilroy_256.png
-# For the application bundle in OSX.
-png2icns png2icns kilroy.icns kilroy_*.png
-
-# For the splash image in DMG installers.
-convert "$1" -resize 800x600! kilroy_splash.png

resources/icons/win/win-icons.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-# $1: Input path to an image to use for generating icons.
-# Helper script to generate qtk's icons for Windows given a path to an input PNG.
-sudo apt install imagemagick
-
-# For the NSIS (un)installer executable shortcut icon.
-convert "$1" -resize 256x256,128x128,64x64,48x48,32x32,16x16 -background transparent -colors 256 kilroy.ico
-
-# For the NSIS installer splash screen.
-convert "$1" -resize 164x314! -background white -flatten kilroy_splash.bmp

resources/minimal_resources.qrc

@@ -1,21 +0,0 @@
-<RCC>
-    <qresource prefix="/textures">
-        <file alias="crate.png">images/crate.png</file>
-        <file alias="stone.png">images/stone.png</file>
-        <file alias="wood.png">images/wood.png</file>
-        <file>skybox/back.png</file>
-        <file>skybox/bottom.png</file>
-        <file>skybox/front.png</file>
-        <file>skybox/left.png</file>
-        <file>skybox/right.png</file>
-        <file>skybox/top.png</file>
-    </qresource>
-    <qresource prefix="/icons">
-        <file>fontawesome-free-6.2.1-desktop/svgs/solid/cube.svg</file>
-        <file>fontawesome-free-6.2.1-desktop/svgs/regular/trash-can.svg</file>
-        <file>fontawesome-free-6.2.1-desktop/svgs/regular/folder-open.svg</file>
-        <file>fontawesome-free-6.2.1-desktop/svgs/regular/floppy-disk.svg</file>
-        <file>fontawesome-free-6.2.1-desktop/svgs/brands/git-alt.svg</file>
-        <file alias="icon.png">icons/icon.png</file>
-    </qresource>
-</RCC>

resources/models/alien-hominid/alien.mtl

@@ -0,0 +1,55 @@
+# Blender MTL File: 'None'
+# Material Count: 4
+
+newmtl AlienHominid
+Ns 225.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.533344 0.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Bump normal.png
+map_Kd diffuse.png
+map_Ns roughness.png
+refl specular.png
+
+newmtl Blaster
+Ns 225.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Bump blaster_normal.png
+map_Kd blaster_diffuse.png
+map_Ke blaster_emissive.png
+map_Ns blaster_roughness.png
+refl blaster_specular.png
+
+newmtl Screenshot_2021-04-19_194508
+Ns 225.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd smoke.png
+map_d smoke.png
+
+newmtl Untitled-1
+Ns 77.904748
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd Untitled-1.png
+map_d Untitled-1.png

resources/models/backpack/backpack.mtl

@@ -0,0 +1,16 @@
+# Blender MTL File: 'None'
+# Material Count: 1
+
+newmtl Scene_-_Root
+Ns 225.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ke 0.0 0.0 0.0
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd diffuse.jpg
+map_Bump normal.png
+map_Ks specular.jpg
+

resources/models/backpack/source_attribution.txt

@@ -0,0 +1,3 @@
+Model by Berk Gedik, from: https://sketchfab.com/3d-models/survival-guitar-backpack-low-poly-799f8c4511f84fab8c3f12887f7e6b36
+
+Modified material assignment (Joey de Vries) for easier load in OpenGL model loading chapter, and renamed albedo to diffuse and metallic to specular to match non-PBR lighting setup.

resources/models/bird/bird.mtl

@@ -0,0 +1,7 @@
+newmtl material_0
+map_bump normal.jpg
+norm normal.jpg
+map_Kd diffuse.jpg
+occlusion occlusion.jpg
+Pm 0
+Pr 0.793152

resources/models/floor.obj

@@ -0,0 +1,12 @@
+# Blender v2.82 (sub 7) OBJ File: ''
+# www.blender.org
+mtllib floor.mtl
+o floor
+v -1.000000 -0.000000 1.000000
+v 1.000000 -0.000000 1.000000
+v 1.000000 0.000000 -1.000000
+v -1.000000 0.000000 -1.000000
+vn 0.0000 1.0000 0.0000
+usemtl Default_OBJ
+s off
+f 1//1 2//1 3//1 4//1

resources/models/scythe/scythe.mtl

@@ -0,0 +1,8 @@
+# WaveFront *.mtl file (generated by CINEMA 4D)
+
+newmtl item/objectcomponents/weapon/staff_2h_artifactdeadwind_d_03.m2_Geoset_000
+Ka 0.25 0.25 0.25
+Kd 1 1 1
+map_Kd diffuse.png
+illum 7
+

resources/models/spartan/spartan.mtl

@@ -0,0 +1,104 @@
+# Blender MTL File: 'None'
+# Material Count: 8
+
+newmtl Spartan_Arms_Mat
+Ns 179.999996
+Ka 1.000000 1.000000 1.000000
+Kd 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd Spartan_Arms_Mat_BaseColor.png
+map_Bump Spartan_Arms_Mat_Normal.png
+refl Spartan_Arms_Mat_Specular.png
+
+
+newmtl Spartan_Chest_Mat
+Ns 179.999996
+Ka 1.000000 1.000000 1.000000
+Kd 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd Spartan_Chest_Mat_BaseColor.png
+map_Bump Spartan_Chest_Mat_Normal.png
+refl Spartan_Chest_Mat_Specular.png
+
+newmtl Spartan_Ear_Mat
+Ns 179.999996
+Ka 1.000000 1.000000 1.000000
+Kd 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd Spartan_Ears_Mat_BaseColor.png
+map_Bump Spartan_Ears_Mat_Normal.png
+refl Spartan_Ears_Mat_Specular.png
+
+newmtl Spartan_Helmet_Mat
+Ns 179.999996
+Ka 1.000000 1.000000 1.000000
+Kd 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd Spartan_Helmet_Mat_BaseColor.png
+map_Bump Spartan_Helmet_Mat_Normal.png
+refl Spartan_Helmet_Mat_Specular.png
+
+newmtl Spartan_Legs_Mat
+Ns 179.999996
+Ka 1.000000 1.000000 1.000000
+Kd 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd Spartan_Legs_Mat_BaseColor.png
+map_Bump Spartan_Legs_Mat_Normal.png
+refl Spartan_Legs_Mat_Specular.png
+
+newmtl Spartan_Shoulders_Mat
+Ns 179.999996
+Ka 1.000000 1.000000 1.000000
+Kd 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd Spartan_Shoulder_Mat_BaseColor.png
+map_Bump Spartan_Shoulder_Mat_Normal.png
+refl Spartan_Shoulder_Mat_Specular.png
+
+newmtl Spartan_Undersuit_Mat
+Ns 179.999996
+Ka 1.000000 1.000000 1.000000
+Kd 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd Spartan_Undersuit_Mat_BaseColor.png
+map_Bump Spartan_Undersuit_Mat_Normal.png
+refl Spartan_Undersuit_Mat_Specular.png
+
+newmtl lambert1
+Ns 179.999996
+Ka 1.000000 1.000000 1.000000
+Kd 0.500000 0.500000 0.500000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2

resources/qtk.desktop

@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Qtk
-Exec=/usr/bin/qtk_gui
-Icon=qtk
-Type=Application
-Categories=Utility;

resources/resources.qrc

@@ -1,5 +1,6 @@
 <RCC>
     <qresource prefix="/textures">
+        <file alias="plaster.png">images/plaster.png</file>
         <file alias="crate.png">images/crate.png</file>
         <file alias="stone.png">images/stone.png</file>
         <file alias="wood.png">images/wood.png</file>
@@ -16,7 +17,7 @@
         <file>fontawesome-free-6.2.1-desktop/svgs/regular/folder-open.svg</file>
         <file>fontawesome-free-6.2.1-desktop/svgs/regular/floppy-disk.svg</file>
         <file>fontawesome-free-6.2.1-desktop/svgs/brands/git-alt.svg</file>
-        <file alias="icon.png">icons/icon.png</file>
+        <file>icon.png</file>
     </qresource>
     <qresource prefix="/shaders">
         <file alias="model.frag">shaders/fragment/model.frag</file>
@@ -27,6 +28,8 @@
         <file alias="solid.vert">shaders/vertex/solid.vert</file>
         <file alias="solid-perspective.frag">shaders/fragment/solid-perspective.frag</file>
         <file alias="solid-perspective.vert">shaders/vertex/solid-perspective.vert</file>
+        <file alias="multi-color.frag">shaders/fragment/multi-color.frag</file>
+        <file alias="multi-color.vert">shaders/vertex/multi-color.vert</file>
         <file alias="rgb-normals.frag">shaders/fragment/rgb-normals.frag</file>
         <file alias="rgb-normals.vert">shaders/vertex/rgb-normals.vert</file>
         <file alias="texture-cubemap.frag">shaders/fragment/texture-cubemap.frag</file>
@@ -41,9 +44,88 @@
         <file alias="solid-specular.vert">shaders/vertex/solid-specular.vert</file>
         <file alias="solid-phong.frag">shaders/fragment/solid-phong.frag</file>
         <file alias="solid-phong.vert">shaders/vertex/solid-phong.vert</file>
+        <file alias="model-basic.frag">shaders/fragment/model-basic.frag</file>
+        <file alias="model-basic.vert">shaders/vertex/model-basic.vert</file>
         <file alias="model-phong.frag">shaders/fragment/model-phong.frag</file>
         <file alias="model-phong.vert">shaders/vertex/model-phong.vert</file>
         <file alias="model-normals.frag">shaders/fragment/model-normals.frag</file>
         <file alias="model-normals.vert">shaders/vertex/model-normals.vert</file>
+        <file alias="skybox.frag">skybox/skybox.frag</file>
+        <file alias="skybox.vert">skybox/skybox.vert</file>
+    </qresource>
+    <qresource prefix="/models">
+        <file>models/spartan/spartan.obj</file>
+        <file>models/alien-hominid/alien.obj</file>
+        <file>models/spartan/spartan.mtl</file>
+        <file>models/spartan/Spartan_Ears_Mat_BaseColor.png</file>
+        <file>models/spartan/Spartan_Undersuit_Mat_Specular.png</file>
+        <file>models/spartan/Spartan_Undersuit_Mat_Roughness.png</file>
+        <file>models/spartan/Spartan_Undersuit_Mat_Normal.png</file>
+        <file>models/spartan/Spartan_Undersuit_Mat_Metallic.png</file>
+        <file>models/spartan/Spartan_Undersuit_Mat_BaseColor.png</file>
+        <file>models/spartan/Spartan_Undersuit_Mat_AO.png</file>
+        <file>models/spartan/Spartan_Shoulder_Mat_Specular.png</file>
+        <file>models/spartan/Spartan_Shoulder_Mat_Roughness.png</file>
+        <file>models/spartan/Spartan_Shoulder_Mat_Normal.png</file>
+        <file>models/spartan/Spartan_Shoulder_Mat_Metallic.png</file>
+        <file>models/spartan/Spartan_Shoulder_Mat_BaseColor.png</file>
+        <file>models/spartan/Spartan_Shoulder_Mat_AO.png</file>
+        <file>models/spartan/Spartan_Legs_Mat_Specular.png</file>
+        <file>models/spartan/Spartan_Legs_Mat_Roughness.png</file>
+        <file>models/spartan/Spartan_Legs_Mat_Normal.png</file>
+        <file>models/spartan/Spartan_Legs_Mat_Metallic.png</file>
+        <file>models/spartan/Spartan_Legs_Mat_BaseColor.png</file>
+        <file>models/spartan/Spartan_Legs_Mat_AO.png</file>
+        <file>models/spartan/Spartan_Helmet_Mat_Specular.png</file>
+        <file>models/spartan/Spartan_Helmet_Mat_Roughness.png</file>
+        <file>models/spartan/Spartan_Helmet_Mat_Normal.png</file>
+        <file>models/spartan/Spartan_Helmet_Mat_Metallic.png</file>
+        <file>models/spartan/Spartan_Helmet_Mat_BaseColor.png</file>
+        <file>models/spartan/Spartan_Helmet_Mat_AO.png</file>
+        <file>models/spartan/Spartan_Ears_Mat_Specular.png</file>
+        <file>models/spartan/Spartan_Ears_Mat_Roughness.png</file>
+        <file>models/spartan/Spartan_Ears_Mat_Normal.png</file>
+        <file>models/spartan/Spartan_Ears_Mat_Metallic.png</file>
+        <file>models/spartan/Spartan_Ears_Mat_AO.png</file>
+        <file>models/spartan/Spartan_Chest_Mat_Specular.png</file>
+        <file>models/spartan/Spartan_Chest_Mat_Roughness.png</file>
+        <file>models/spartan/Spartan_Chest_Mat_Normal.png</file>
+        <file>models/spartan/Spartan_Chest_Mat_Metallic.png</file>
+        <file>models/spartan/Spartan_Chest_Mat_BaseColor.png</file>
+        <file>models/spartan/Spartan_Chest_Mat_AO.png</file>
+        <file>models/spartan/Spartan_Arms_Mat_Specular.png</file>
+        <file>models/spartan/Spartan_Arms_Mat_Roughness.png</file>
+        <file>models/spartan/Spartan_Arms_Mat_Normal.png</file>
+        <file>models/spartan/Spartan_Arms_Mat_Metallic.png</file>
+        <file>models/spartan/Spartan_Arms_Mat_BaseColor.png</file>
+        <file>models/spartan/Spartan_Arms_Mat_AO.png</file>
+        <file>models/spartan/lambert1_Roughness.png</file>
+        <file>models/spartan/lambert1_Nrm.png</file>
+        <file>models/spartan/lambert1_Colour-Opacity.png</file>
+        <file>models/backpack/specular.jpg</file>
+        <file>models/backpack/roughness.jpg</file>
+        <file>models/backpack/diffuse.jpg</file>
+        <file>models/backpack/normal.png</file>
+        <file>models/backpack/backpack.obj</file>
+        <file>models/backpack/backpack.mtl</file>
+        <file>models/backpack/ao.jpg</file>
+        <file>models/alien-hominid/specular.png</file>
+        <file>models/alien-hominid/roughness.png</file>
+        <file>models/alien-hominid/normal.png</file>
+        <file>models/alien-hominid/diffuse.png</file>
+        <file>models/alien-hominid/blaster_specular.png</file>
+        <file>models/alien-hominid/blaster_roughness.png</file>
+        <file>models/alien-hominid/blaster_normal.png</file>
+        <file>models/alien-hominid/blaster_emissive.png</file>
+        <file>models/alien-hominid/blaster_diffuse.png</file>
+        <file>models/alien-hominid/alien.mtl</file>
+        <file>models/scythe/scythe.obj</file>
+        <file>models/scythe/scythe.mtl</file>
+        <file>models/scythe/diffuse.png</file>
+        <file>models/bird/occlusion.jpg</file>
+        <file>models/bird/normal.jpg</file>
+        <file>models/bird/diffuse.jpg</file>
+        <file>models/bird/bird.obj</file>
+        <file>models/bird/bird.mtl</file>
     </qresource>
 </RCC>