Skip to content

feat(linear lighting): add ambient multiplier #1805

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
alandtse merged 1 commit into from
Feb 3, 2026
Merged

feat(linear lighting): add ambient multiplier #1805

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
2 changes: 1 addition & 1 deletion package/Shaders/Common/Color.hlsli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ namespace Color

float3 Ambient(float3 color)
{
return ENABLE_LL ? pow(abs(color), SharedData::linearLightingSettings.ambientGamma) : color;
return ENABLE_LL ? pow(abs(color), SharedData::linearLightingSettings.ambientGamma) * SharedData::linearLightingSettings.ambientMult : color;
}

float3 Fog(float3 color)
Expand Down
2 changes: 1 addition & 1 deletion package/Shaders/Common/SharedData.hlsli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ namespace SharedData
float vanillaDiffuseColorMult;
float directionalLightMult;
float pointLightMult;
float ambientMult;
float emitColorMult;
float glowmapMult;
float effectLightingMult;
Expand All @@ -229,7 +230,6 @@ namespace SharedData
float projectedEffectMult;
float deferredEffectMult;
float otherEffectMult;
float pad0;
};

struct TerrainBlendingSettings
Expand Down
3 changes: 3 additions & 0 deletions src/Features/LinearLighting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(
directionalLightMultExterior,
directionalLightMultInterior,
pointLightMult,
ambientMult,
emitColorMult,
glowmapMult,
effectLightingMult,
Expand All @@ -46,6 +47,7 @@ void LinearLighting::DrawSettings()
ImGui::SeparatorText("Multipliers");
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("Ambient Multiplier", &settings.ambientMult, 0.0f, 10.0f, "%.2f");
ImGui::SliderFloat("Glowmap Multiplier", &settings.glowmapMult, 0.0f, 10.0f, "%.2f");

ImGui::EndTabItem();
Expand Down Expand Up @@ -164,6 +166,7 @@ LinearLighting::PerFrameData LinearLighting::GetCommonBufferData()
data.vanillaDiffuseColorMult = settings.vanillaDiffuseColorMult;
data.directionalLightMult = Util::IsInterior() ? settings.directionalLightMultInterior : settings.directionalLightMultExterior;
data.pointLightMult = settings.pointLightMult;
data.ambientMult = settings.ambientMult;
data.emitColorMult = settings.emitColorMult;
data.glowmapMult = settings.glowmapMult;
data.effectLightingMult = settings.effectLightingMult;
Expand Down
3 changes: 2 additions & 1 deletion src/Features/LinearLighting.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ struct LinearLighting : Feature
float directionalLightMultExterior = 1.0f;
float directionalLightMultInterior = 1.0f;
float pointLightMult = 1.0f;
float ambientMult = 0.67f;
float emitColorMult = 1.0f;
float glowmapMult = 0.5f;

Expand Down Expand Up @@ -79,6 +80,7 @@ struct LinearLighting : Feature
float vanillaDiffuseColorMult;
float directionalLightMult; // Computed based on interior/exterior
float pointLightMult;
float ambientMult;
float emitColorMult;
float glowmapMult;
float effectLightingMult;
Expand All @@ -87,7 +89,6 @@ struct LinearLighting : Feature
float projectedEffectMult;
float deferredEffectMult;
float otherEffectMult;
float pad0;
};

struct alignas(16) PerGeometryData
Expand Down