diff --git a/.github/workflows/all-builds.yml b/.github/workflows/all-builds.yml index 466de5c..11463e4 100644 --- a/.github/workflows/all-builds.yml +++ b/.github/workflows/all-builds.yml @@ -31,7 +31,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '6.5.0' + version: '6.6.0' # Windows diff --git a/CMakeLists.txt b/CMakeLists.txt index 362eb7e..bf74692 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,11 +84,6 @@ endif () set(QTK_RESOURCES "${CMAKE_SOURCE_DIR}/resources") set(QTK_OSX_ICONS ${CMAKE_SOURCE_DIR}/resources/icons/osx/kilroy.icns) -# Print all QTK options and their values at the end of configuration. -get_cmake_property(VAR_NAMES VARIABLES) -list(FILTER VAR_NAMES INCLUDE REGEX "^Q[tT][kK]_.*$") -list(SORT VAR_NAMES) - ################################################################################ # External Dependencies ################################################################################ @@ -103,9 +98,9 @@ set( ) -# Print all QTK options and their values. +# Print all QTK options and their values at the end of configuration. get_cmake_property(VAR_NAMES VARIABLES) -list(FILTER VAR_NAMES INCLUDE REGEX "^Q[tT][kK]_.*$") +list(FILTER VAR_NAMES INCLUDE REGEX "^[qQ][tT][kK]_.*$") list(SORT VAR_NAMES) ################################################################################ diff --git a/README.md b/README.md index 079218b..9ebf9a7 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ If the build is configured with all options enabled, we can subsequently install individual components as needed with cmake. ```bash -sudo apt update -y && sudo apt install libassimp-dev cmake build-essential git ccache libgl1-mesa-dev libglvnd-dev -y +sudo apt update -y && sudo apt install libassimp-dev cmake build-essential git ccache libgl1-mesa-dev libglvnd-dev zlib1g-dev -y git clone https://github.com/shaunrd0/qtk cd qtk # Configure the build with all components enabled diff --git a/example-app/examplescene.cpp b/example-app/examplescene.cpp index e812e79..02f9463 100644 --- a/example-app/examplescene.cpp +++ b/example-app/examplescene.cpp @@ -23,9 +23,9 @@ void ExampleScene::init() { auto skybox = new Qtk::Skybox("Skybox"); setSkybox(skybox); - auto spartan = new Model( - "spartan", std::string(QTK_EXAMPLE_SOURCE_DIR) - + "/../resources/models/spartan/spartan.obj"); + std::string spartanPath = QTK_EXAMPLE_SOURCE_DIR; + spartanPath += "/../resources/models/spartan/spartan.obj"; + auto spartan = new Model("spartan", spartanPath.c_str()); addObject(spartan); spartan->getTransform().setTranslation(-4.0f, 0.0f, 0.0f); diff --git a/src/app/qtkmainwindow.cpp b/src/app/qtkmainwindow.cpp index 888a366..34998db 100644 --- a/src/app/qtkmainwindow.cpp +++ b/src/app/qtkmainwindow.cpp @@ -83,6 +83,6 @@ Qtk::QtkWidget * MainWindow::getQtkWidget(const QString & name) { } void MainWindow::refreshScene(QString sceneName) { - // TODO: Select TreeView using sceneName> + // TODO: Select TreeView using sceneName ui_->qtk__TreeView->updateView(getQtkWidget()->getScene()); } diff --git a/src/app/qtkwidget.cpp b/src/app/qtkwidget.cpp index 8e35eff..a82b679 100644 --- a/src/app/qtkwidget.cpp +++ b/src/app/qtkwidget.cpp @@ -84,9 +84,6 @@ void QtkWidget::initializeGL() { connect( mDebugLogger, SIGNAL(messageLogged(QOpenGLDebugMessage)), this, SLOT(messageLogged(QOpenGLDebugMessage))); - // connect( - // mDebugLogger, SIGNAL(messageLogged(QOpenGLDebugMessage)), - // mConsole, SLOT(sendLog(QOpenGLDebugMessage))); mDebugLogger->startLogging(); } diff --git a/src/app/toolbox.cpp b/src/app/toolbox.cpp index 18341ee..046932d 100644 --- a/src/app/toolbox.cpp +++ b/src/app/toolbox.cpp @@ -22,7 +22,6 @@ ToolBox::ToolBox(QWidget * parent) : QDockWidget(parent), ui(new Ui::ToolBox) { } void ToolBox::updateFocus(const QString & name) { - qDebug() << "Called updateFocus on Toolbox."; auto object = MainWindow::getMainWindow()->getQtkWidget()->getScene()->getObject(name); if(object != Q_NULLPTR) { diff --git a/src/qtk/scene.h b/src/qtk/scene.h index 4d9a585..5286d56 100644 --- a/src/qtk/scene.h +++ b/src/qtk/scene.h @@ -12,6 +12,7 @@ #include #include +#include #include #include