Remove stale changes.

This reverts commit 0c16b7d879.

.github/workflows/build.yml

@@ -43,13 +43,16 @@ jobs:
         with:
           version: ${{ env.QT_VERSION }}
 
-      # Windows
+      - name: Install pkgconfiglite
-
-      - name: Chocolatey Action
         if: matrix.os == 'windows-latest'
         uses: crazy-max/ghaction-chocolatey@v2
         with:
           args: install pkgconfiglite --checksum e87b5ea3c9142256af60f2d5b917aa63b571e6a0 --checksum-type sha1
+      - name: Install nsis
+        if: matrix.os == 'windows-latest'
+        uses: crazy-max/ghaction-chocolatey@v2
+        with:
+          args: install nsis
 
       - name: Install Debian packaging dependencies
         if: matrix.os == 'ubuntu-latest'
@@ -191,6 +194,11 @@ jobs:
         uses: crazy-max/ghaction-chocolatey@v2
         with:
           args: install pkgconfiglite --checksum e87b5ea3c9142256af60f2d5b917aa63b571e6a0 --checksum-type sha1
+      - name: Install nsis
+        if: matrix.os == 'windows-latest'
+        uses: crazy-max/ghaction-chocolatey@v2
+        with:
+          args: install nsis
 
       - name: Configure Qtk Library
         shell: bash
@@ -369,7 +377,6 @@ jobs:
       - name: Download Installer Artifact
         uses: actions/download-artifact@v4
         with:
-          name: Qtk Packages
           path: |
             build/packages/*
             install/*

.github/workflows/linting.yml

@@ -39,7 +39,7 @@ jobs:
           # Check the entire repo for source files to tidy
           files-changed-only: false
           # Ignore qtk build and external assimp directories
-          ignore: '.github|build|extern/assimp/assimp'
+          ignore: '.github|build|extern'
           # Point to compile_commands.json produced by build
           database: 'build'
           # Use thread comments as feedback
@@ -61,8 +61,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: clang-format Check
+      - uses: cpp-linter/cpp-linter-action@v2
-        uses: jidicula/clang-format-action@v4.9.0
         with:
-          clang-format-version: '18'
+          version: '18'
-          check-path: ${{ matrix.path }}
+          style: 'file'
+          tidy-checks: ''
+          files-changed-only: false
+          ignore: '.github|build|extern'
+          extensions: 'cpp,h'
+          files: ${{ matrix.path }}

CMakeLists.txt

@@ -31,7 +31,7 @@ add_compile_options(-fPIC)
 ################################################################################
 project(
     #[[NAME]]   Qtk
-    VERSION     0.2
+    VERSION     0.3
     DESCRIPTION "Qt OpenGL library and desktop application."
     LANGUAGES   CXX C
 )
@@ -157,8 +157,15 @@ list(APPEND VAR_NAMES QT6_INSTALL_PLUGINS)
 
 # Find Assimp.
 if(QTK_SUBMODULES)
-  # Required to statically link.
+  if(APPLE)
-  add_compile_options(-fPIC)
+    # Avoid zlib redefining fdopen, causing build failures in apple clang.
+    # https://github.com/assimp/assimp/issues/6118
+    add_compile_definitions(-Dfdopen=fdopen)
+  endif()
+  if(NOT WIN32)
+    # Required to statically link.
+    add_compile_options(-fPIC)
+  endif()
   set(BUILD_SHARED_LIBS OFF CACHE STRING "Build static assimp libs" FORCE)
   set(ASSIMP_BUILD_ZLIB ON CACHE STRING "Build Zlib with assimp." FORCE)
   set(
@@ -175,6 +182,14 @@ if(QTK_SUBMODULES)
       "${CMAKE_CURRENT_SOURCE_DIR}/extern/assimp/assimp/"
       EXCLUDE_FROM_ALL
   )
+  install(
+      TARGETS assimp zlibstatic
+      EXPORT qtk_export
+      COMPONENT qtk
+      ARCHIVE DESTINATION lib
+      LIBRARY DESTINATION lib
+      RUNTIME DESTINATION bin
+  )
 else()
   find_package(assimp REQUIRED)
 endif()

README.md

@@ -1,6 +1,6 @@
 # Qtk
 
-[![All Builds](https://github.com/shaunrd0/qtk/actions/workflows/all-builds.yml/badge.svg)](https://github.com/shaunrd0/qtk/actions/workflows/build.yml)
+[![All Builds](https://github.com/shaunrd0/qtk/actions/workflows/build.yml/badge.svg)](https://github.com/shaunrd0/qtk/actions/workflows/build.yml)
 [![Linting](https://github.com/shaunrd0/qtk/actions/workflows/linting.yml/badge.svg)](https://github.com/shaunrd0/qtk/actions/workflows/linting.yml)
 
 The Qtk desktop application provides a model loader using [Assimp](https://assimp.org/) within a Qt widget application.
@@ -60,12 +60,12 @@ 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.
 - [ ] 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)
 project in the root of this repository.
@@ -90,7 +90,7 @@ The Ubuntu apt repositories contain all the packages we need to build all target
 To build Qtk desktop application with the scene in the screenshots below run the following commands.
 
 ```bash
-sudo apt update && sudo apt install cmake build-essential git ccache libxkbcommon-dev libassimp-dev qt6-base-dev qt6-tools-dev
+sudo apt update && sudo apt install cmake build-essential git ccache libxkbcommon-dev libassimp-dev qt6-base-dev qt6-tools-dev zlib1g-dev
 cmake -DQTK_GUI_SCENE=ON -B build
 cmake --build build
 ./build/bin/qtk_gui

example-app/CMakeLists.txt

@@ -57,7 +57,7 @@ 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)
-  find_package(Qtk 0.2 REQUIRED)
+  find_package(Qtk 0.3 REQUIRED)
 endif()
 
 find_package(Qt6 COMPONENTS Core Widgets OpenGLWidgets REQUIRED)
@@ -100,4 +100,4 @@ if((Qt6_VERSION VERSION_GREATER_EQUAL "6.3.0" AND (WIN32 OR APPLE))
   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()
+endif()

example-app/examplescene.cpp

@@ -22,18 +22,7 @@ ExampleScene::~ExampleScene() = default;
 
 void ExampleScene::init()
 {
-  setSkybox(new Qtk::Skybox(":/textures/skybox/right.png",
+  setSkybox(new Qtk::Skybox);
-                            ":/textures/skybox/top.png",
-                            ":/textures/skybox/front.png",
-                            ":/textures/skybox/left.png",
-                            ":/textures/skybox/bottom.png",
-                            ":/textures/skybox/back.png",
-                            "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/minimal_resources.qrc

@@ -1,6 +1,5 @@
 <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>

resources/resources.qrc

@@ -1,6 +1,5 @@
 <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>

src/app/qtkmainwindow.cpp

@@ -48,6 +48,16 @@ MainWindow::MainWindow(QWidget * parent) : QMainWindow(parent)
             &Qtk::ToolBox::updateFocus);
   }
 
+  connect(ui_->actionDelete_Object,
+          &QAction::triggered,
+          this,
+          &MainWindow::deleteObject);
+
+  connect(ui_->actionLoad_Model,
+          &QAction::triggered,
+          this,
+          &MainWindow::loadObject);
+
   // TODO: Fix / use MainWindow in Qt Designer to add these dock widgets.
   // For now we will add them manually, but we should be able to do this in the
   // designer. At the moment if you edit the UI in designer the dock widget
@@ -62,7 +72,7 @@ MainWindow::MainWindow(QWidget * parent) : QMainWindow(parent)
   ui_->menuView->addAction(ui_->qtk__TreeView->toggleViewAction());
 
   // Set the window icon used for Qtk.
-  setWindowIcon(Qtk::getIcon());
+  setWindowIcon(getIcon());
 }
 
 MainWindow::~MainWindow()
@@ -104,6 +114,26 @@ void MainWindow::refreshScene(const QString & sceneName)
   ui_->qtk__TreeView->updateView(getQtkWidget()->getScene());
 }
 
+void MainWindow::deleteObject()
+{
+  if (auto object = ui_->qtk__ToolBox->getObjectFocus(); object != Q_NULLPTR) {
+    auto scene = getQtkWidget()->getScene();
+    switch (object->getType()) {
+      case Qtk::Object::Type::QTK_MESH:
+        scene->removeObject(dynamic_cast<Qtk::MeshRenderer *>(object));
+        ui_->qtk__ToolBox->clearFocus();
+        break;
+      case Qtk::Object::Type::QTK_MODEL:
+        scene->removeObject(dynamic_cast<Qtk::Model *>(object));
+        ui_->qtk__ToolBox->clearFocus();
+        break;
+      default:
+        qDebug() << "Failed to delete model with invalid type";
+        break;
+    }
+  }
+}
+
 void MainWindow::setScene(Qtk::Scene * scene)
 {
   connect(scene,

src/app/qtkmainwindow.h

@@ -11,8 +11,8 @@
 
 #include <unordered_map>
 
+#include <QFileDialog>
 #include <QMainWindow>
-#include <QPlainTextEdit>
 
 #include "designer-plugins/debugconsole.h"
 
@@ -132,6 +132,11 @@ class MainWindow : public QMainWindow
      */
     void setScene(Qtk::Scene * scene);
 
+    /**
+     * @return Default icon to use for Qtk desktop application.
+     */
+    static QIcon getIcon() { return QIcon(":/icons/icon.png"); }
+
   public slots:
     /**
      * Trigger a refresh for widgets related to a scene that has been updated.
@@ -139,6 +144,23 @@ class MainWindow : public QMainWindow
      */
     void refreshScene(const QString & sceneName);
 
+
+    /**
+     * Opens a QFileDialog for selecting an object file to load into the scene.
+     */
+    void loadObject()
+    {
+      const QUrl file = QFileDialog::getOpenFileName(
+          this, tr("Load Model"), QDir::homePath(), tr("Object Files (*.obj)"));
+      getQtkWidget()->getScene()->loadModel(file.fileName().replace(".obj", ""),
+                                            file.toString());
+    }
+
+    /**
+     * Deletes the currently selected object from the scene.
+     */
+    void deleteObject();
+
   private:
     /***************************************************************************
      * Private Members

src/app/qtkmainwindow.ui

@@ -222,6 +222,9 @@
    </property>
   </action>
   <action name="actionLoad_Model">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
    <property name="icon">
     <iconset>
      <normaloff>:/icons/fontawesome-free-6.2.1-desktop/svgs/solid/cube.svg</normaloff>:/icons/fontawesome-free-6.2.1-desktop/svgs/solid/cube.svg</iconset>
@@ -234,6 +237,9 @@
    </property>
   </action>
   <action name="actionDelete_Object">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
    <property name="icon">
     <iconset>
      <normaloff>:/icons/fontawesome-free-6.2.1-desktop/svgs/regular/trash-can.svg</normaloff>:/icons/fontawesome-free-6.2.1-desktop/svgs/regular/trash-can.svg</iconset>

src/app/qtkscene.cpp

@@ -426,6 +426,7 @@ void QtkScene::draw()
   // WARNING: We must call the base class draw() function first.
   // + This will handle rendering core scene components like the Skybox.
   Scene::draw();
+  const QVector3D cameraPosition = getCamera().getTransform().getTranslation();
 
   mTestPhong->bindShaders();
   mTestPhong->setUniform("uModelInverseTransposed",
@@ -433,14 +434,12 @@ void QtkScene::draw()
   mTestPhong->setUniform(
       "uLightPosition",
       MeshRenderer::getInstance("phongLight")->getTransform().getTranslation());
-  mTestPhong->setUniform("uCameraPosition",
+  mTestPhong->setUniform("uCameraPosition", cameraPosition);
-                         QtkScene::getCamera().getTransform().getTranslation());
   mTestPhong->releaseShaders();
   mTestPhong->draw();
 
   mTestAmbient->bindShaders();
-  mTestAmbient->setUniform(
+  mTestAmbient->setUniform("uCameraPosition", cameraPosition);
-      "uCameraPosition", QtkScene::getCamera().getTransform().getTranslation());
   mTestAmbient->releaseShaders();
   mTestAmbient->draw();
 
@@ -452,8 +451,7 @@ void QtkScene::draw()
                            MeshRenderer::getInstance("diffuseLight")
                                ->getTransform()
                                .getTranslation());
-  mTestDiffuse->setUniform(
+  mTestDiffuse->setUniform("uCameraPosition", cameraPosition);
-      "uCameraPosition", QtkScene::getCamera().getTransform().getTranslation());
   mTestDiffuse->releaseShaders();
   mTestDiffuse->draw();
 
@@ -465,67 +463,70 @@ void QtkScene::draw()
                             MeshRenderer::getInstance("specularLight")
                                 ->getTransform()
                                 .getTranslation());
-  mTestSpecular->setUniform(
+  mTestSpecular->setUniform("uCameraPosition", cameraPosition);
-      "uCameraPosition", QtkScene::getCamera().getTransform().getTranslation());
   mTestSpecular->releaseShaders();
   mTestSpecular->draw();
 }
 
 void QtkScene::update()
 {
-  auto mySpartan = Model::getInstance("My spartan");
+  auto getModel = Model::getInstance;
-  mySpartan->getTransform().rotate(0.75f, 0.0f, 1.0f, 0.0f);
+  const QVector3D cameraPosition = getCamera().getTransform().getTranslation();
 
-  auto myCube = MeshRenderer::getInstance("My cube");
+  // Models may have failed to load, so we should check before accessing.
-  myCube->getTransform().rotate(-0.75f, 0.0f, 1.0f, 0.0f);
+  if (auto mySpartan = getModel("My spartan"); mySpartan) {
+    mySpartan->getTransform().rotate(0.75f, 0.0f, 1.0f, 0.0f);
+  }
 
-  auto position = MeshRenderer::getInstance("alienTestLight")
+  if (auto myCube = getModel("My cube"); myCube) {
-                      ->getTransform()
+    myCube->getTransform().rotate(-0.75f, 0.0f, 1.0f, 0.0f);
-                      .getTranslation();
+  }
-  auto alien = Model::getInstance("alienTest");
-  alien->setUniform("uLight.position", position);
-  alien->setUniform("uCameraPosition",
-                    QtkScene::getCamera().getTransform().getTranslation());
-  auto posMatrix = alien->getTransform().toMatrix();
-  alien->setUniform("uMVP.normalMatrix", posMatrix.normalMatrix());
-  alien->setUniform("uMVP.model", posMatrix);
-  alien->setUniform("uMVP.view", QtkScene::getCamera().toMatrix());
-  alien->setUniform("uMVP.projection", QtkScene::getProjectionMatrix());
-  alien->getTransform().rotate(0.75f, 0.0f, 1.0f, 0.0f);
 
-  position = MeshRenderer::getInstance("spartanTestLight")
+  QMatrix4x4 posMatrix;
-                 ->getTransform()
+  if (auto alien = getModel("alienTest"); alien) {
-                 .getTranslation();
+    alien->setLightPosition("alienTestLight");
-  auto spartan = Model::getInstance("spartanTest");
-  spartan->setUniform("uLight.position", position);
-  spartan->setUniform("uCameraPosition",
-                      QtkScene::getCamera().getTransform().getTranslation());
-  posMatrix = spartan->getTransform().toMatrix();
-  spartan->setUniform("uMVP.normalMatrix", posMatrix.normalMatrix());
-  spartan->setUniform("uMVP.model", posMatrix);
-  spartan->setUniform("uMVP.view", QtkScene::getCamera().toMatrix());
-  spartan->setUniform("uMVP.projection", QtkScene::getProjectionMatrix());
-  spartan->getTransform().rotate(0.75f, 0.0f, 1.0f, 0.0f);
 
-  auto phong = MeshRenderer::getInstance("testPhong");
+    alien->setUniform("uCameraPosition", cameraPosition);
-  phong->getTransform().rotate(0.75f, 1.0f, 0.5f, 0.0f);
+    posMatrix = alien->getTransform().toMatrix();
-  phong->bindShaders();
+    alien->setUniform("uMVP.normalMatrix", posMatrix.normalMatrix());
-  position =
+    alien->setUniform("uMVP.model", posMatrix);
-      MeshRenderer::getInstance("testLight")->getTransform().getTranslation();
+    alien->setUniform("uMVP.view", QtkScene::getCamera().toMatrix());
-  phong->setUniform("uLight.position", position);
+    alien->setUniform("uMVP.projection", QtkScene::getProjectionMatrix());
-  phong->setUniform("uCameraPosition",
+    alien->getTransform().rotate(0.75f, 0.0f, 1.0f, 0.0f);
-                    QtkScene::getCamera().getTransform().getTranslation());
+  }
-  posMatrix = phong->getTransform().toMatrix();
+
-  phong->setUniform("uMVP.normalMatrix", posMatrix.normalMatrix());
+  if (auto spartan = getModel("spartanTest"); spartan) {
-  phong->setUniform("uMVP.model", posMatrix);
+    spartan->setLightPosition("spartanTestLight");
-  phong->setUniform("uMVP.view", QtkScene::getCamera().toMatrix());
+
-  phong->setUniform("uMVP.projection", QtkScene::getProjectionMatrix());
+    spartan->setUniform("uCameraPosition", cameraPosition);
-  phong->releaseShaders();
+    posMatrix = spartan->getTransform().toMatrix();
+    spartan->setUniform("uMVP.normalMatrix", posMatrix.normalMatrix());
+    spartan->setUniform("uMVP.model", posMatrix);
+    spartan->setUniform("uMVP.view", QtkScene::getCamera().toMatrix());
+    spartan->setUniform("uMVP.projection", QtkScene::getProjectionMatrix());
+    spartan->getTransform().rotate(0.75f, 0.0f, 1.0f, 0.0f);
+  }
+
+  if (auto phong = getModel("testPhong"); phong) {
+    phong->setLightPosition("testLight");
+
+    phong->getTransform().rotate(0.75f, 1.0f, 0.5f, 0.0f);
+    phong->bindShaders();
+    phong->setUniform("uCameraPosition", cameraPosition);
+    posMatrix = phong->getTransform().toMatrix();
+    phong->setUniform("uMVP.normalMatrix", posMatrix.normalMatrix());
+    phong->setUniform("uMVP.model", posMatrix);
+    phong->setUniform("uMVP.view", QtkScene::getCamera().toMatrix());
+    phong->setUniform("uMVP.projection", QtkScene::getProjectionMatrix());
+    phong->releaseShaders();
+  }
+
+  // MeshRenderers are lower level opengl objects baked into the source code.
+  auto getMesh = MeshRenderer::getInstance;
 
   // Rotate lighting example cubes
   mTestPhong->getTransform().rotate(0.75f, 0.5f, 0.3f, 0.2f);
-  MeshRenderer::getInstance("noLight")->getTransform().rotate(
+  getMesh("noLight")->getTransform().rotate(0.75f, 0.5f, 0.3f, 0.2f);
-      0.75f, 0.5f, 0.3f, 0.2f);
   mTestAmbient->getTransform().rotate(0.75f, 0.5f, 0.3f, 0.2f);
   mTestDiffuse->getTransform().rotate(0.75f, 0.5f, 0.3f, 0.2f);
   mTestSpecular->getTransform().rotate(0.75f, 0.5f, 0.3f, 0.2f);
@@ -533,46 +534,27 @@ void QtkScene::update()
   // Examples of various translations and rotations
 
   // Rotate in multiple directions simultaneously
-  MeshRenderer::getInstance("rgbNormalsCube")
+  getMesh("rgbNormalsCube")->getTransform().rotate(0.75f, 0.2f, 0.4f, 0.6f);
-      ->getTransform()
-      .rotate(0.75f, 0.2f, 0.4f, 0.6f);
 
   // Pitch forward and roll sideways
-  MeshRenderer::getInstance("leftTriangle")
+  getMesh("leftTriangle")->getTransform().rotate(0.75f, 1.0f, 0.0f, 0.0f);
-      ->getTransform()
+  getMesh("rightTriangle")->getTransform().rotate(0.75f, 0.0f, 0.0f, 1.0f);
-      .rotate(0.75f, 1.0f, 0.0f, 0.0f);
-  MeshRenderer::getInstance("rightTriangle")
-      ->getTransform()
-      .rotate(0.75f, 0.0f, 0.0f, 1.0f);
 
   // Move between two positions over time
   static float translateX = 0.025f;
   float limit = -9.0f;  // Origin position.x - 2.0f
-  float posX = MeshRenderer::getInstance("topTriangle")
+  float posX = getMesh("topTriangle")->getTransform().getTranslation().x();
-                   ->getTransform()
-                   .getTranslation()
-                   .x();
   if (posX < limit || posX > limit + 4.0f) {
     translateX = -translateX;
   }
-  MeshRenderer::getInstance("topTriangle")
+  getMesh("topTriangle")->getTransform().translate(translateX, 0.0f, 0.0f);
-      ->getTransform()
+  getMesh("bottomTriangle")->getTransform().translate(-translateX, 0.0f, 0.0f);
-      .translate(translateX, 0.0f, 0.0f);
-  MeshRenderer::getInstance("bottomTriangle")
-      ->getTransform()
-      .translate(-translateX, 0.0f, 0.0f);
   // And lets rotate the triangles in two directions at once
-  MeshRenderer::getInstance("topTriangle")
+  getMesh("topTriangle")->getTransform().rotate(0.75f, 0.2f, 0.0f, 0.4f);
-      ->getTransform()
+  getMesh("bottomTriangle")->getTransform().rotate(0.75f, 0.0f, 0.2f, 0.4f);
-      .rotate(0.75f, 0.2f, 0.0f, 0.4f);
-  MeshRenderer::getInstance("bottomTriangle")
-      ->getTransform()
-      .rotate(0.75f, 0.0f, 0.2f, 0.4f);
   // And make the bottom triangle green, instead of RGB
 
   // Rotate center cube in several directions simultaneously
   // + Not subject to gimbal lock since we are using quaternions :)
-  MeshRenderer::getInstance("centerCube")
+  getMesh("centerCube")->getTransform().rotate(0.75f, 0.2f, 0.4f, 0.6f);
-      ->getTransform()
-      .rotate(0.75f, 0.2f, 0.4f, 0.6f);
 }

src/designer-plugins/toolbox.cpp

@@ -16,20 +16,121 @@
 
 using namespace Qtk;
 
-ToolBox::ToolBox(QWidget * parent) : QDockWidget(parent), ui(new Ui::ToolBox)
+ToolBox::ToolBox(QWidget * parent) :
+    QDockWidget(parent), objectDetails_(this), transformPanel_(this),
+    scalePanel_(this), vertex_(this, "Vertex Shader:"),
+    fragment_(this, "Fragment Shader:"), properiesForm_(new QFormLayout),
+    shaderForm_(new QFormLayout), ui(new Ui::ToolBox), objectFocus_(Q_NULLPTR)
 {
   ui->setupUi(this);
   setMinimumWidth(350);
+
+  // Object Properties.
+  ui->page_properties->setLayout(properiesForm_);
+  properiesForm_->addRow(objectDetails_.name.label, objectDetails_.name.value);
+  properiesForm_->addRow(objectDetails_.objectType.label,
+                         objectDetails_.objectType.value);
+  properiesForm_->addRow(reinterpret_cast<QWidget *>(&transformPanel_));
+  properiesForm_->addRow(reinterpret_cast<QWidget *>(&scalePanel_));
+  ui->toolBox->setCurrentWidget(ui->page_properties);
+
+  // Shader views.
+  ui->page_shaders->setLayout(shaderForm_);
+  shaderForm_->addRow(reinterpret_cast<QWidget *>(&vertex_));
+  shaderForm_->addRow(reinterpret_cast<QWidget *>(&fragment_));
 }
 
 void ToolBox::updateFocus(const QString & name)
 {
   auto object =
-      Qtk::QtkWidget::mWidgetManager.get_widget()->getScene()->getObject(name);
+      QtkWidget::mWidgetManager.get_widget()->getScene()->getObject(name);
-  if (object != Q_NULLPTR) {
+  // If we can't find the object show a warning.
-    removePages();
+  if (object == Q_NULLPTR) {
-    createPageProperties(object);
+    qDebug() << "Failed to find selected object: " << name
-    createPageShader(object);
+             << ";  Clearing object panels.";
+  }
+
+  // We should still pass the nullptr here if we failed to find the object
+  // above.
+  objectFocus_ = object;
+  refreshProperties(object);
+  refreshShaders(object);
+}
+
+void ToolBox::clearFocus()
+{
+  objectFocus_ = Q_NULLPTR;
+  refreshProperties(objectFocus_);
+  refreshShaders(objectFocus_);
+}
+
+ToolBox::SpinBox3D::SpinBox3D(QWidget * parent, const char * l) :
+    QWidget(parent), layout(new QHBoxLayout(this)), label(new QLabel(tr(l)))
+{
+  // The layout owns the widget and will clean it up on destruction.
+  layout->addWidget(label);
+  for (const auto & f : fields) {
+    layout->addWidget(f->spinBox);
+    f->spinBox->setMinimum(std::numeric_limits<double>::lowest());
+    f->spinBox->setSingleStep(0.1);
+    f->spinBox->setFixedWidth(75);
+  }
+}
+
+void ToolBox::SpinBox::disconnect() const
+{
+  Object::disconnect(connection);
+}
+
+void ToolBox::TransformPanel::setObject(const Qtk::Object * object)
+{
+  // Zero the panel contents if there is no object selected.
+  if (object == Q_NULLPTR) {
+    spinBox3D.clear();
+    return;
+  }
+
+
+  // Reconnect translation panel controls to the new object.
+  const std::vector binds = {&Object::setTranslationX,
+                             &Object::setTranslationY,
+                             &Object::setTranslationZ};
+  for (size_t i = 0; i < spinBox3D.fields.size(); i++) {
+    auto * f = spinBox3D.fields[i];
+    // Disconnect before changing spin box value.
+    f->disconnect();
+
+    // Set the values in the spin box to the object's current X,Y,Z
+    f->spinBox->setValue(object->getTransform().getTranslation()[i]);
+
+    // Reconnect to bind spin box value to the new object's position.
+    f->connection =
+        connect(f->spinBox, &QDoubleSpinBox::valueChanged, object, binds[i]);
+  }
+}
+
+void ToolBox::ScalePanel::setObject(const Qtk::Object * object)
+{
+  // Zero the panel contents if there is no object selected.
+  if (object == Q_NULLPTR) {
+    spinBox3D.clear();
+    return;
+  }
+
+  // Reconnect scale panel controls to the new object.
+  const std::vector binds = {
+      &Object::setScaleX, &Object::setScaleY, &Object::setScaleZ};
+  for (size_t i = 0; i < spinBox3D.fields.size(); i++) {
+    auto * f = spinBox3D.fields[i];
+    // Disconnect before changing spin box value.
+    f->disconnect();
+
+    // Set the values in the spin box to the object's current X,Y,Z
+    f->spinBox->setValue(object->getTransform().getScale()[i]);
+
+    // Reconnect to bind spin box value to the new object's scale.
+    f->connection =
+        connect(f->spinBox, &QDoubleSpinBox::valueChanged, object, binds[i]);
   }
 }
 
@@ -38,110 +139,32 @@ ToolBox::~ToolBox()
   delete ui;
 }
 
-void ToolBox::removePages()
+void ToolBox::refreshProperties(const Object * object)
 {
-  // Remove all existing pages.
+  // Refresh to show the new object's details.
-  for (size_t i = 0; i < ui->toolBox->count(); i++) {
+  objectDetails_.setObject(object);
-    delete ui->toolBox->widget(i);
+  // Reconnect transform panel controls to the new object.
-    ui->toolBox->removeItem(i);
+  transformPanel_.setObject(object);
-  }
+  scalePanel_.setObject(object);
 }
 
-void ToolBox::createPageProperties(const Object * object)
+void ToolBox::refreshShaders(const Object * object)
 {
-  auto transform = object->getTransform();
+  // Zero the panel contents if there is no object selected.
-  auto type = object->getType();
+  if (object == Q_NULLPTR) {
-  auto * widget = new QWidget;
+    vertex_.clear();
-  ui->toolBox->addItem(widget, "Properties");
+    fragment_.clear();
-  ui->toolBox->setCurrentWidget(widget);
+    return;
-
-  auto * layout = new QFormLayout;
-  layout->addRow(new QLabel(tr("Name:")),
-                 new QLabel(object->getName().c_str()));
-
-  layout->addRow(new QLabel(tr("Type:")),
-                 new QLabel(type == Object::Type::QTK_MESH ? "Mesh" : "Model"));
-
-  auto rowLayout = new QHBoxLayout;
-  rowLayout->addWidget(new QLabel(tr("Translation:")));
-  int minWidth = 75;
-  for (size_t i = 0; i < 3; i++) {
-    auto spinBox = new QDoubleSpinBox;
-    spinBox->setMinimum(std::numeric_limits<double>::lowest());
-    spinBox->setSingleStep(0.1);
-    spinBox->setValue(transform.getTranslation()[i]);
-    spinBox->setFixedWidth(minWidth);
-    rowLayout->addWidget(spinBox);
-
-    if (i == 0) {
-      connect(spinBox,
-              &QDoubleSpinBox::valueChanged,
-              object,
-              &Object::setTranslationX);
-    } else if (i == 1) {
-      connect(spinBox,
-              &QDoubleSpinBox::valueChanged,
-              object,
-              &Object::setTranslationY);
-    } else if (i == 2) {
-      connect(spinBox,
-              &QDoubleSpinBox::valueChanged,
-              object,
-              &Object::setTranslationZ);
-    }
   }
-  layout->addRow(rowLayout);
 
-  rowLayout = new QHBoxLayout;
+  vertex_.path.setValue(object->getVertexShader().c_str());
-  rowLayout->addWidget(new QLabel(tr("Scale:")));
+  vertex_.editor->setText(object->getVertexShaderSourceCode().c_str());
-  for (size_t i = 0; i < 3; i++) {
+  fragment_.path.setValue(object->getFragmentShader().c_str());
-    auto spinBox = new QDoubleSpinBox;
+  fragment_.editor->setText(object->getFragmentShaderSourceCode().c_str());
-    spinBox->setMinimum(std::numeric_limits<double>::lowest());
-    spinBox->setSingleStep(0.1);
-    spinBox->setValue(transform.getScale()[i]);
-    spinBox->setFixedWidth(minWidth);
-    rowLayout->addWidget(spinBox);
-
-    if (i == 0) {
-      connect(
-          spinBox, &QDoubleSpinBox::valueChanged, object, &Object::setScaleX);
-    } else if (i == 1) {
-      connect(
-          spinBox, &QDoubleSpinBox::valueChanged, object, &Object::setScaleY);
-    } else if (i == 2) {
-      connect(
-          spinBox, &QDoubleSpinBox::valueChanged, object, &Object::setScaleZ);
-    }
-  }
-  layout->addRow(rowLayout);
-  widget->setLayout(layout);
 }
 
-void ToolBox::createPageShader(const Object * object)
+void ToolBox::refresh(const Object * object)
 {
-  // Shaders page.
+  refreshProperties(object);
-  auto widget = new QWidget;
+  refreshShaders(object);
-  ui->toolBox->addItem(widget, "Shaders");
-  auto mainLayout = new QFormLayout;
-  auto rowLayout = new QHBoxLayout;
-  rowLayout->addWidget(new QLabel("Vertex Shader:"));
-  rowLayout->addWidget(new QLabel(object->getVertexShader().c_str()));
-  mainLayout->addRow(rowLayout);
-
-  auto shaderView = new QTextEdit;
-  shaderView->setReadOnly(true);
-  shaderView->setText(object->getVertexShaderSourceCode().c_str());
-  mainLayout->addRow(shaderView);
-
-  rowLayout = new QHBoxLayout;
-  rowLayout->addWidget(new QLabel("Fragment Shader:"));
-  rowLayout->addWidget(new QLabel(object->getFragmentShader().c_str()));
-  mainLayout->addRow(rowLayout);
-
-  shaderView = new QTextEdit;
-  shaderView->setReadOnly(true);
-  shaderView->setText(object->getFragmentShaderSourceCode().c_str());
-  mainLayout->addRow(shaderView);
-
-  widget->setLayout(mainLayout);
 }

src/designer-plugins/toolbox.h

@@ -13,10 +13,13 @@
 #include <QDesignerExportWidget>
 #include <QDockWidget>
 #include <QDoubleSpinBox>
-#include <QGroupBox>
+#include <QFormLayout>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QTextEdit>
 
+#include "qtk/object.h"
 
-#include "qtk/scene.h"
 
 namespace Ui
 {
@@ -25,7 +28,7 @@ namespace Ui
 
 namespace Qtk
 {
-  class ToolBox : public QDockWidget
+  class ToolBox final : public QDockWidget
   {
       Q_OBJECT
 
@@ -38,20 +41,184 @@ namespace Qtk
 
       ~ToolBox();
 
-      void removePages();
+      void refreshProperties(const Object * object);
 
-      void createPageProperties(const Object * object);
+      void refreshShaders(const Object * object);
 
-      void createPageShader(const Object * object);
+      void refresh(const Object * object);
 
       void updateFocus(const QString & name);
 
+      [[nodiscard]] Object * getObjectFocus() const { return objectFocus_; }
+
+      void clearFocus();
 
     private:
       /*************************************************************************
        * Private Members
        ************************************************************************/
 
+      /// Displays details on the object.
+      struct ObjectDetails {
+          /// Single item containing a label and value.
+          struct Item {
+              explicit Item(QWidget * parent,
+                            const char * l = "Item:",
+                            const char * v = "") :
+                  label(new QLabel(tr(l), parent)),
+                  value(new QLabel(tr(v), parent))
+              {
+              }
+
+              void setValue(const char * v) const { value->setText(tr(v)); }
+
+              void setItem(const char * l, const char * v) const
+              {
+                label->setText(tr(l));
+                value->setText(tr(v));
+              }
+
+              QLabel * label;
+              QLabel * value;
+          };
+
+          /// We pass the parent widget so that Qt handles releasing memory.
+          explicit ObjectDetails(QWidget * parent) :
+              name(parent, "Name:"), objectType(parent, "Object Type:")
+          {
+          }
+
+          /// Refresh to display the new object's details
+          void setObject(const Qtk::Object * object) const
+          {
+            // Zero contents if there is no object selected.
+            if (object == Q_NULLPTR) {
+              name.setValue("");
+              objectType.setValue("No object selected");
+              return;
+            }
+            name.setItem("Name:", object->getName().toStdString().c_str());
+            objectType.setItem(
+                "Type:",
+                object->getType() == Object::QTK_MESH ? "Mesh" : "Model");
+          }
+
+          Item name, objectType;
+      };
+      ObjectDetails objectDetails_;
+
+      /// Structure to associate a QSpinBox with a connection.
+      struct SpinBox {
+          /**
+           * Default constructor passes no parent to the QSpinBox.
+           * It must be added to a layout for Qt to clean up the resources.
+           */
+          SpinBox() : spinBox(new QDoubleSpinBox) {}
+
+          /// Disconnect the associated connection.
+          void disconnect() const;
+
+          QDoubleSpinBox * spinBox;
+          QMetaObject::Connection connection;
+      };
+
+      /// Spinbox with 3 fields and a single label.
+      class SpinBox3D final : QWidget
+      {
+        public:
+          /// We pass a parent to ensure Qt will clean up resources.
+          /// Assigning a QWidget to a QLayout also ensures Qt will clean up.
+          explicit SpinBox3D(QWidget * parent, const char * l = "SpinBox3D:");
+
+          /// Zero the SpinBox3D display.
+          void clear()
+          {
+            for (auto & field : fields) {
+              field->disconnect();
+              field->spinBox->setValue(0.0);
+            }
+          }
+
+          /// The main layout for the SpinBox3D widget.
+          QHBoxLayout * layout;
+
+          /// Label for the SpinBox3D.
+          QLabel * label;
+
+          /// SpinBox and a connection for each field.
+          SpinBox x, y, z;
+          /// Array for iterating over fields.
+          std::array<SpinBox *, 3> fields {&x, &y, &z};
+      };
+
+      /// Initialize the transform panel and configure QObject connections.
+      struct TransformPanel {
+          explicit TransformPanel(QWidget * parent) :
+              spinBox3D(parent, "Transform:")
+          {
+          }
+
+          /// Reconnect QObject connections and spin box values in UI.
+          void setObject(const Qtk::Object * object);
+
+          SpinBox3D spinBox3D;
+      };
+      TransformPanel transformPanel_;
+
+      /// Initialize the scale panel and configure QObject connections.
+      struct ScalePanel {
+          explicit ScalePanel(QWidget * parent) : spinBox3D(parent, "Scale:") {}
+
+          /// Reconnect QObject connections and spin box values in UI.
+          void setObject(const Qtk::Object * object);
+
+          SpinBox3D spinBox3D;
+      };
+      ScalePanel scalePanel_;
+
+      /// Displays shader name, path, and read-only text view.
+      class ShaderView final : QWidget
+      {
+        public:
+          explicit ShaderView(QWidget * parent,
+                              const char * l = "ShaderView:") :
+              layout(new QVBoxLayout(this)), path(parent, l),
+              editor(new QTextEdit(parent))
+          {
+            // Create a child horizontal layout for shader name and file path.
+            auto * pathLayout = new QHBoxLayout;
+            pathLayout->addWidget(path.label);
+            pathLayout->addWidget(path.value);
+            layout->addLayout(pathLayout);
+
+            // Add the read-only text editor widget to the main layout.
+            editor->setReadOnly(true);
+            layout->addWidget(editor);
+          }
+
+          /// Zero the ShaderView display.
+          void clear() const
+          {
+            path.setValue("");
+            editor->setText("");
+          }
+
+          /// The main layout for the ShaderView widget.
+          QVBoxLayout * layout;
+
+          /// Shader name and path on disk.
+          ObjectDetails::Item path;
+
+          /// Read-only (for now) display of the shader source code.
+          QTextEdit * editor;
+      };
+      ShaderView vertex_, fragment_;
+
+      QFormLayout * properiesForm_;
+      QFormLayout * shaderForm_;
+
+      Object * objectFocus_ {};
+
       Ui::ToolBox * ui;
   };
 }  // namespace Qtk

src/designer-plugins/treeview.cpp

@@ -43,7 +43,7 @@ void Qtk::TreeView::updateView(const Qtk::Scene * scene)
   mSceneName = scene->getSceneName();
   auto objects = scene->getObjects();
   for (const auto & object : objects) {
-    QStringList list(QStringList(QString(object->getName().c_str())));
+    QStringList list(QStringList(QString(object->getName())));
     ui->treeWidget->insertTopLevelItem(0, new QTreeWidgetItem(list));
   }
 }

src/designer-plugins/widgetplugin.cpp

@@ -67,7 +67,7 @@ QString WidgetPlugin::whatsThis() const
 
 QIcon WidgetPlugin::icon() const
 {
-  return Qtk::getIcon();
+  return QIcon(":/icons/icon.png");
 }
 
 bool WidgetPlugin::isContainer() const

src/qtk/meshrenderer.cpp

@@ -45,7 +45,7 @@ MeshRenderer::MeshRenderer(const char * name, const ShapeBase & shape) :
 
 MeshRenderer::~MeshRenderer()
 {
-  sInstances.remove(mName.c_str());
+  sInstances.remove(mName);
 }
 
 /*******************************************************************************
@@ -121,9 +121,7 @@ void MeshRenderer::draw()
   bindShaders();
   mVAO.bind();
 
-  if (mTexture.hasTexture()) {
+  mTexture.bind();
-    mTexture.getOpenGLTexture().bind();
-  }
 
   // TODO: Automate uniforms some other way
   setUniformMVP();
@@ -138,9 +136,7 @@ void MeshRenderer::draw()
                    mShape.mIndices.data());
   }
 
-  if (mTexture.hasTexture()) {
+  mTexture.bind();
-    mTexture.getOpenGLTexture().release();
-  }
 
   mVAO.release();
   releaseShaders();

src/qtk/model.cpp

@@ -56,8 +56,19 @@ void Model::flipTexture(const std::string & fileName, bool flipX, bool flipY)
   }
 }
 
+void Model::setLightPosition(const QString & lightName, const char * uniform)
+{
+  if (auto light = MeshRenderer::getInstance(lightName); light) {
+    QVector3D position = light->getTransform().getTranslation();
+    setUniform(uniform, position);
+  } else {
+    qDebug() << "[QtkScene] Failed to set " << mName
+             << "light position: " << lightName;
+  }
+}
+
 // Static function to access ModelManager for getting Models by name
-Model * Qtk::Model::getInstance(const char * name)
+Model * Model::getInstance(const char * name)
 {
   return mManager[name];
 }
@@ -102,7 +113,7 @@ void Model::loadModel(const std::string & path)
   sortModelMeshes();
 
   // Object finished loading, insert it into ModelManager
-  mManager.insert(getName().c_str(), this);
+  mManager.insert(getName(), this);
 }
 
 void Model::processNode(aiNode * node, const aiScene * scene)
@@ -261,13 +272,11 @@ ModelMesh::Textures Model::loadMaterialTextures(aiMaterial * mat,
 
 void Model::sortModelMeshes()
 {
-  auto cameraPos = Scene::getCamera().getTransform();
+  auto cameraPos = Scene::getCamera().getTransform().getTranslation();
   auto cameraDistance = [&cameraPos](const ModelMesh & a, const ModelMesh & b) {
     // Sort by the first vertex position in the model
-    return (cameraPos.getTranslation().distanceToPoint(
+    return cameraPos.distanceToPoint(a.mVertices[0].mPosition)
-               a.mVertices[0].mPosition))
+           < cameraPos.distanceToPoint(b.mVertices[0].mPosition);
-           < (cameraPos.getTranslation().distanceToPoint(
-               b.mVertices[0].mPosition));
   };
   std::sort(mMeshes.begin(), mMeshes.end(), cameraDistance);
 }

src/qtk/model.h

@@ -63,7 +63,7 @@ namespace Qtk
         loadModel(mModelPath);
       }
 
-      inline ~Model() override { mManager.remove(getName().c_str()); }
+      inline ~Model() override { mManager.remove(getName()); }
 
       /*************************************************************************
        * Public Methods
@@ -113,6 +113,14 @@ namespace Qtk
         }
       }
 
+      /**
+       * Sets the position of a light used in GLSL unfiroms.
+       *
+       * @param lightName Object name of the light
+       */
+      void setLightPosition(const QString & lightName,
+                            const char * uniform = "uLight.position");
+
       /*************************************************************************
        * Accessors
        ************************************************************************/

src/qtk/object.h

@@ -100,7 +100,7 @@ namespace Qtk
         return mShape.mVertices;
       }
 
-      [[nodiscard]] inline std::string getName() const { return mName; }
+      [[nodiscard]] inline QString getName() const { return mName; }
 
       [[nodiscard]] inline const Type & getType() const { return mType; }
 
@@ -143,7 +143,7 @@ namespace Qtk
        * Setters
        ************************************************************************/
 
-      virtual inline void setName(const std::string & name) { mName = name; }
+      virtual inline void setName(const QString & name) { mName = name; }
 
       virtual inline void setColors(const Colors & value)
       {
@@ -244,6 +244,23 @@ namespace Qtk
         mProgram.release();
       }
 
+      /*************************************************************************
+       * Public Static Methods
+       ************************************************************************/
+
+      /**
+       * Helper to disconnect a QObject connection, only if it's valid.
+       * If the connection is valid and we fail to disconnect log a message.
+       *
+       * @param con QObject connection handle to disconnect.
+       */
+      static void disconnect(const QMetaObject::Connection & con)
+      {
+        if (con && !QObject::disconnect(con)) {
+          qDebug() << "[Qtk] Failed to disconnect valid connection: " << con;
+        }
+      }
+
     private:
       /*************************************************************************
        * Private Members
@@ -255,7 +272,7 @@ namespace Qtk
       Transform3D mTransform;
       Shape mShape;
       Texture mTexture;
-      std::string mName;
+      QString mName;
       bool mBound;
       Type mType = QTK_OBJECT;
   };

src/qtk/qtkapi.h

@@ -43,14 +43,6 @@ namespace Qtk
     }
     return widget;
   }
-
-  /**
-   * @return Default icon to use for Qtk desktop application.
-   */
-  static QIcon getIcon()
-  {
-    return QIcon(":/icons/icon.png");
-  }
 }  // namespace Qtk
 
 #endif  // QTK_QTKAPI_H

src/qtk/scene.cpp

@@ -55,6 +55,34 @@ template <> Model * Scene::addObject(Model * object)
   return object;
 }
 
+template <> void Scene::removeObject(MeshRenderer * object)
+{
+  auto it = std::find(mMeshes.begin(), mMeshes.end(), object);
+  if (it == mMeshes.end()) {
+    qDebug() << "[Scene::removeObject]: Failed to remove object: "
+             << object->getName() << " (" << object << ")";
+    return;
+  }
+
+  --mObjectCount[object->getName()];
+  mMeshes.erase(it);
+  emit sceneUpdated(mSceneName);
+}
+
+template <> void Scene::removeObject(Model * object)
+{
+  auto it = std::find(mModels.begin(), mModels.end(), object);
+  if (it == mModels.end()) {
+    qDebug() << "[Scene::removeObject]: Failed to remove object: "
+             << object->getName() << " (" << object << ")";
+    return;
+  }
+
+  --mObjectCount[object->getName()];
+  mModels.erase(it);
+  emit sceneUpdated(mSceneName);
+}
+
 void Scene::draw()
 {
   if (!mInit) {
@@ -103,7 +131,7 @@ std::vector<Object *> Scene::getObjects() const
 Object * Scene::getObject(const QString & name) const
 {
   for (const auto & object : getObjects()) {
-    if (object->getName() == name.toStdString()) {
+    if (object->getName() == name) {
       return object;
     }
   }
@@ -121,6 +149,6 @@ void Scene::initSceneObjectName(Object * object)
   // If the object name exists make it unique.
   auto count = ++mObjectCount[object->getName()];
   if (count > 1) {
-    object->setName(object->getName() + " (" + std::to_string(count) + ")");
+    object->setName(object->getName() + " (" + QString::number(count) + ")");
   }
 }

src/qtk/scene.h

@@ -85,16 +85,16 @@ namespace Qtk
 
       void loadModel(const QUrl & url)
       {
-        auto fileName = url.fileName().replace(".obj", "").toStdString();
+        auto fileName = url.fileName().replace(".obj", "");
-        auto filePath = url.toLocalFile().toStdString();
+        auto filePath = url.toLocalFile();
         loadModel(fileName, filePath);
       }
 
-      void loadModel(const std::string & name, const std::string & path)
+      void loadModel(const QString & name, const QString & path)
       {
         // Add the dropped model to the load queue.
         // This is consumed during rendering of the scene if not empty.
-        mModelLoadQueue.emplace(name, path);
+        mModelLoadQueue.emplace(name.toStdString(), path.toStdString());
       }
 
       /*************************************************************************
@@ -120,9 +120,7 @@ namespace Qtk
        */
       [[nodiscard]] uint64_t getObjectCount(const QString & name)
       {
-        return mObjectCount.count(name.toStdString())
+        return mObjectCount.count(name) ? mObjectCount[name] : 0;
-                   ? mObjectCount[name.toStdString()]
-                   : 0;
       }
 
       /**
@@ -184,8 +182,9 @@ namespace Qtk
 
       /**
        * Adds objects to the scene.
-       * This template provides explicit specializations for valid types.
+       * This template provides explicit specializations for the valid types:
-       * Adding any object other than these types will cause errors.
+       * 		MeshRenderer, Model
+       * Any other object type will cause errors.
        * TODO: Refactor to use Object base class container for scene objects.
        *
        * If creating a new object type for a scene, it must inherit Qtk::Object
@@ -196,6 +195,17 @@ namespace Qtk
        */
       template <typename T> T * addObject(T * object);
 
+      /**
+       * Removes an object from the scene.
+       * This template provides explicit specializations for the valid types:
+       * 		MeshRenderer, Model
+       * Any other object type will cause errors.
+       * TODO: Refactor to use Object base class container for scene objects.
+       *
+       * @param object Pointer to the object to remove from the scene.
+       */
+      template <typename T> void removeObject(T * object);
+
       /**
        * @param name The name to use for this scene.
        */
@@ -248,7 +258,7 @@ namespace Qtk
       /* MeshRenderers used simple geometry. */
       std::vector<MeshRenderer *> mMeshes {};
       /* Track count of objects with same initial name. */
-      std::unordered_map<std::string, uint64_t> mObjectCount;
+      std::unordered_map<QString, uint64_t> mObjectCount;
   };
 }  // namespace Qtk
 

src/qtk/shaders.h

@@ -109,11 +109,12 @@ void main()
 #version 330
 uniform samplerCube uTexture;
 
-varying vec3 vTexCoord;
+in vec3 vTexCoord;
+out vec4 FragColor;
 
 void main()
 {
-  gl_FragColor = texture(uTexture, vTexCoord);
+  FragColor = texture(uTexture, vTexCoord);
 }
 )"
 

src/qtk/skybox.cpp

@@ -17,9 +17,28 @@ using namespace Qtk;
  * Constructors / Destructors
  ******************************************************************************/
 
-Skybox::Skybox(QOpenGLTexture * cubeMap, const std::string & name)
+Skybox::Skybox(const std::string & name) :
+    mVBO(QOpenGLBuffer::VertexBuffer),
+    mVertices(Cube(QTK_DRAW_ELEMENTS).getVertices()),
+    mIndices(Cube(QTK_DRAW_ELEMENTS).getIndexData())
 {
-  mTexture.setTexture(cubeMap);
+  QImage image({1024, 1024}, QImage::Format_RGBA8888);
+  image.fill(Qt::darkGray);
+  mTexture.setCubeMap(image, image, image, image, image, image);
+  init();
+}
+
+Skybox::Skybox(QOpenGLTexture * cubeMap, const std::string & name) :
+    mVBO(QOpenGLBuffer::VertexBuffer),
+    mVertices(Cube(QTK_DRAW_ELEMENTS).getVertices()),
+    mIndices(Cube(QTK_DRAW_ELEMENTS).getIndexData())
+{
+  if (cubeMap == Q_NULLPTR) {
+    qDebug()
+        << "[Qtk] Failed to set cubemap for skybox with null QOpenGLTexture.";
+  } else {
+    mTexture.setTexture(cubeMap);
+  }
   init();
 }
 
@@ -34,13 +53,13 @@ Skybox::Skybox(const std::string & right,
     mVertices(Cube(QTK_DRAW_ELEMENTS).getVertices()),
     mIndices(Cube(QTK_DRAW_ELEMENTS).getIndexData())
 {
-  init();
   mTexture.setCubeMap(QImage(right.c_str()).mirrored(),
                       QImage(top.c_str()),
                       QImage(front.c_str()),
                       QImage(left.c_str()),
                       QImage(bottom.c_str()),
                       QImage(back.c_str()));
+  init();
 }
 
 /*******************************************************************************
@@ -54,7 +73,7 @@ void Skybox::draw()
 
   mVAO.bind();
   mProgram.bind();
-  mTexture.getOpenGLTexture().bind();
+  mTexture.bind();
 
   mProgram.setUniformValue("uProjectionMatrix", Scene::getProjectionMatrix());
   mProgram.setUniformValue("uViewMatrix", Scene::getCamera().toMatrix());
@@ -62,7 +81,7 @@ void Skybox::draw()
   glDrawElements(
       GL_TRIANGLES, mIndices.size(), GL_UNSIGNED_INT, mIndices.data());
 
-  mTexture.getOpenGLTexture().bind();
+  mTexture.bind();
   mProgram.release();
   mVAO.release();
 

src/qtk/skybox.h

@@ -34,7 +34,12 @@ namespace Qtk
        * Constructors / Destructors
        ************************************************************************/
 
-      // Delegate this constructor to use default skybox images
+      /**
+       * Construct a skybox with a default texture.
+       *
+       * @param name The objectName to use for the Skybox.
+       */
+      explicit Skybox(const std::string & name = "Skybox");
 
       /**
        * Construct a skybox with an existing QOpenGLTexture.

src/qtk/texture.cpp

@@ -8,6 +8,7 @@
 
 #include <QDebug>
 #include <QImageReader>
+#include <QPainter>
 
 #include "texture.h"
 
@@ -65,6 +66,22 @@ QOpenGLTexture * OpenGLTextureFactory::initCubeMap(const char * right,
                      QImage(back));
 }
 
+QImage OpenGLTextureFactory::defaultTexture()
+{
+  QImage image({256, 256}, QImage::Format_RGBA8888);
+  image.fill(Qt::lightGray);
+
+  // Draw a red '?' to the center of the image.
+  QPainter painter(&image);
+  painter.setRenderHint(QPainter::Antialiasing);
+  painter.setPen(Qt::red);
+  painter.setFont({"Helvetica", 100, QFont::Bold});
+  constexpr QRect rect(0, 0, 256, 256);
+  painter.drawText(rect, Qt::AlignCenter, "?");
+
+  return image;
+}
+
 QOpenGLTexture * OpenGLTextureFactory::initCubeMap(const QImage & right,
                                                    const QImage & top,
                                                    const QImage & front,
@@ -87,9 +104,9 @@ QOpenGLTexture * OpenGLTextureFactory::initCubeMap(const QImage & right,
       QOpenGLTexture::CubeMapNegativeZ};
   int i = 0;
   for (const auto & face : faces) {
-    QImage faceImage(faceTextures[i]);
+    QImage & faceImage = faceTextures[i];
     if (faceImage.isNull()) {
-      qDebug() << "Error loading cube map image\n";
+      qDebug() << "[libqtk] Error loading cube map image\n";
       faceImage = defaultTexture();
     }
     faceImage = faceImage.convertToFormat(QImage::Format_RGBA8888);

src/qtk/texture.h

@@ -145,13 +145,7 @@ namespace Qtk
                                           const char * back);
 
       /// The texture used in place of a missing texture.
-      static QImage defaultTexture()
+      static QImage defaultTexture();
-      {
-        // Use plaster for default texture if image fails to load.
-        // This prevents segfaults when loading a texture that doesn't exist.
-        // TODO: Replace with a '?' texture to indicate missing texture.
-        return QImage(":/textures/plaster.png");
-      }
 
     private:
       // Private ctor to prevent creating instances of this class
@@ -223,6 +217,20 @@ namespace Qtk
         return mOpenGLTexture != Q_NULLPTR;
       }
 
+      /**
+       * Bind the OpenGL texture if it exists, avoiding segmentation faults.
+       */
+      bool bind() const
+      {
+        if (hasTexture()) {
+          // TODO: It would be nice to warn here but some objects may not have
+          // a texture. Factor Texture out of those objects so we don't bind.
+          mOpenGLTexture->bind();
+          return true;
+        }
+        return false;
+      }
+
       /*************************************************************************
        * Accessors
        ************************************************************************/
@@ -306,12 +314,12 @@ namespace Qtk
       /**
        * Sets this Texture to be a cube map with provided sides.
        *
-       * @param right Path to texture to use for right cube map side.
+       * @param right QImage texture to use for right cube map side.
-       * @param top Path to texture to use for top cube map side.
+       * @param top QImage texture to use for top cube map side.
-       * @param front Path to texture to use for front cube map side.
+       * @param front QImage texture to use for front cube map side.
-       * @param left Path to texture to use for left cube map side.
+       * @param left QImage texture to use for left cube map side.
-       * @param bottom Path to texture to use for bottom cube map side.
+       * @param bottom QImage texture to use for bottom cube map side.
-       * @param back Path to texture to use for back cube map side.
+       * @param back QImage texture to use for back cube map side.
        */
       virtual inline void setCubeMap(const QImage & right,
                                      const QImage & top,