Skip to content

feat(weather-editor): option to hide viewport #1970

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
doodlum merged 7 commits into from
Mar 12, 2026
Merged

feat(weather-editor): option to hide viewport #1970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e3ea264
feat: add option to hide viewport
Mar 12, 2026
024e9d6
fix: black background with viewport enabled
Mar 12, 2026
5b52695
fix: prevent drowpdown menu from closing when toggling viewport.
Mar 12, 2026
f1365fe
fix: move the time slider to the headerbar so it is always accessible
Mar 12, 2026
fdb3228
fix: address AI
Mar 12, 2026
c76dada
fix: address more AI
Mar 12, 2026
eade25d
style: 🎨 apply pre-commit.ci formatting
pre-commit-ci[bot] Mar 12, 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
124 changes: 78 additions & 46 deletions src/WeatherEditor/EditorWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "WeatherUtils.h"
#include "imgui_internal.h"

NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(EditorWindow::Settings, recordMarkers, markedRecords, autoApplyChanges, useTextButtons, enableInheritFromParent, editorUIScale, favoriteWidgets, recentWidgets, maxRecentWidgets, rememberOpenWidgets, lastOpenWidgets)
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(EditorWindow::Settings, recordMarkers, markedRecords, autoApplyChanges, useTextButtons, enableInheritFromParent, editorUIScale, favoriteWidgets, recentWidgets, maxRecentWidgets, rememberOpenWidgets, lastOpenWidgets, showViewport)

void DrawIconStar(ImVec2 center, float radius, ImU32 color, bool filled)
{
Expand Down Expand Up @@ -817,14 +817,7 @@ void EditorWindow::ShowObjectsWindow()

void EditorWindow::ShowViewportWindow()
{
ImGui::Begin("Viewport");

// Top bar
if (DrawGameHourSlider("##ViewportSlider", "Time: %.2f")) {
ImGui::SameLine();
int activePeriod = TOD::GetActivePeriod();
ImGui::Text("(%s)", TOD::GetPeriodName(activePeriod));
}
ImGui::Begin("Viewport", nullptr, ImGuiWindowFlags_NoFocusOnAppearing);

// The size of the image in ImGui // Get the available space in the current window
ImVec2 availableSpace = ImGui::GetContentRegionAvail();
Expand All @@ -844,7 +837,11 @@ void EditorWindow::ShowViewportWindow()
imageSize.x = availableSpace.y * aspectRatio;
}

ImGui::Image((void*)tempTexture->srv.get(), imageSize);
if (tempTexture && tempTexture->srv) {
ImGui::Image((void*)tempTexture->srv.get(), imageSize);
} else {
ImGui::TextDisabled("Viewport unavailable");
}

ImGui::End();
}
Expand Down Expand Up @@ -878,19 +875,15 @@ void EditorWindow::ShowWidgetWindow()

void EditorWindow::RenderUI()
{
auto renderer = RE::BSGraphics::Renderer::GetSingleton();
auto& framebuffer = renderer->GetRuntimeData().renderTargets[RE::RENDER_TARGETS::kFRAMEBUFFER];
auto& context = globals::d3d::context;

context->ClearRenderTargetView(framebuffer.RTV, (float*)&ImGui::GetStyle().Colors[ImGuiCol_WindowBg]);

// Apply editor UI scale
ImGuiIO& io = ImGui::GetIO();
float previousScale = io.FontGlobalScale;
io.FontGlobalScale = settings.editorUIScale;

// Increase background opacity for all editor windows
ImGui::PushStyleVar(ImGuiStyleVar_Alpha, 1.0f);
if (settings.showViewport) {
// Dim the game scene using the theme's modal dim background color
ImGui::GetBackgroundDrawList()->AddRectFilled({ 0, 0 }, io.DisplaySize, ImGui::GetColorU32(ImGuiCol_ModalWindowDimBg));
}

// Check for Ctrl+Z to undo
if ((ImGui::IsKeyDown(ImGuiKey_LeftCtrl) || ImGui::IsKeyDown(ImGuiKey_RightCtrl)) && ImGui::IsKeyPressed(ImGuiKey_Z, false)) {
Expand Down Expand Up @@ -1020,8 +1013,10 @@ void EditorWindow::RenderUI()
ImGui::EndMenu();
}
if (ImGui::BeginMenu("Window")) {
if (ImGui::MenuItem("Palette", nullptr, PaletteWindow::GetSingleton()->open)) {
PaletteWindow::GetSingleton()->open = !PaletteWindow::GetSingleton()->open;
if (ImGui::Checkbox("Viewport", &settings.showViewport)) {
Save();
}
if (ImGui::Checkbox("Palette", &PaletteWindow::GetSingleton()->open)) {
}

ImGui::Separator();
Expand Down Expand Up @@ -1188,9 +1183,28 @@ void EditorWindow::RenderUI()
ImGui::PopStyleColor();
}

// Time slider anchored to the right of the menu bar
// Close button on the right side
float menuBarHeight = ImGui::GetFrameHeight();
float closeButtonSize = menuBarHeight * 0.9f; // 10% smaller than menu bar

// Time slider anchored to the right of the menu bar
{
const float& itemSpacing = ImGui::GetStyle().ItemSpacing.x;
char periodBuf[64];
std::snprintf(periodBuf, sizeof(periodBuf), "(%s)", TOD::GetPeriodName(TOD::GetActivePeriod()));
float periodWidth = ImGui::CalcTextSize(periodBuf).x;
const float sliderStartX = ImGui::GetWindowWidth() - closeButtonSize - 10.0f - itemSpacing - kMenuBarSliderWidth;
auto calendar = globals::game::calendar ? globals::game::calendar : RE::Calendar::GetSingleton();
if (calendar && calendar->gameHour) {
ImGui::SameLine(sliderStartX - itemSpacing - periodWidth);
ImGui::TextUnformatted(periodBuf);
ImGui::SameLine(sliderStartX);
ImGui::SetNextItemWidth(kMenuBarSliderWidth);
DrawGameHourSlider("##MenuBarSlider", "Time: %.2f");
}
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

ImGui::SameLine(ImGui::GetWindowWidth() - closeButtonSize - 10.0f);
auto errorColor = Menu::GetSingleton()->GetSettings().Theme.StatusPalette.Error;
auto errorHoverColor = errorColor;
Expand Down Expand Up @@ -1222,8 +1236,10 @@ void EditorWindow::RenderUI()
ImGui::SetNextWindowSize(ImVec2(sideWidth, ImGui::GetIO().DisplaySize.y * 0.75f), ImGuiCond_FirstUseEver);
ShowObjectsWindow();

ImGui::SetNextWindowSize(ImVec2(viewportWidth, ImGui::GetIO().DisplaySize.y * 0.5f), ImGuiCond_FirstUseEver);
ShowViewportWindow();
if (settings.showViewport) {
ImGui::SetNextWindowSize(ImVec2(viewportWidth, ImGui::GetIO().DisplaySize.y * 0.5f), ImGuiCond_FirstUseEver);
ShowViewportWindow();
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

auto settingsWindowHeight = height * 0.25f;
auto settingsWindowWidth = width * 0.25f;
Expand All @@ -1241,9 +1257,6 @@ void EditorWindow::RenderUI()
// Render notifications on top of everything
RenderNotifications();

// Pop the alpha style var
ImGui::PopStyleVar();

// Restore previous font scale
io.FontGlobalScale = previousScale;
}
Expand Down Expand Up @@ -1338,29 +1351,48 @@ void EditorWindow::Draw()
}
}

auto renderer = RE::BSGraphics::Renderer::GetSingleton();
auto& framebuffer = renderer->GetRuntimeData().renderTargets[RE::RENDER_TARGETS::kFRAMEBUFFER];

ID3D11Resource* resource = nullptr;
framebuffer.SRV->GetResource(&resource);

if (!tempTexture) {
D3D11_TEXTURE2D_DESC texDesc{};
((ID3D11Texture2D*)resource)->GetDesc(&texDesc);

D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc{};
framebuffer.SRV->GetDesc(&srvDesc);

tempTexture = new Texture2D(texDesc);
tempTexture->CreateSRV(srvDesc);
}

auto& context = globals::d3d::context;
if (!settings.showViewport) {
delete tempTexture;
tempTexture = nullptr;
} else {
auto renderer = RE::BSGraphics::Renderer::GetSingleton();
if (renderer) {
auto& framebuffer = renderer->GetRuntimeData().renderTargets[RE::RENDER_TARGETS::kFRAMEBUFFER];
if (framebuffer.SRV) {
ID3D11Resource* resource = nullptr;
framebuffer.SRV->GetResource(&resource);

if (resource) {
auto texture = static_cast<ID3D11Texture2D*>(resource);
D3D11_TEXTURE2D_DESC texDesc{};
texture->GetDesc(&texDesc);

const bool needsRecreate = !tempTexture || !tempTexture->resource || !tempTexture->srv ||
tempTexture->desc.Width != texDesc.Width || tempTexture->desc.Height != texDesc.Height ||
tempTexture->desc.MipLevels != texDesc.MipLevels || tempTexture->desc.ArraySize != texDesc.ArraySize ||
tempTexture->desc.Format != texDesc.Format ||
tempTexture->desc.SampleDesc.Count != texDesc.SampleDesc.Count ||
tempTexture->desc.SampleDesc.Quality != texDesc.SampleDesc.Quality;

if (needsRecreate) {
delete tempTexture;
tempTexture = nullptr;

D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc{};
framebuffer.SRV->GetDesc(&srvDesc);

tempTexture = new Texture2D(texDesc);
tempTexture->CreateSRV(srvDesc);
}

context->CopyResource(tempTexture->resource.get(), resource);
if (tempTexture && tempTexture->resource) {
globals::d3d::context->CopyResource(tempTexture->resource.get(), resource);
}

if (resource) {
resource->Release();
resource->Release();
}
}
}
}

RenderUI();
Expand Down
2 changes: 2 additions & 0 deletions src/WeatherEditor/EditorWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ class EditorWindow
static constexpr float kGameHourMax = 23.99f;
static constexpr float kTimeScaleMin = 0.1f;
static constexpr float kTimeScaleMax = 4000.0f;
static constexpr float kMenuBarSliderWidth = 400.0f;

// Vanity camera control
bool vanityCameraDisabled = false;
Expand Down Expand Up @@ -141,6 +142,7 @@ class EditorWindow
int maxRecentWidgets = 10;
bool rememberOpenWidgets = true;
std::vector<std::string> lastOpenWidgets;
bool showViewport = true;

// Palette settings
struct PaletteColorEntry
Expand Down
2 changes: 1 addition & 1 deletion src/WeatherEditor/PaletteWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ void PaletteWindow::Draw()

ImGui::SetNextWindowSize(ImVec2(600, 400), ImGuiCond_FirstUseEver);
ImGui::SetNextWindowPos(ImVec2(ImGui::GetIO().DisplaySize.x - 620, ImGui::GetIO().DisplaySize.y - 420), ImGuiCond_FirstUseEver);
if (ImGui::Begin("Palette", &open)) {
if (ImGui::Begin("Palette", &open, ImGuiWindowFlags_NoFocusOnAppearing)) {
if (ImGui::BeginTabBar("PaletteTabs")) {
if (ImGui::BeginTabItem("Colours")) {
DrawColorsTab();
Expand Down
Loading