Skip to content

Added graphite support to the editor #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxvdec merged 6 commits into from
Jul 21, 2026
Merged

Added graphite support to the editor #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
43860ff
Add authored Graphite UI runtime format
maxvdec Jul 21, 2026
3735028
Create the Graphite UI editor workspace
maxvdec Jul 21, 2026
5ee35bd
Complete Graphite UI authoring with an end-to-end sample
maxvdec Jul 21, 2026
ff812cc
Fix Graphite component color editing
maxvdec Jul 21, 2026
74f01e4
Fix Graphite runtime colors and default text rendering
maxvdec Jul 21, 2026
4785ac0
Show Graphite overlays in the scene hierarchy
maxvdec Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions atlas/application/window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1870,8 +1870,11 @@ bool Window::stepFrame() {

updatePipelineStateField(this->useBlending, true);

for (auto &obj : this->uiRenderables) {
obj->render(getDeltaTime(), commandBuffer, shouldRefreshPipeline(obj));
if (!editorControlsEnabled || editorCameraFocused) {
for (auto &obj : this->uiRenderables) {
obj->render(getDeltaTime(), commandBuffer,
shouldRefreshPipeline(obj));
}
}

this->lastViewMatrix = screenView;
Expand Down
54 changes: 52 additions & 2 deletions editor/views/editor/editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
#include "editor/views/inspectorView.h"
#include "editor/views/inputActionsDialog.h"
#include "editor/views/materialEditor.h"
#include "editor/views/graphiteEditor.h"
#include "editor/views/postProcessing.h"
#include "editor/views/viewport.h"
#include "editor/views/viewportTools.h"
Expand Down Expand Up @@ -306,6 +307,10 @@ void EditorWindow::setupMenus() {
return action;
};
addCommand(fileMenu, "New Scene", "Meta+N", [this] { createScene(); });
addCommand(fileMenu, "New Graphite UI", QString(), [this] {
if (contentBrowser != nullptr)
contentBrowser->createUI();
});
addCommand(fileMenu, "Open Scene…", "Meta+O", [this] { openScene(); });
auto *saveAction = fileMenu->addAction("Save Scene");
saveAction->setIcon(styling::icon(styling::Icon::FloppyDisk, "#A1957D"));
Expand All @@ -316,6 +321,10 @@ void EditorWindow::setupMenus() {
materialEditorPanel->isVisible()) {
materialEditorPanel->saveMaterial();
}
if (graphiteEditorPanel != nullptr &&
graphiteEditorPanel->isVisible()) {
graphiteEditorPanel->saveUI();
}
if (viewportPanel != nullptr) {
viewportPanel->saveRuntimeScene();
}
Expand Down Expand Up @@ -352,6 +361,10 @@ void EditorWindow::setupMenus() {
materialEditorPanel->isAncestorOf(
QApplication::focusWidget())) {
materialEditorPanel->undo();
} else if (graphiteEditorPanel != nullptr &&
graphiteEditorPanel->isAncestorOf(
QApplication::focusWidget())) {
graphiteEditorPanel->undo();
} else if (viewportPanel != nullptr) {
viewportPanel->undo();
}
Expand All @@ -369,6 +382,10 @@ void EditorWindow::setupMenus() {
materialEditorPanel->isAncestorOf(
QApplication::focusWidget())) {
materialEditorPanel->redo();
} else if (graphiteEditorPanel != nullptr &&
graphiteEditorPanel->isAncestorOf(
QApplication::focusWidget())) {
graphiteEditorPanel->redo();
} else if (viewportPanel != nullptr) {
viewportPanel->redo();
}
Expand Down Expand Up @@ -599,11 +616,14 @@ void EditorWindow::setupDocks() {
viewportTools = new ViewportTools(viewportPanel, projectFile);
materialEditorPanel = new MaterialEditorPanel(viewportPanel);
postProcessingPanel = new PostProcessingPanel(viewportPanel);
graphiteEditorPanel =
new GraphiteEditorPanel(viewportPanel, projectFile);
workspaceStack = new QStackedWidget(this);
workspaceStack->setObjectName("editorWorkspaceStack");
workspaceStack->addWidget(viewportTools);
workspaceStack->addWidget(materialEditorPanel);
workspaceStack->addWidget(postProcessingPanel);
workspaceStack->addWidget(graphiteEditorPanel);
workspaceStack->setCurrentIndex(0);
auto *workspaceDock = dockManager->addPanel(
{.id = "workspace",
Expand Down Expand Up @@ -682,7 +702,10 @@ void EditorWindow::setupDocks() {
}
windowMenu->addSeparator();
const QList<QPair<QString, int>> workspaceModes{
{"Scene", 0}, {"Shading", 1}, {"Post-Processing", 2}};
{"Scene", 0},
{"Shading", 1},
{"Post-Processing", 2},
{"Graphite", 3}};
for (const auto &[name, index] : workspaceModes) {
auto *action = windowMenu->addAction(
QStringLiteral("Open %1 Workspace").arg(name), this,
Expand All @@ -696,7 +719,9 @@ void EditorWindow::setupDocks() {
index == 0 ? styling::icon(styling::Icon::CubeFocus, "#7E929C")
: index == 1
? styling::icon(styling::Icon::Material, "#A1957D")
: styling::icon(styling::Icon::FilmStrip, "#849589"));
: index == 2
? styling::icon(styling::Icon::FilmStrip, "#849589")
: styling::icon(styling::Icon::Palette, "#849589"));
}
}

Expand All @@ -706,6 +731,21 @@ void EditorWindow::setupDocks() {
&InspectorPanel::inspectCamera);
connect(hierarchyPanel, &HierarchyPanel::environmentActivated,
inspectorPanel, &InspectorPanel::inspectEnvironment);
connect(hierarchyPanel, &HierarchyPanel::graphiteActivated, this,
[this](const QString &path) {
if (!path.isEmpty() && graphiteEditorPanel != nullptr &&
viewportPanel != nullptr) {
QString resolved = path;
if (QFileInfo(resolved).isRelative()) {
resolved =
QDir(QFileInfo(viewportPanel->currentRuntimeScene())
.absolutePath())
.filePath(resolved);
}
graphiteEditorPanel->openUI(resolved);
}
activateWorkspace(3);
});
connect(hierarchyPanel, &HierarchyPanel::objectActivated, contentBrowser,
&ContentBrowserPanel::clearSelection);
connect(viewportPanel, &ViewportPanel::runtimeObjectActivated,
Expand Down Expand Up @@ -734,6 +774,13 @@ void EditorWindow::setupDocks() {
viewportTools->openSceneTab(path);
}
});
connect(contentBrowser, &ContentBrowserPanel::uiActivated, this,
[this](const QString &path) {
graphiteEditorPanel->openUI(path);
activateWorkspace(3);
});
connect(graphiteEditorPanel, &GraphiteEditorPanel::previewRequested, this,
[this] { activateWorkspace(0); });
}

void EditorWindow::setupWorkspaceBar() {
Expand Down Expand Up @@ -782,6 +829,7 @@ void EditorWindow::setupWorkspaceBar() {
addMode("Scene", styling::Icon::CubeFocus, "#7E929C", 0, true);
addMode("Shading", styling::Icon::Material, "#A1957D", 1);
addMode("Post-Processing", styling::Icon::FilmStrip, "#849589", 2);
addMode("Graphite", styling::Icon::Palette, "#849589", 3);

auto *spacer = new QWidget(bar);
spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
Expand All @@ -795,6 +843,8 @@ void EditorWindow::setupWorkspaceBar() {
connect(save, &QToolButton::clicked, this, [this] {
if (materialEditorPanel != nullptr && materialEditorPanel->isVisible())
materialEditorPanel->saveMaterial();
if (graphiteEditorPanel != nullptr && graphiteEditorPanel->isVisible())
graphiteEditorPanel->saveUI();
if (viewportPanel != nullptr)
viewportPanel->saveRuntimeScene();
});
Expand Down
Loading
Loading