feat(cs-editor): rework lighting editor

package/SKSE/Plugins/CommunityShaders/Translations/en.json

@@ -445,7 +445,7 @@
     "feature.cs_editor.current_weather": "Current Weather: %s",
     "feature.cs_editor.current_weather_column": "Current Weather",
     "feature.cs_editor.description": "Development tool for inspecting, editing, and previewing renderer-facing data in-game.",
-    "feature.cs_editor.effective_wind_dir": "Effective Wind Dir: %.1f° (raw - %.1f°)",
+    "feature.cs_editor.effective_wind_dir": "Effective Wind Dir: %.1f° (raw - %.1f°)",
     "feature.cs_editor.expand": "expand",
     "feature.cs_editor.feature_weather_analysis_tooltip_0": "Weather analysis provided by: ",
     "feature.cs_editor.feature_weather_analysis_tooltip_1": "Feature category: ",
@@ -484,7 +484,7 @@
     "feature.cs_editor.particle_density": "Particle Density: %.3f",
     "feature.cs_editor.particle_texture": "Particle Texture: %s",
     "feature.cs_editor.particle_texture_none": "Particle Texture: None",
-    "feature.cs_editor.player_direction": "Player Direction: %.1f°",
+    "feature.cs_editor.player_direction": "Player Direction: %.1f°",
     "feature.cs_editor.pleasant": "Pleasant",
     "feature.cs_editor.precip_begin_fade_in": "Precip Begin Fade-In: %.3f (raw %u)",
     "feature.cs_editor.precip_end_fade_out": "Precip End Fade-Out: %.3f (raw %u)",
@@ -537,15 +537,15 @@
     "feature.cs_editor.weather_percentage": "Weather Percentage: %.1f%%",
     "feature.cs_editor.weather_picker": "Weather Picker",
     "feature.cs_editor.weather_wind_speed": "Weather Wind Speed: %.2f (raw %d)",
-    "feature.cs_editor.wind_direction": "Wind Direction: %.1f° (raw %d)",
-    "feature.cs_editor.wind_direction_range": "Wind Direction Range: %.1f° (raw %d)",
+    "feature.cs_editor.wind_direction": "Wind Direction: %.1f° (raw %d)",
+    "feature.cs_editor.wind_direction_range": "Wind Direction Range: %.1f° (raw %d)",
     "feature.cs_editor.wind_direction_tooltip_0": "Wind direction from weather definition",
     "feature.cs_editor.wind_speed_tooltip_0": "Wind speed from weather definition",
-    "feature.cs_editor.wind_vs_player": "Wind vs Player: %.1f°",
+    "feature.cs_editor.wind_vs_player": "Wind vs Player: %.1f°",
     "feature.cs_editor.wind_vs_player_tooltip_0": "Wind relative to player direction:",
-    "feature.cs_editor.wind_vs_player_tooltip_1": "- ~0° = Tailwind (wind behind player)",
-    "feature.cs_editor.wind_vs_player_tooltip_2": "- ~±90° = Crosswind (left/right)",
-    "feature.cs_editor.wind_vs_player_tooltip_3": "- ~±180° = Headwind (wind coming toward player)",
+    "feature.cs_editor.wind_vs_player_tooltip_1": "- ~0° = Tailwind (wind behind player)",
+    "feature.cs_editor.wind_vs_player_tooltip_2": "- ~±90° = Crosswind (left/right)",
+    "feature.cs_editor.wind_vs_player_tooltip_3": "- ~±180° = Headwind (wind coming toward player)",
     "feature.dynamic_cubemaps.color": "Color",
     "feature.dynamic_cubemaps.creator_info": "You must enable creator mode by adding the shader define CREATOR",
     "feature.dynamic_cubemaps.description": "Provides real-time environment mapping and reflections by generating dynamic cube maps that capture the surrounding environment, enabling realistic reflections on surfaces.",
@@ -808,45 +808,141 @@
     "feature.inverse_square_lighting.name": "Inverse Square Lighting",
     "feature.key_features": "Key features:",
     "feature.light_editor.active_shadow_lights": "Active Shadow Lights: %u",
+    "feature.light_editor.add_bulb": "Add Bulb",
+    "feature.light_editor.add_light_failed": "Failed to add light — see log",
+    "feature.light_editor.add_point": "Add Point",
+    "feature.light_editor.add_to_blacklist": "Add to Blacklist",
+    "feature.light_editor.add_to_entry_btn": "Add to Entry",
+    "feature.light_editor.add_to_whitelist": "Add to Whitelist",
+    "feature.light_editor.added_light_to_config": "Added light to {path}",
+    "feature.light_editor.added_to_blacklist": "Added to blacklist",
+    "feature.light_editor.added_to_whitelist": "Added to whitelist",
+    "feature.light_editor.attach_by": "Attach by:",
+    "feature.light_editor.attach_editor_id": "EditorID",
+    "feature.light_editor.attach_form_id": "FormID",
+    "feature.light_editor.attach_model": "Model",
+    "feature.light_editor.attached_bulb": "Attached bulb",
+    "feature.light_editor.attaching_light": "Attaching light, please wait...",
     "feature.light_editor.base_object": "Base Object: 0x%08X | %s",
-    "feature.light_editor.cell": "Cell: %s",
+    "feature.light_editor.bulb_type": "Bulb type",
+    "feature.light_editor.cell": "Cell: 0x%08X | %s",
+    "feature.light_editor.choose_attach_type": "Choose an attach type (Model, FormID, or EditorID).",
+    "feature.light_editor.choose_light_record": "Choose a light record.",
+    "feature.light_editor.choose_target_json": "Choose a target JSON.",
+    "feature.light_editor.close": "Close",
     "feature.light_editor.color": "Color",
+    "feature.light_editor.config": "Config: Data\\LightPlacer\\%s.json",
     "feature.light_editor.cutoff": "Cutoff",
     "feature.light_editor.disable_inverse_square_falloff_lights": "Disable Inverse Square Falloff Lights",
     "feature.light_editor.disable_regular_falloff_lights": "Disable Regular Falloff Lights",
-    "feature.light_editor.dynamic": "Dynamic",
-    "feature.light_editor.filter_by": "Filter By",
-    "feature.light_editor.flicker": "Flicker",
-    "feature.light_editor.flicker_slow": "Flicker Slow",
-    "feature.light_editor.hemi_shadow": "Hemi Shadow",
+    "feature.light_editor.entry_type_cell": "Cell",
+    "feature.light_editor.entry_type_reference": "Reference",
+    "feature.light_editor.external_emittance": "External Emittance",
+    "feature.light_editor.fade": "Fade",
+    "feature.light_editor.filter_attached_lights": "Attached Lights",
+    "feature.light_editor.filter_button_tooltip": "%s\nFormat: %s\nReload LP to apply.",
+    "feature.light_editor.filter_entry_type": "Add as:",
+    "feature.light_editor.filter_other_lights": "Other Lights",
+    "feature.light_editor.filter_ref_lights": "Ref Lights",
+    "feature.light_editor.filter_update_failed": "Filter update failed — see log",
+    "feature.light_editor.header": "Light Editor",
     "feature.light_editor.intensity": "Intensity",
-    "feature.light_editor.inverse_square_light": "Inverse Square Light",
+    "feature.light_editor.inverse_square": "Inverse Square",
     "feature.light_editor.ligh": "LIGH: 0x%08X | %s",
+    "feature.light_editor.light_already_in_entry": "This light already exists in this entry.",
     "feature.light_editor.light_flags": "Light Flags",
+    "feature.light_editor.light_record": "Light record",
     "feature.light_editor.lights": "Lights",
-    "feature.light_editor.linear_light": "Linear Light",
+    "feature.light_editor.linear": "Linear",
+    "feature.light_editor.log_mode": "Log Mode",
+    "feature.light_editor.log_mode_tooltip": "Extend slider ranges and use a logarithmic scale.",
+    "feature.light_editor.lp_flags": "LP Flags",
     "feature.light_editor.memory_address": "Memory Address: %p",
-    "feature.light_editor.negative": "Negative",
+    "feature.light_editor.mode_add_light": "Add Light",
+    "feature.light_editor.mode_edit_bulb": "Edit Bulb",
+    "feature.light_editor.mode_remove_from_list": "Remove from List",
     "feature.light_editor.ni_light_name": "NiLight Name: %s",
-    "feature.light_editor.omni_shadow": "Omni Shadow",
+    "feature.light_editor.no_attached_bulbs": "This mesh has no attached Light Placer bulbs.",
+    "feature.light_editor.no_base_record": "Picked object has no base record.",
+    "feature.light_editor.no_cell_editor_id": "This mesh's cell has no EditorID.",
+    "feature.light_editor.no_configs_found": "No configs found in Data\\LightPlacer\\",
+    "feature.light_editor.no_editor_id_on_object": "No EditorID on this object.",
+    "feature.light_editor.no_filter_list_entries": "This mesh has no whitelist or blacklist entries.",
+    "feature.light_editor.no_model_path": "No model path on this object.",
+    "feature.light_editor.no_source_plugin": "No source plugin on this object.",
+    "feature.light_editor.none": "(None)",
+    "feature.light_editor.none_value": "(none)",
+    "feature.light_editor.object_no_editor_id": "This object has no EditorID.",
+    "feature.light_editor.object_no_model_path": "This object has no model path.",
+    "feature.light_editor.object_no_source_plugin": "This object has no source plugin for a FormID entry.",
+    "feature.light_editor.original": "(Original)",
     "feature.light_editor.owner": "Owner: 0x%08X | %s",
     "feature.light_editor.owner_last_edited_by": "Owner last edited by: %s",
-    "feature.light_editor.portal_strict": "Portal Strict",
+    "feature.light_editor.pick_mesh_prompt": "Click a mesh to attach a light... (right-click / ESC to cancel)",
+    "feature.light_editor.pick_mode_collision": "Collision",
+    "feature.light_editor.pick_mode_effect": "Effect mesh",
+    "feature.light_editor.picked_base_form_id": "Base FormID: 0x%08X",
+    "feature.light_editor.picked_editor_id": "EditorID: %s",
+    "feature.light_editor.picked_mesh": "Mesh: %s",
+    "feature.light_editor.picked_plugin": "Plugin: %s",
+    "feature.light_editor.position": "Position",
     "feature.light_editor.position_format": "X: %.2f, Y: %.2f, Z: %.2f",
-    "feature.light_editor.position_offset": "Position Offset",
-    "feature.light_editor.pulse": "Pulse",
-    "feature.light_editor.pulse_slow": "Pulse Slow",
     "feature.light_editor.radius": "Radius",
-    "feature.light_editor.revert_changes": "Revert Changes",
+    "feature.light_editor.reload_lp": "Reload LP",
+    "feature.light_editor.reload_lp_tooltip": "Reload all Light Placer JSON configs in-game (reloadlp).",
+    "feature.light_editor.reloading_lp_configs": "Reloading Light Placer configs...",
+    "feature.light_editor.remove_btn": "Remove",
+    "feature.light_editor.remove_from_blacklist": "Remove from Blacklist",
+    "feature.light_editor.remove_from_whitelist": "Remove from Whitelist",
+    "feature.light_editor.removed_from_blacklist": "Removed from blacklist",
+    "feature.light_editor.removed_from_list": "Removed from list",
+    "feature.light_editor.removed_from_whitelist": "Removed from whitelist",
+    "feature.light_editor.reset": "Reset",
+    "feature.light_editor.save_as_separate_entry": "Save as Separate Entry",
+    "feature.light_editor.save_as_separate_entry_tooltip": "Fork this bulb into a new whitelist entry for %s with the current edits, and blacklist it from the shared entry so the edits apply only to this reference.\nReload LP to apply.",
+    "feature.light_editor.save_color": "Save",
+    "feature.light_editor.save_color_tooltip": "Include color when saving to Light Placer.\nWhen unchecked, the light falls back to the LIGH form color.",
+    "feature.light_editor.save_failed": "Save failed — see log",
     "feature.light_editor.save_to_light_placer": "Save to Light Placer",
-    "feature.light_editor.save_to_light_placer_tooltip": "Save current settings to the Light Placer JSON.",
+    "feature.light_editor.save_to_lp_match_tooltip": "Matching entry found in %s.\nSave current settings to the Light Placer JSON.",
+    "feature.light_editor.save_to_lp_no_match_tooltip": "No matching entry found in %s.\nSaving will fail.",
+    "feature.light_editor.saved_as_separate_entry": "Saved as separate entry",
+    "feature.light_editor.saved_to_config": "Saved to {path}",
+    "feature.light_editor.select_a_bulb": "Select a bulb",
+    "feature.light_editor.select_a_config": "Select a config",
     "feature.light_editor.select_a_light": "Select a light",
+    "feature.light_editor.select_mesh": "Select Mesh",
+    "feature.light_editor.select_mesh_tooltip": "Click a mesh in the world to attach a new bulb, edit an existing bulb, or whitelist/blacklist this reference.",
+    "feature.light_editor.shadow_depth_bias": "Shadow Depth Bias",
     "feature.light_editor.shadows_only": "Shadows Only",
     "feature.light_editor.shadows_only_tooltip": "Only show lights with HemiShadow or OmniShadow flags.",
     "feature.light_editor.size": "Size",
-    "feature.light_editor.sort_by": "Sort By",
-    "feature.light_editor.spotlight_not_applicable": "Spotlight: ISL light type flags not applicable",
+    "feature.light_editor.sort_distance": "Distance",
+    "feature.light_editor.sort_editor_id": "EditorID",
+    "feature.light_editor.sort_form_id": "FormID",
+    "feature.light_editor.sort_none": "None",
+    "feature.light_editor.sub_mode_new_entry": "Add new entry",
+    "feature.light_editor.sub_mode_new_point": "Add new point",
+    "feature.light_editor.sub_mode_to_entry": "Add to entry",
+    "feature.light_editor.target_json": "Target JSON",
+    "feature.light_editor.tes_flag_dynamic": "Dynamic",
+    "feature.light_editor.tes_flag_flicker": "Flicker",
+    "feature.light_editor.tes_flag_flicker_slow": "Flicker Slow",
+    "feature.light_editor.tes_flag_hemi_shadow": "Hemi Shadow",
+    "feature.light_editor.tes_flag_negative": "Negative",
+    "feature.light_editor.tes_flag_omni_shadow": "Omni Shadow",
+    "feature.light_editor.tes_flag_portal_strict": "Portal Strict",
+    "feature.light_editor.tes_flag_pulse": "Pulse",
+    "feature.light_editor.tes_flag_pulse_slow": "Pulse Slow",
+    "feature.light_editor.toggle_all_lp_lights": "Toggle All LP Lights",
+    "feature.light_editor.toggle_all_lp_lights_tooltip": "Toggle all Light Placer lights on/off (tlp 0).",
+    "feature.light_editor.toggle_light": "Toggle Light",
+    "feature.light_editor.toggle_light_lp_tooltip": "Toggle this reference's LP-placed lights on/off (tlp 0).",
+    "feature.light_editor.toggle_light_tooltip": "Toggle this light on/off.",
+    "feature.light_editor.toggle_lp_markers": "Toggle LP Markers",
+    "feature.light_editor.toggle_lp_markers_tooltip": "Toggle Light Placer debug markers (tlp 1).",
     "feature.light_editor.total_lights": "Total Lights: %u",
+    "feature.light_editor.unknown_value": "(unknown)",
     "feature.light_limit_fix.debug": "Debug",
     "feature.light_limit_fix.debug_feature_enabled": "DEBUG FEATURE - LIGHT LIMIT VISUALISATION ENABLED",
     "feature.light_limit_fix.description": "Light Limit Fix removes the vanilla game's 4-light limit, allowing unlimited dynamic lights in scenes.\nThis dramatically improves lighting quality and enables more realistic illumination scenarios.",

package/SKSE/Plugins/CommunityShaders/Translations/zh_CN.json

@@ -808,43 +808,37 @@
     "feature.key_features": "主要特性：",
     "feature.light_editor.active_shadow_lights": "活跃阴影光源：%u",
     "feature.light_editor.base_object": "基础对象：0x%08X | %s",
-    "feature.light_editor.cell": "单元格：%s",
+    "feature.light_editor.cell": "单元格：0x%08X | %s",
     "feature.light_editor.color": "颜色",
     "feature.light_editor.cutoff": "截止",
     "feature.light_editor.disable_inverse_square_falloff_lights": "禁用平方反比衰减光源",
     "feature.light_editor.disable_regular_falloff_lights": "禁用常规衰减光源",
-    "feature.light_editor.dynamic": "动态",
-    "feature.light_editor.filter_by": "过滤方式",
-    "feature.light_editor.flicker": "闪烁",
-    "feature.light_editor.flicker_slow": "缓慢闪烁",
-    "feature.light_editor.hemi_shadow": "半球阴影",
     "feature.light_editor.intensity": "强度",
-    "feature.light_editor.inverse_square_light": "平方反比光源",
+    "feature.light_editor.inverse_square": "平方反比光源",
     "feature.light_editor.ligh": "LIGH：0x%08X | %s",
     "feature.light_editor.light_flags": "光源标志",
     "feature.light_editor.lights": "光源",
-    "feature.light_editor.linear_light": "线性光源",
+    "feature.light_editor.linear": "线性光源",
     "feature.light_editor.memory_address": "内存地址：%p",
-    "feature.light_editor.negative": "负向",
     "feature.light_editor.ni_light_name": "NiLight名称：%s",
-    "feature.light_editor.omni_shadow": "全向阴影",
     "feature.light_editor.owner": "所有者：0x%08X | %s",
     "feature.light_editor.owner_last_edited_by": "所有者最后编辑者：%s",
-    "feature.light_editor.portal_strict": "传送门严格",
     "feature.light_editor.position_format": "X：%.2f，Y：%.2f，Z：%.2f",
-    "feature.light_editor.position_offset": "位置偏移",
-    "feature.light_editor.pulse": "脉冲",
-    "feature.light_editor.pulse_slow": "缓慢脉冲",
     "feature.light_editor.radius": "半径",
-    "feature.light_editor.revert_changes": "还原更改",
     "feature.light_editor.save_to_light_placer": "保存到Light Placer",
-    "feature.light_editor.save_to_light_placer_tooltip": "将当前设置保存到Light Placer JSON。",
     "feature.light_editor.select_a_light": "选择光源",
     "feature.light_editor.shadows_only": "仅阴影",
     "feature.light_editor.shadows_only_tooltip": "仅显示带有HemiShadow或OmniShadow标志的光源。",
     "feature.light_editor.size": "大小",
-    "feature.light_editor.sort_by": "排序方式",
-    "feature.light_editor.spotlight_not_applicable": "聚光灯：ISL光源类型标志不适用",
+    "feature.light_editor.tes_flag_dynamic": "动态",
+    "feature.light_editor.tes_flag_flicker": "闪烁",
+    "feature.light_editor.tes_flag_flicker_slow": "缓慢闪烁",
+    "feature.light_editor.tes_flag_hemi_shadow": "半球阴影",
+    "feature.light_editor.tes_flag_negative": "负向",
+    "feature.light_editor.tes_flag_omni_shadow": "全向阴影",
+    "feature.light_editor.tes_flag_portal_strict": "传送门严格",
+    "feature.light_editor.tes_flag_pulse": "脉冲",
+    "feature.light_editor.tes_flag_pulse_slow": "缓慢脉冲",
     "feature.light_editor.total_lights": "总光源数：%u",
     "feature.light_limit_fix.debug": "调试",
     "feature.light_limit_fix.debug_feature_enabled": "调试功能 - 光源限制可视化已启用",

src/CSEditor/EditorWindow.cpp

@@ -18,8 +18,9 @@
 #define I18N_KEY_PREFIX "cs_editor."
 
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(EditorWindow::Settings::PaletteColorEntry, r, g, b, useCount, lastUsedTime, isFavorite)
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(EditorWindow::Settings::PaletteValueEntry, name, value, useCount, lastUsedTime, isFavorite)
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(EditorWindow::Settings::PaletteFavoriteColor, hasValue, r, g, b)
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(EditorWindow::Settings, recordMarkers, markedRecords, autoApplyChanges, useTextButtons, enableInheritFromParent, editorUIScale, favoriteWidgets, recentWidgets, maxRecentWidgets, showViewport, widgetTypeSizes, paletteColors, paletteFavorites)
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(EditorWindow::Settings, recordMarkers, markedRecords, autoApplyChanges, useTextButtons, enableInheritFromParent, editorUIScale, favoriteWidgets, recentWidgets, maxRecentWidgets, showViewport, selectedCategory, widgetTypeSizes, paletteColors, paletteValues, paletteFavorites)
 
 void DrawIconStar(ImVec2 center, float radius, ImU32 color, bool filled)
 {
@@ -1558,6 +1559,7 @@ void EditorWindow::SaveAll()
 
 void EditorWindow::SaveSettings()
 {
+	settings.selectedCategory = m_selectedCategory;
 	settings.widgetTypeSizes = GetWidgetTypeSizesJson();
 	j = settings;
 }
@@ -1566,6 +1568,7 @@ void EditorWindow::LoadSettings()
 {
 	if (!j.empty())
 		settings = j;
+	m_selectedCategory = settings.selectedCategory;
 	SetWidgetTypeSizesFromJson(settings.widgetTypeSizes);
 }
 
@@ -2107,8 +2110,12 @@ void EditorWindow::AdjustFlySpeed(float scrollDelta)
 	RE::Console::ExecuteCommand(std::format("sucsm {:.0f}", flySpeed).c_str());
 }
 
-bool EditorWindow::ShouldHandleEscapeKey() const
+bool EditorWindow::ShouldHandleEscapeKey()
 {
+	if (suppressNextEditorEscape) {
+		suppressNextEditorEscape = false;
+		return false;
+	}
 	return !ImGui::IsPopupOpen("", ImGuiPopupFlags_AnyPopupId | ImGuiPopupFlags_AnyPopupLevel);
 }