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

drag-and-drop #14

Merged
shaunrd0 merged 45 commits from drag-and-drop into master 2023-12-27 19:36:48 +00:00
Conversation 0 Commits 45 Files Changed 37 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d9c59a04ec - Show all commits

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

@ -58,13 +58,13 @@ jobs:
- name: Build Qtk Application (OSX / Linux) - name: Build Qtk Application (OSX / Linux)
if: matrix.os != 'windows-latest' if: matrix.os != 'windows-latest'
shell: bash shell: bash
run: cmake --build build/ --config Release --target qtk_main -- -j $(nproc) run: cmake --build build/ --config Release --target qtk_app -- -j $(nproc)
# Packaging # Packaging
- name: Install Qtk Application - name: Install Qtk Application
shell: bash shell: bash
run: cmake --install build/ --config Release --prefix=$(pwd)/install --component qtk_main run: cmake --install build/ --config Release --prefix=$(pwd)/install --component qtk_app
- name: Package Qtk Application - name: Package Qtk Application
shell: bash shell: bash

2
src/qtk/scene.h
View File

@ -166,7 +166,6 @@ namespace Qtk {
*/ */
inline void setSceneName(QString name) { mSceneName = std::move(name); } inline void setSceneName(QString name) { mSceneName = std::move(name); }
std::vector<Model *> mModels {};
signals: signals:
/** /**
* Signal thrown when the scene is modified by adding or removing objects. * Signal thrown when the scene is modified by adding or removing objects.
@ -191,6 +190,7 @@ namespace Qtk {
/* MeshRenderers used simple geometry. */ /* MeshRenderers used simple geometry. */
std::vector<MeshRenderer *> mMeshes {}; std::vector<MeshRenderer *> mMeshes {};
/* Models used for storing 3D models in the scene. */ /* Models used for storing 3D models in the scene. */
std::vector<Model *> mModels {};
}; };
class SceneEmpty : public Scene { class SceneEmpty : public Scene {