Skip to content

chore(Linear Lighting): separate directional light multiplier sliders #1730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doodlum merged 1 commit into from
Jan 17, 2026
Merged

chore(Linear Lighting): separate directional light multiplier sliders #1730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions src/Features/LinearLighting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(
grassSpecularMult,
vanillaDiffuseColorMult,
lightMult,
directionalLightMult,
directionalLightMultExterior,
directionalLightMultInterior,
pointLightMult,
emitColorMult,
glowmapMult,
Expand Down Expand Up @@ -58,7 +59,8 @@ void LinearLighting::DrawSettings()
ImGui::SliderFloat("Grass Specular Multiplier", &settings.grassSpecularMult, 0.0f, 10.0f, "%.2f");
ImGui::SliderFloat("Vanilla Diffuse Color Multiplier", &settings.vanillaDiffuseColorMult, 0.0f, 10.0f, "%.2f");
ImGui::SliderFloat("Light Multiplier", &settings.lightMult, 0.0f, 10.0f, "%.2f");
ImGui::SliderFloat("Directional Light Multiplier", &settings.directionalLightMult, 0.0f, 10.0f, "%.2f");
ImGui::SliderFloat("Exterior Directional Light Multiplier", &settings.directionalLightMultExterior, 0.0f, 10.0f, "%.2f");
ImGui::SliderFloat("Interior Directional Light Multiplier", &settings.directionalLightMultInterior, 0.0f, 10.0f, "%.2f");
ImGui::SliderFloat("Point Light Multiplier", &settings.pointLightMult, 0.0f, 10.0f, "%.2f");
ImGui::SliderFloat("Emissive Color Multiplier", &settings.emitColorMult, 0.0f, 10.0f, "%.2f");
ImGui::SliderFloat("Glowmap Multiplier", &settings.glowmapMult, 0.0f, 10.0f, "%.2f");
Expand Down Expand Up @@ -157,7 +159,7 @@ LinearLighting::PerFrameData LinearLighting::GetCommonBufferData()
data.grassSpecularMult = settings.grassSpecularMult;
data.vanillaDiffuseColorMult = settings.vanillaDiffuseColorMult;
data.lightMult = settings.lightMult;
data.directionalLightMult = settings.directionalLightMult;
data.directionalLightMult = Util::IsInterior() ? settings.directionalLightMultInterior : settings.directionalLightMultExterior;
data.pointLightMult = settings.pointLightMult;
data.emitColorMult = settings.emitColorMult;
data.glowmapMult = settings.glowmapMult;
Expand Down
5 changes: 3 additions & 2 deletions src/Features/LinearLighting.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ struct LinearLighting : Feature
float grassSpecularMult = 0.32f;
float vanillaDiffuseColorMult = 1.5f;
float lightMult = 1.0f;
float directionalLightMult = 1.0f;
float directionalLightMultExterior = 1.0f;
float directionalLightMultInterior = 1.0f;
float pointLightMult = 1.0f;
float emitColorMult = 1.0f;
float glowmapMult = 0.5f;
Expand Down Expand Up @@ -86,7 +87,7 @@ struct LinearLighting : Feature
float grassSpecularMult;
float vanillaDiffuseColorMult;
float lightMult;
float directionalLightMult;
float directionalLightMult; // Computed based on interior/exterior
float pointLightMult;
float emitColorMult;
float glowmapMult;
Expand Down