Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions docs/weather-system-docs/WeatherVariableRegistration.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ The system now automatically:

- Saves/loads weather-specific settings to JSON
- Interpolates variables during weather transitions
- Appears in the weather editor UI with per-weather toggle buttons
- Appears in the CS Editor UI with per-weather toggle buttons
- Handles default values and missing data
- Shows weather-controlled status in feature settings UI

Expand Down Expand Up @@ -278,7 +278,7 @@ Weather-specific settings are stored in:

```
Data/SKSE/Plugins/CommunityShaders/Weathers/
WeatherEditorID_FormID.json
WeatherFormEditorID_FormID.json
```

Each file contains settings for all features:
Expand Down
File renamed without changes.
2 changes: 2 additions & 0 deletions features/CS Editor/Shaders/Features/CSEditor.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[Info]
Version = 2-0-2
2 changes: 0 additions & 2 deletions features/Weather Editor/Shaders/Features/WeatherEditor.ini

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "Features/HDRDisplay.h"
#include "Features/Upscaling.h"
#include "Features/WeatherEditor.h"
#include "Features/CSEditor.h"
#include "Globals.h"
#include "InteriorOnlyPanel.h"
#include "Menu.h"
Expand Down Expand Up @@ -180,7 +180,7 @@ std::string EditorWindow::ResolveEditorId(RE::TESForm* form, const WidgetVec& wi

void EditorWindow::ShowObjectsWindow()
{
Util::BeginWithRoundedClose("Weather and Lighting Browser", nullptr);
Util::BeginWithRoundedClose("CS Editor Browser", nullptr);

// Reset filter state when the user switches categories so stale column
// selections (e.g. Status) don't hide all items in the new category.
Expand Down Expand Up @@ -215,7 +215,7 @@ void EditorWindow::ShowObjectsWindow()
// List of categories
const char* categories[] = { "Weather", "ImageSpace", "Lighting Template", "Cell Lighting",
"Volumetric Lighting", "Shader Particle Geometry", "Lens Flare", "Visual Effect",
"Interior Only", "Lighting editor" };
"Interior Only", "Light Editor" };
for (int i = 0; i < IM_ARRAYSIZE(categories); ++i) {
// Highlight the selected category
if (ImGui::Selectable(categories[i], m_selectedCategory == categories[i])) {
Expand All @@ -240,7 +240,7 @@ void EditorWindow::ShowObjectsWindow()
return;
}

if (m_selectedCategory == "Lighting editor") {
if (m_selectedCategory == "Light Editor") {
BeginScrollableContent("##LightEditorScroll");
lightEditor.DrawSettings();
EndScrollableContent();
Expand Down Expand Up @@ -1006,7 +1006,7 @@ void EditorWindow::RenderUI()
if (hdrActive)
ImGui::BeginDisabled();
if (ImGui::Checkbox("Viewport", &settings.showViewport)) {
BackgroundBlur::SetWeatherEditorActive(settings.showViewport);
BackgroundBlur::SetCSEditorActive(settings.showViewport);
Save();
}
if (hdrActive) {
Expand Down Expand Up @@ -1039,7 +1039,7 @@ void EditorWindow::RenderUI()
ImGui::EndMenu();
}
if (ImGui::BeginMenu("Help")) {
ImGui::Text("Weather Editor");
ImGui::Text("CS Editor");
ImGui::Separator();
ImGui::TextColored(Menu::GetSingleton()->GetTheme().StatusPalette.InfoColor, "Keyboard Shortcuts:");
ImGui::BulletText("Ctrl+F: Focus search");
Expand Down Expand Up @@ -1152,7 +1152,7 @@ void EditorWindow::RenderUI()
char previewStatusBuf[128] = {};
bool showPreviewStatus = previewMode != PreviewMode::None;
if (showPreviewStatus) {
std::string hotkey = Util::Input::KeyIdToString(menu->GetSettings().WeatherEditorToggleKey);
std::string hotkey = Util::Input::KeyIdToString(menu->GetSettings().CSEditorToggleKey);
if (previewMode == PreviewMode::FreeCamera)
std::snprintf(previewStatusBuf, sizeof(previewStatusBuf), " [ %s ] FREE CAMERA (Speed: %.0f)", hotkey.c_str(), flySpeed);
else if (previewMode == PreviewMode::FreeCameraLocked)
Expand Down Expand Up @@ -1264,7 +1264,7 @@ void EditorWindow::RenderUI()
ImGui::SetCursorScreenPos(ImVec2(xButtonX, cursorY));
if (Util::ErrorButton("X", ImVec2(closeButtonSize, closeButtonSize)))
open = false;
Util::AddTooltip("Close Weather Editor (Esc)");
Util::AddTooltip("Close CS Editor (Esc)");

ImGui::PopClipRect(); // End bottom-border clip rect

Expand Down Expand Up @@ -1411,13 +1411,13 @@ void EditorWindow::UpdateOpenState()
if (open && !wasOpen) {
DisableVanityCamera();
HideGameMenus();
BackgroundBlur::SetWeatherEditorActive(IsViewportActive());
BackgroundBlur::SetCSEditorActive(IsViewportActive());

} else if (!open && wasOpen) {
lightEditor.ResetOverrides();
RestoreVanityCamera();
ShowGameMenus();
BackgroundBlur::SetWeatherEditorActive(false);
BackgroundBlur::SetCSEditorActive(false);
}

wasOpen = open;
Expand All @@ -1433,7 +1433,7 @@ void EditorWindow::Draw()
static bool prevViewportActive = false;
const bool viewportActive = IsViewportActive();
if (viewportActive != prevViewportActive) {
BackgroundBlur::SetWeatherEditorActive(viewportActive);
BackgroundBlur::SetCSEditorActive(viewportActive);
prevViewportActive = viewportActive;
}
}
Expand Down Expand Up @@ -1959,7 +1959,7 @@ void EditorWindow::HideGameMenus()
if (auto ui = RE::UI::GetSingleton()) {
ui->ShowMenus(false);
gameMenusHidden = true;
logger::info("Game menus hidden for weather editor");
logger::info("Game menus hidden for CS editor");
}
}

Expand All @@ -1971,7 +1971,7 @@ void EditorWindow::ShowGameMenus()
if (auto ui = RE::UI::GetSingleton()) {
ui->ShowMenus(true);
gameMenusHidden = false;
logger::info("Game menus restored after weather editor");
logger::info("Game menus restored after CS editor");
}
}

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "Utils/UI.h"

/// UI panel for managing Interior Only scene settings within the Weather Editor.
/// UI panel for managing Interior Only scene settings within the CS Editor.
/// Renders the list of entries with add/pause/delete controls.
namespace InteriorOnlyPanel
{
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/Deferred.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "Features/TerrainBlending.h"
#include "Features/Upscaling.h"
#include "Features/VR.h"
#include "Features/WeatherEditor.h"
#include "Features/CSEditor.h"

#include "Hooks.h"

Expand Down
4 changes: 2 additions & 2 deletions src/Feature.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "Features/VolumetricLighting.h"
#include "Features/VolumetricShadows.h"
#include "Features/WaterEffects.h"
#include "Features/WeatherEditor.h"
#include "Features/CSEditor.h"
#include "Features/WetnessEffects.h"
#include "Menu.h"
#include "SettingsOverrideManager.h"
Expand Down Expand Up @@ -241,7 +241,7 @@ const std::vector<Feature*>& Feature::GetFeatureList()
&globals::features::extendedTranslucency,
&globals::features::upscaling,
&globals::features::renderDoc,
&globals::features::weatherEditor,
&globals::features::csEditor,
&globals::features::screenshotFeature,
&globals::features::linearLighting,
&globals::features::unifiedWater,
Expand Down
Loading
Loading