Added a material editor

atlas/application/window.cpp

@@ -2000,6 +2000,17 @@ void Window::setEditorControlMode(EditorControlMode mode) {
     editorActiveGizmoAxis = 0;
 }
 
+void Window::setEditorShadingMode(EditorShadingMode mode) {
+    editorShadingMode = mode;
+    opal::RasterizerMode nextMode = opal::RasterizerMode::Fill;
+    if (mode == EditorShadingMode::Wireframe) {
+        nextMode = opal::RasterizerMode::Line;
+    } else if (mode == EditorShadingMode::Points) {
+        nextMode = opal::RasterizerMode::Point;
+    }
+    updatePipelineStateField(rasterizerMode, nextMode);
+}
+
 unsigned int Window::getSelectedEditorObjectId() const {
     return selectedEditorObject != nullptr ? selectedEditorObject->getId() : 0;
 }

atlas/graphics/deferred.cpp

@@ -315,6 +315,7 @@ void Window::deferredRendering(
         std::shared_ptr<opal::Pipeline> pipeline;
         int width = 0;
         int height = 0;
+        opal::RasterizerMode rasterizerMode = opal::RasterizerMode::Fill;
     };
     static std::unordered_map<Renderable *, ShaderProgram> deferredPrograms;
     static std::unordered_map<Renderable *, DeferredPipelineCacheEntry>
@@ -431,10 +432,12 @@ void Window::deferredRendering(
         const int gbufferHeight = this->gBuffer->getHeight();
         if (pipelineEntry.pipeline == nullptr ||
             pipelineEntry.width != gbufferWidth ||
-            pipelineEntry.height != gbufferHeight) {
+            pipelineEntry.height != gbufferHeight ||
+            pipelineEntry.rasterizerMode != this->rasterizerMode) {
             auto deferredPipeline = opal::Pipeline::create();
             deferredPipeline->setViewport(0, 0, gbufferWidth, gbufferHeight);
             deferredPipeline->setCullMode(this->cullMode);
+            deferredPipeline->setRasterizerMode(this->rasterizerMode);
             deferredPipeline->setFrontFace(this->deferredFrontFace);
             deferredPipeline->enableDepthTest(true);
             deferredPipeline->setDepthCompareOp(opal::CompareOp::Less);
@@ -443,6 +446,7 @@ void Window::deferredRendering(
                 programIt->second.requestPipeline(deferredPipeline);
             pipelineEntry.width = gbufferWidth;
             pipelineEntry.height = gbufferHeight;
+            pipelineEntry.rasterizerMode = this->rasterizerMode;
         }
 
         obj->setViewMatrix(this->camera->calculateViewMatrix());

editor/styling/dark.qss

@@ -157,6 +157,91 @@ QToolButton::menu-indicator {
     image: none;
 }
 
+#viewportToolbar {
+    background-color: #1B1E20;
+    border-bottom: 1px solid #353B3E;
+}
+
+#viewportPlaybackButton,
+#viewportModeButton,
+#viewportOptionButton {
+    min-width: 26px;
+    min-height: 24px;
+    padding: 2px 7px;
+}
+
+#viewportPlaybackButton {
+    border-radius: 12px;
+}
+
+#viewportShadingMode {
+    min-width: 108px;
+    padding-top: 3px;
+    padding-bottom: 3px;
+}
+
+#viewportFpsLabel {
+    color: #9DA8AE;
+}
+
+#materialEditorHeader {
+    background-color: #1B1E20;
+    border-bottom: 1px solid #363C3F;
+}
+
+#materialEditorTitle {
+    color: #F3F6F7;
+    font-size: 15px;
+    font-weight: 650;
+}
+
+#materialEditorStatus {
+    color: #89959B;
+}
+
+#materialEditorScroll,
+#materialEditorBody {
+    border: none;
+    background-color: #202324;
+}
+
+#materialPreview {
+    background-color: #191C1D;
+    border: 1px solid #3A4144;
+    border-radius: 8px;
+}
+
+#materialEditorEmpty {
+    color: #879299;
+    padding: 40px;
+}
+
+#materialTextureSlot {
+    background-color: #1B1E20;
+    border: 1px solid #343B3E;
+    border-radius: 6px;
+}
+
+#materialTexturePreview {
+    background-color: #25292B;
+    border: 1px solid #41494D;
+    border-radius: 4px;
+    color: #EF8C7B;
+    font-weight: 700;
+    qproperty-alignment: AlignCenter;
+}
+
+#materialTextureLabel {
+    color: #CDD4D8;
+    font-weight: 600;
+}
+
+#materialTexturePath {
+    color: #8F9AA0;
+    padding-top: 3px;
+    padding-bottom: 3px;
+}
+
 QLineEdit,
 QTextEdit,
 QPlainTextEdit,

editor/views/editor/editor.cpp

@@ -19,13 +19,16 @@
 #include <QTimer>
 #include <QVariantList>
 #include <QCloseEvent>
+#include <QFileInfo>
 
 #include "DockManager.h"
 #include "editor/debug.h"
 #include "editor/views/fileExplorer.h"
 #include "editor/views/hierarchyPanel.h"
 #include "editor/views/inspectorView.h"
+#include "editor/views/materialEditor.h"
 #include "editor/views/viewport.h"
+#include "editor/views/viewportTools.h"
 
 EditorWindow::EditorWindow(const QString &projectFile, QWidget *parent)
     : QMainWindow(parent), projectFile(projectFile) {
@@ -102,10 +105,11 @@ void EditorWindow::setupMenus() {
 
 void EditorWindow::setupDocks() {
     viewportPanel = new ViewportPanel(projectFile);
+    auto *viewportTools = new ViewportTools(viewportPanel);
     dockManager->addPanel(
         {.id = "viewport",
          .title = "Viewport",
-         .widget = viewportPanel,
+         .widget = viewportTools,
          .area = EditorDockArea::Center,
          .icon = style()->standardIcon(QStyle::SP_DirOpenIcon)});
 
@@ -133,6 +137,14 @@ void EditorWindow::setupDocks() {
          .area = EditorDockArea::Bottom,
          .icon = style()->standardIcon(QStyle::SP_DirOpenIcon)});
 
+    auto *materialEditor = new MaterialEditorPanel(viewportPanel);
+    auto *materialDock = dockManager->addPanel(
+        {.id = "materialEditor",
+         .title = "Material Editor",
+         .widget = materialEditor,
+         .area = EditorDockArea::Right,
+         .icon = style()->standardIcon(QStyle::SP_FileDialogContentsView)});
+
     connect(hierarchyPanel, &HierarchyPanel::objectActivated, inspectorPanel,
             &InspectorPanel::inspectRuntimeObject);
     connect(hierarchyPanel, &HierarchyPanel::objectActivated, contentBrowser,
@@ -143,11 +155,19 @@ void EditorWindow::setupDocks() {
             contentBrowser, &ContentBrowserPanel::clearSelection);
     connect(contentBrowser, &ContentBrowserPanel::selectionChanged, this,
             [this](const QString &path) {
-                if (!path.isEmpty()) {
+                const QString suffix = QFileInfo(path).suffix().toLower();
+                if (!path.isEmpty() && suffix != "amat" &&
+                    suffix != "material") {
                     viewportPanel->selectRuntimeObject(-1, false);
                 }
                 this->inspectorPanel->inspectFile(path);
             });
+    connect(contentBrowser, &ContentBrowserPanel::assetActivated, this,
+            [materialEditor, materialDock](const QString &path) {
+                materialEditor->openMaterial(path);
+                materialDock->toggleView(true);
+                materialDock->raise();
+            });
 }
 
 void EditorWindow::saveLayout() {