shaunrd0/qtk
1
1
Fork 0
Code Issues 9 Pull Requests 1 Projects Releases Wiki Activity

Remove large resources from the application. #16

Merged
shaunrd0 merged 45 commits from cleanup into master 2025-03-22 20:56:04 +00:00
Conversation 0 Commits 45 Files Changed 185 +44 -28
6 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 16baf6cdaf - Show all commits

38
.github/workflows/all-builds.yml vendored
View File

@ -10,6 +10,7 @@ env:
jobs:
Qtk:
name: Qtk Applications
env:
CONFIG: -DQTK_SUBMODULES=ON -DQTK_DEBUG=OFF -DQTK_CCACHE=OFF -DQTK_GUI=ON -DQTK_PLUGINS=OFF -DQTK_EXAMPLE=ON
strategy:
@ -29,10 +30,10 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Qt
uses: jurplel/install-qt-action@v2
uses: jurplel/install-qt-action@v4
with:
version: ${{ env.QT_VERSION }}
@ -82,7 +83,7 @@ jobs:
- name: Upload package artifacts (DEB)
if: matrix.os == 'ubuntu-latest'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: qtk-gui-${{ matrix.os }}
path: |
@ -97,7 +98,7 @@ jobs:
- name: Upload package artifacts (WIN)
if: matrix.os == 'windows-latest'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: qtk-gui-${{ matrix.os }}
path: |
@ -112,14 +113,14 @@ jobs:
- name: Upload package artifacts (OSX)
if: matrix.os == 'macos-latest'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: qtk-gui-${{ matrix.os }}
path: |
build/packages/*.tar.gz
- name: Upload Qtk install directory
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: qtk-gui-${{ matrix.os }}-install
path: install/*
@ -132,7 +133,7 @@ jobs:
# cmake --build build/ --target package_source
#
# - name: Upload package artifacts
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: qtk-${{ matrix.os }}-packages
# path: |
@ -140,6 +141,7 @@ jobs:
# !build/packages/_CPack_Packages/*
Qtk-Library:
name: Qtk library
env:
CONFIG: -DQTK_SUBMODULES=ON -DQTK_DEBUG=OFF -DQTK_CCACHE=OFF -DQTK_GUI=OFF -DQTK_PLUGINS=OFF -DQTK_EXAMPLE=OFF
strategy:
@ -159,10 +161,10 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Qt
uses: jurplel/install-qt-action@v2
uses: jurplel/install-qt-action@v4
with:
version: ${{ env.QT_VERSION }}
@ -201,7 +203,7 @@ jobs:
- name: Upload package artifacts (DEB)
if: matrix.os == 'ubuntu-latest'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: libqtk-${{ matrix.os }}
path: |
@ -216,7 +218,7 @@ jobs:
- name: Upload package artifacts (WIN)
if: matrix.os == 'windows-latest'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: qtk-${{ matrix.os }}
path: |
@ -231,20 +233,21 @@ jobs:
- name: Upload package artifacts (OSX)
if: matrix.os == 'macos-latest'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: qtk-${{ matrix.os }}
path: |
build/packages/*.tar.gz
- name: Upload libqtk install
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: libqtk-${{ matrix.os }}-install
path: install/*
Qtk-Plugins:
name: Qtk Qt Designer Plugins
env:
CONFIG: -DQTK_SUBMODULES=ON -DQTK_DEBUG=OFF -DQTK_CCACHE=OFF -DQTK_GUI=OFF -DQTK_PLUGINS=ON -DQTK_EXAMPLE=OFF
strategy:
@ -264,10 +267,10 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Qt
uses: jurplel/install-qt-action@v2
uses: jurplel/install-qt-action@v4
with:
version: ${{ env.QT_VERSION }}
@ -292,6 +295,7 @@ jobs:
run: cmake --install build/ --config Release --component qtk_plugins
Qtk-Assimp-Targets:
name: Qtk Assimp Platform Targets
strategy:
fail-fast: false
matrix:
@ -304,10 +308,10 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Qt
uses: jurplel/install-qt-action@v2
uses: jurplel/install-qt-action@v4
with:
version: ${{ env.QT_VERSION }}

14
.github/workflows/linting.yml vendored
View File

@ -9,10 +9,10 @@ jobs:
Tidy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Qt
uses: jurplel/install-qt-action@v2
uses: jurplel/install-qt-action@v4
with:
version: '6.5.0'
@ -22,7 +22,7 @@ jobs:
- name: Build Qtk
run: |
cmake -B build -DQTK_SUBMODULES=OFF -DQTK_CCACHE=OFF -DQTK_PLUGINS=OFF -DQTK_GUI=ON
cmake --build build --target qtk_gui -- -j $(nproc)
cmake --build build --target qtk_gui qtk_example -- -j $(nproc)
- uses: cpp-linter/cpp-linter-action@v2
id: linter
@ -30,7 +30,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
# Use clang-tools 14
version: '14'
version: '18'
# Don't use clang-format with this action
# + Set to `file` to use .clang-format (Qtk formats with clang 15)
style: ''
@ -57,12 +57,12 @@ jobs:
matrix:
path:
- 'src'
- 'app'
- 'example-app'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: clang-format Check
uses: jidicula/clang-format-action@v4.9.0
with:
clang-format-version: '15'
clang-format-version: '18'
check-path: ${{ matrix.path }}

8
src/app/main.cpp
View File

@ -18,6 +18,14 @@ int main(int argc, char * argv[])
QApplication a(argc, argv);
auto window = MainWindow::getMainWindow();
// Qtk currently uses the decorator pattern to save / load scenes.
// This is a temporary solution and will be improved in the future.
// NOTE: We set the scene here and not in QtkMainWindow to detach the scene
// from the QtkWidget plugin (qtk_plugin_library build target).
// Once we can save / load scenes, this call, and QtkScene, can be removed.
window->getQtkWidget()->setScene(new QtkScene);
window->show();
return QApplication::exec();

4
src/app/qtkmainwindow.cpp
View File

@ -7,7 +7,6 @@
##############################################################################*/
#include "qtkmainwindow.h"
#include "qtkscene.h"
#include "ui_qtkmainwindow.h"
MainWindow * MainWindow::mainWindow_ = Q_NULLPTR;
@ -28,9 +27,6 @@ MainWindow::MainWindow(QWidget * parent) : QMainWindow(parent)
// Initialize static container for all active QtkWidgets
auto qtkWidgets = findChildren<Qtk::QtkWidget *>();
for (auto & qtkWidget : qtkWidgets) {
// Qtk currently uses the decorator pattern to save / load scenes.
// This is a temporary solution and will be improved in the future.
qtkWidget->setScene(new QtkScene);
views_.emplace(qtkWidget->getScene()->getSceneName(), qtkWidget);
// Add GUI 'view' toolbar option to show debug console.

1
tools/build-qt.sh Normal file
View File

@ -0,0 +1 @@
#!/usr/bin/env bash

7
tools/format.sh Executable file
View File

@ -0,0 +1,7 @@
#!/usr/bin/env bash
cmake -B build && cmake --build build -- -j $(nproc --ignore=1)
clang-tidy -p build/ --fix --config-file=.clang-tidy \
src/**/*.cpp src/**/*.h example-app/*.cpp example-app/*.h
clang-format -i --style=file:.clang-format \
src/**/*.cpp src/**/*.h example-app/*.cpp example-app/*.h