From 89b9a5c1fe88e9092736458aab6c030d11e9d279 Mon Sep 17 00:00:00 2001 From: MetalSage <74924875+MetalSage@users.noreply.github.com> Date: Sun, 12 Jan 2025 14:33:06 +0400 Subject: [PATCH] Additive lighting (#685) * Additive lighting * adds options for all your optional needs * one last tiny adjustment before we hit the create pr button * spaghetti condensing * add ccvar * overlight correction * fix requested changes * cvar fix * last fix * nice --------- Co-authored-by: deathride58 Co-authored-by: MetalSage Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Ed --- Content.Client/Entry/EntryPoint.cs | 2 + .../_CP14/Options/CP14OptionsMenuMainTab.xaml | 11 +-- .../Options/CP14OptionsMenuMainTab.xaml.cs | 1 + .../_CP14/Overlays/BasePostProcessOverlay.cs | 77 +++++++++++++++++++ .../_CP14/Configuration/CP14ConfigVars.cs | 8 ++ .../_CP14/escape-menu/ui/options-menu.ftl | 10 ++- .../_CP14/escape-menu/ui/options-menu.ftl | 10 ++- Resources/Prototypes/Shaders/shaders.yml | 2 +- .../Structures/Furniture/lamppost.yml | 2 +- .../Structures/Furniture/wallmount.yml | 2 +- .../Structures/Furniture/wallmount_lamp.yml | 2 +- .../Prototypes/_CP14/Shaders/shaders.yml | 19 ++++- .../_CP14/Shaders/base_postprocess.swsl | 34 ++++++++ 13 files changed, 168 insertions(+), 12 deletions(-) create mode 100644 Content.Client/_CP14/Overlays/BasePostProcessOverlay.cs create mode 100644 Resources/Textures/_CP14/Shaders/base_postprocess.swsl diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index 3bd85af225..cb05916ee0 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -12,6 +12,7 @@ using Content.Client.IoC; using Content.Client.Launcher; using Content.Client.Lobby; using Content.Client.MainMenu; +using Content.Client.Overlays; using Content.Client.Parallax.Managers; using Content.Client.Players.PlayTimeTracking; using Content.Client.Radiation.Overlays; @@ -159,6 +160,7 @@ namespace Content.Client.Entry _parallaxManager.LoadDefaultParallax(); + _overlayManager.AddOverlay(new CP14BasePostProcessOverlay()); // CP14-PostProcess _overlayManager.AddOverlay(new SingularityOverlay()); _overlayManager.AddOverlay(new RadiationPulseOverlay()); _chatManager.Initialize(); diff --git a/Content.Client/_CP14/Options/CP14OptionsMenuMainTab.xaml b/Content.Client/_CP14/Options/CP14OptionsMenuMainTab.xaml index 597073e510..c6604f1b45 100644 --- a/Content.Client/_CP14/Options/CP14OptionsMenuMainTab.xaml +++ b/Content.Client/_CP14/Options/CP14OptionsMenuMainTab.xaml @@ -16,11 +16,12 @@