Skip to content

Commit

Permalink
Merge pull request #62 from spiralhalo/configurability
Browse files Browse the repository at this point in the history
Configurability
  • Loading branch information
spiralhalo authored Oct 18, 2021
2 parents 16e217b + f2f810a commit b5111af
Show file tree
Hide file tree
Showing 18 changed files with 627 additions and 445 deletions.
176 changes: 104 additions & 72 deletions assets/lumi/lang/en_us.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions assets/lumi/pipeline/config.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
include: [
"lumi:pipeline/config/lighting_config.json",
"lumi:pipeline/config/optics_config.json",
"lumi:pipeline/config/environment_config.json",
"lumi:pipeline/config/aesthetics_config.json",
"lumi:pipeline/config/performance_config.json",
"lumi:pipeline/config/gameplay_config.json",
"lumi:pipeline/config/fog_config.json",
"lumi:pipeline/config/experimental_config.json",
]
}
63 changes: 1 addition & 62 deletions assets/lumi/pipeline/config/aesthetics_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,67 +4,6 @@
includeToken: "lumi:aesthetics_config",
categoryKey: "config.lumi_lights.category.aesthetics",
options: {
tone_profile: {
default: "standard",
choices: ["standard", "high_contrast"],
enum: true,
prefix: "tone_profile_",
nameKey: "config.lumi_lights.value.tone_profile",
descriptionKey: "config.lumi_lights.help.tone_profile"
},
block_light_mode: {
default: "warm",
choices: ["warm", "neutral"],
enum: true,
prefix: "block_light_mode_",
nameKey: "config.lumi_lights.value.block_light_mode",
descriptionKey: "config.lumi_lights.help.block_light_mode"
},
outdoors_brightness: {
default: 10,
min: 10,
max: 50,
nameKey: "config.lumi_lights.value.outdoors_brightness",
descriptionKey: "config.lumi_lights.help.outdoors_brightness"
},
bloom_intensity: {
default: 20,
min: 1,
max: 40,
nameKey: "config.lumi_lights.value.bloom_intensity",
descriptionKey: "config.lumi_lights.help.bloom_intensity"
},
bloom_scale: {
default: 25,
min: 3,
max: 50,
nameKey: "config.lumi_lights.value.bloom_scale",
descriptionKey: "config.lumi_lights.help.bloom_scale"
},
sky_mode: {
default: "lumi",
choices: ["vanilla", "vanilla_starry", "lumi"],
enum: true,
prefix: "sky_mode_",
nameKey: "config.lumi_lights.value.sky_mode",
descriptionKey: "config.lumi_lights.help.sky_mode"
},
lumi_sky_color: {
default: "natural_azure",
choices: ["natural_azure", "bright_cyan", "deep_cerulean"],
enum: true,
prefix: "lumi_sky_color_",
nameKey: "config.lumi_lights.value.lumi_sky_color",
descriptionKey: "config.lumi_lights.help.lumi_sky_color"
},
water_color: {
default: "natural",
choices: ["natural_blue", "vanilla", "no_texture", "no_color"],
enum: true,
prefix: "water_color_",
nameKey: "config.lumi_lights.value.water_color",
descriptionKey: "config.lumi_lights.help.water_color"
},
glint_mode: {
default: "glint_texture",
choices: ["glint_texture", "glint_shader"],
Expand Down Expand Up @@ -108,6 +47,6 @@
descriptionKey: "config.lumi_lights.help.toon_outline"
},
}
}
},
],
}
190 changes: 190 additions & 0 deletions assets/lumi/pipeline/config/environment_config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
{
options: [
{
includeToken: "lumi:sky_config",
categoryKey: "config.lumi_lights.category.sky",
options: {
sky_mode: {
default: "lumi",
choices: ["vanilla", "vanilla_starry", "lumi"],
enum: true,
prefix: "sky_mode_",
nameKey: "config.lumi_lights.value.sky_mode",
descriptionKey: "config.lumi_lights.help.sky_mode"
},
lumi_sky_color: {
default: "natural_azure",
choices: ["natural_azure", "bright_cyan", "deep_cerulean", "custom"],
enum: true,
prefix: "lumi_sky_color_",
nameKey: "config.lumi_lights.value.lumi_sky_color",
descriptionKey: "config.lumi_lights.help.lumi_sky_color"
},
lumi_sky_red: {
default: 0.375,
min: 0.0,
max: 1.0,
nameKey: "config.lumi_lights.value.lumi_sky_red",
descriptionKey: "config.lumi_lights.help.lumi_sky_red"
},
lumi_sky_green: {
default: 0.55,
min: 0.0,
max: 1.0,
nameKey: "config.lumi_lights.value.lumi_sky_green",
descriptionKey: "config.lumi_lights.help.lumi_sky_green"
},
lumi_sky_blue: {
default: 0.75,
min: 0.0,
max: 1.0,
nameKey: "config.lumi_lights.value.lumi_sky_blue",
descriptionKey: "config.lumi_lights.help.lumi_sky_blue"
},
lumi_star_size: {
default: 10,
min: 0,
max: 20,
nameKey: "config.lumi_lights.value.lumi_star_size",
descriptionKey: "config.lumi_lights.help.lumi_star_size"
},
lumi_star_density: {
default: 10,
min: 0,
max: 20,
nameKey: "config.lumi_lights.value.lumi_star_density",
descriptionKey: "config.lumi_lights.help.lumi_star_density"
},
lumi_star_brightness: {
default: 10,
min: 0,
max: 20,
nameKey: "config.lumi_lights.value.lumi_star_brightness",
descriptionKey: "config.lumi_lights.help.lumi_star_brightness"
},
}
},
{
includeToken: "lumi:clouds_config",
categoryKey: "config.lumi_lights.category.clouds",
options: {
cloud_rendering: {
default: "volumetric",
choices: ["vanilla", "flat", "parallax", "volumetric"],
enum: true,
prefix: "cloud_rendering_",
nameKey: "config.lumi_lights.value.cloud_rendering",
descriptionKey: "config.lumi_lights.help.cloud_rendering"
},
parallax_cloud_altitude: {
default: 100,
min: 0,
max: 1000,
nameKey: "config.lumi_lights.value.parallax_cloud_altitude",
descriptionKey: "config.lumi_lights.help.parallax_cloud_altitude"
},
parallax_cloud_thickness: {
default: 40,
min: 0,
max: 1000,
nameKey: "config.lumi_lights.value.parallax_cloud_thickness",
descriptionKey: "config.lumi_lights.help.parallax_cloud_thickness"
},
volumetric_cloud_altitude: {
default: 110,
min: 0,
max: 1000,
nameKey: "config.lumi_lights.value.volumetric_cloud_altitude",
descriptionKey: "config.lumi_lights.help.volumetric_cloud_altitude"
},
volumetric_cloud_mode: {
default: "skybox",
choices: ["skybox", "world"],
enum: true,
prefix: "volumetric_cloud_mode_",
nameKey: "config.lumi_lights.value.volumetric_cloud_mode",
descriptionKey: "config.lumi_lights.help.volumetric_cloud_mode"
},
cloud_coverage_relative: {
default: 5,
min: 0,
max: 10,
nameKey: "config.lumi_lights.value.cloud_coverage_relative",
descriptionKey: "config.lumi_lights.help.cloud_coverage_relative"
},
cloud_puffiness_relative: {
default: 5,
min: 0,
max: 10,
nameKey: "config.lumi_lights.value.cloud_puffiness_relative",
descriptionKey: "config.lumi_lights.help.cloud_puffiness_relative"
},
volumetric_cloud_ultrapuff: {
default: false,
nameKey: "config.lumi_lights.value.volumetric_cloud_ultrapuff",
descriptionKey: "config.lumi_lights.help.volumetric_cloud_ultrapuff"
},
raincloud_canopy: {
default: 4,
min: 0,
max: 10,
nameKey: "config.lumi_lights.value.raincloud_canopy",
descriptionKey: "config.lumi_lights.help.raincloud_canopy"
},
}
},
{
includeToken: "lumi:fog_config",
categoryKey: "config.lumi_lights.category.fog",
options: {
fog_far_chunks: {
default: 8,
min: 4,
max: 32,
nameKey: "config.lumi_lights.value.fog_far_chunks",
descriptionKey: "config.lumi_lights.help.fog_far_chunks"
},
fog_density_relative: {
default: 10,
min: 0,
max: 20,
nameKey: "config.lumi_lights.value.fog_density_relative",
descriptionKey: "config.lumi_lights.help.fog_density_relative"
},
underwater_fog_far_chunks: {
default: 1,
min: 0,
max: 4,
nameKey: "config.lumi_lights.value.underwater_fog_far_chunks",
descriptionKey: "config.lumi_lights.help.underwater_fog_far_chunks"
},
underwater_fog_density_relative: {
default: 15,
min: 0,
max: 20,
nameKey: "config.lumi_lights.value.underwater_fog_density_relative",
descriptionKey: "config.lumi_lights.help.underwater_fog_density_relative"
}
}
},
{
includeToken: "lumi:water_config",
categoryKey: "config.lumi_lights.category.water",
options: {
water_color: {
default: "natural",
choices: ["natural_blue", "vanilla", "no_texture", "no_color"],
enum: true,
prefix: "water_color_",
nameKey: "config.lumi_lights.value.water_color",
descriptionKey: "config.lumi_lights.help.water_color"
},
water_caustics: {
default: true,
nameKey: "config.lumi_lights.value.water_caustics",
descriptionKey: "config.lumi_lights.help.water_caustics"
},
}
}
]
}
18 changes: 17 additions & 1 deletion assets/lumi/pipeline/config/experimental_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,29 @@
descriptionKey: "config.lumi_lights.help.rain_puddles"
},
exposure_func: {
default: "median",
default: "average",
choices: ["median", "average"],
enum: true,
prefix: "exposure_func_",
nameKey: "config.lumi_lights.value.exposure_func",
descriptionKey: "config.lumi_lights.help.exposure_func"
},
blocklight_specular_mode: {
default: "fancy",
choices: ["fast", "fancy"],
enum: true,
prefix: "blocklight_specular_mode_",
nameKey: "config.lumi_lights.value.blocklight_specular_mode",
descriptionKey: "config.lumi_lights.help.blocklight_specular_mode"
},
antialiasing: {
default: "taa",
choices: ["none", "taa", "taa_blurry"],
enum: true,
prefix: "antialiasing_",
nameKey: "config.lumi_lights.value.antialiasing",
descriptionKey: "config.lumi_lights.help.antialiasing"
},
}
},
{
Expand Down
38 changes: 0 additions & 38 deletions assets/lumi/pipeline/config/fog_config.json

This file was deleted.

37 changes: 0 additions & 37 deletions assets/lumi/pipeline/config/gameplay_config.json

This file was deleted.

Loading

0 comments on commit b5111af

Please sign in to comment.