From b78b66f2eea91bfb3565c75915449e524e2cb912 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Tue, 25 Dec 2018 08:50:19 -0500 Subject: [PATCH] Add material editor to tools menu --- CMakeLists.txt | 3 ++- data/maticon.png | Bin 0 -> 9958 bytes tools/leveleditor/src/mainwindow.cpp | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 data/maticon.png diff --git a/CMakeLists.txt b/CMakeLists.txt index ca7ff51..3b86aa5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,6 +127,7 @@ add_data(Graph data/player.obj data/sphere.obj data/matpreview.world - data/basic.material) + data/basic.material + data/maticon.png) add_subdirectory(tools) diff --git a/data/maticon.png b/data/maticon.png new file mode 100644 index 0000000000000000000000000000000000000000..bab83afe72f7885796fb054560e9e1985e2b9934 GIT binary patch literal 9958 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

uwn{B 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 literal 0 HcmV?d00001 diff --git a/tools/leveleditor/src/mainwindow.cpp b/tools/leveleditor/src/mainwindow.cpp index c2b26c6..7439f84 100644 --- a/tools/leveleditor/src/mainwindow.cpp +++ b/tools/leveleditor/src/mainwindow.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include "renderwindow.h" @@ -79,6 +80,21 @@ MainWindow::MainWindow(Context& context) : context(context) { editMenu->addAction(userPreferenes); } + QMenu* toolsMenu = new QMenu("Tools"); + mainMenuBar->addMenu(toolsMenu); + + // tools + { + QAction* materialEditorAction = new QAction("Material Editor"); + connect(materialEditorAction, &QAction::triggered, [] { + QProcess *process = new QProcess(); + QString file = "tools/materialeditor/MaterialEditor"; + process->start(file); + }); + materialEditorAction->setIcon(QIcon("data/maticon.png")); + toolsMenu->addAction(materialEditorAction); + } + QMenu* windowMenu = new QMenu("Window"); mainMenuBar->addMenu(windowMenu);