mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
Lamp Bloom, Exposure and Glare (#24534)
* Light Update * Not failing tests I hope * Whitespace Removal * Tweaking here and there * Merge Conflict Fix * Rebuild TGUI Bundle to Fix Merge Conflict * Settings are now in "Game Preferences" too * ColorMatrix formatting and removal of unused procs * A little mistake on matrices * A little mistake x2 (last I hope) * Moving Glare under every other effect, tweaking values, playing with blending * Update TGUI Bundle for Merge Conflict * Apply suggestions from code reviews * Fuck it, it just works * No tabs cool * Remove unused * Am I retarded * We better return * Whitespace we need * oh * New SQL update version * Missing comma fix and recompiled tgui.bundle * Updating SQL version in misc_defines and config * Remove datum in holder * BloomEdit empty lines removal * No more unneeded functions calls * Tgui.bundle rebuild * SQL Changes * SQL Version = 56 now * Documentation and some formatting * tgui.bundle.js rebuild * Remove unused layers and variables * Allow cameras to render backdrops * Possible runtime issue fix * Remove "baked" bloom from the lamps * Revert the "remove". Make it low on alpha channel * Shuttle rotation light update fix * We don't need this * Possible runtime issue fix x2 * tgui.bundle.js update * tgui.bundle.js update * tgui.bundle.js update * Revert config.toml changes * Revert the revertion of config.toml changes * Bring that config changes back! * Entry added * tgui.bundle.js update * Prettier possible fix (?) * Runtime fix (and broken tubes now have light after reinstalling them) * config update --------- Co-authored-by: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com>
This commit is contained in:
co-authored by
Mikhail Dzianishchyts
parent
97eb823d4e
commit
e386cfd9bf
@@ -22,6 +22,8 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
|
||||
var/datum/configuration_section/gamemode_configuration/gamemode
|
||||
/// Holder for the general configuration datum
|
||||
var/datum/configuration_section/general_configuration/general
|
||||
/// Holder for the lighting effects configuration datum
|
||||
var/datum/configuration_section/lighting_effects_configuration/lighting_effects
|
||||
/// Holder for the IPIntel configuration datum
|
||||
var/datum/configuration_section/ipintel_configuration/ipintel
|
||||
/// Holder for the job configuration datum
|
||||
@@ -82,6 +84,7 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
|
||||
event = new()
|
||||
gamemode = new()
|
||||
general = new()
|
||||
lighting_effects = new()
|
||||
ipintel = new()
|
||||
jobs = new()
|
||||
logging = new()
|
||||
@@ -120,6 +123,7 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
|
||||
safe_load(event, "event_configuration")
|
||||
safe_load(gamemode, "gamemode_configuration")
|
||||
safe_load(general, "general_configuration")
|
||||
safe_load(lighting_effects, "lighting_effects_configuration")
|
||||
safe_load(ipintel, "ipintel_configuration")
|
||||
safe_load(jobs, "job_configuration")
|
||||
safe_load(logging, "logging_configuration")
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
/// Config holder for all ligting effect related things
|
||||
/datum/configuration_section/lighting_effects_configuration
|
||||
/// Brightness of bloom effect independent of light_power
|
||||
var/glow_brightness_base = 0
|
||||
/// Brightness of bloom effect that depends on light_power
|
||||
var/glow_brightness_power = -0.25
|
||||
/// Contrast of bloom effect independent of light_power
|
||||
var/glow_contrast_base = 0
|
||||
/// Contrast of bloom effect that depends on light_power
|
||||
var/glow_contrast_power = 0.5
|
||||
/// Brightness of exposure effect independent of light_power
|
||||
var/exposure_brightness_base = 0.01
|
||||
/// Brightness of exposure effect that depends on light_power
|
||||
var/exposure_brightness_power = 0
|
||||
/// Contrast of exposure effect independent of light_power
|
||||
var/exposure_contrast_base = 9.5
|
||||
/// Contrast of exposure effect that depends on light_power
|
||||
var/exposure_contrast_power = 0
|
||||
|
||||
/datum/configuration_section/lighting_effects_configuration/load_data(list/data)
|
||||
// Use the load wrappers here. That way the default isnt made 'null' if you comment out the config line
|
||||
CONFIG_LOAD_NUM(glow_brightness_base, data["glow_brightness_base"])
|
||||
CONFIG_LOAD_NUM(glow_brightness_power, data["glow_brightness_power"])
|
||||
CONFIG_LOAD_NUM(glow_contrast_base, data["glow_contrast_base"])
|
||||
CONFIG_LOAD_NUM(glow_contrast_power, data["glow_contrast_power"])
|
||||
CONFIG_LOAD_NUM(exposure_brightness_base, data["exposure_brightness_base"])
|
||||
CONFIG_LOAD_NUM(exposure_brightness_power, data["exposure_brightness_power"])
|
||||
CONFIG_LOAD_NUM(exposure_contrast_base, data["exposure_contrast_base"])
|
||||
CONFIG_LOAD_NUM(exposure_contrast_power, data["exposure_contrast_power"])
|
||||
Reference in New Issue
Block a user