Skip to content

feat(lod): add gamma sliders #1588

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
Nov 16, 2025
Merged

feat(lod): add gamma sliders #1588

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
4 changes: 4 additions & 0 deletions package/Shaders/Common/SharedData.hlsli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@ namespace SharedData
float LODObjectBrightness;
float LODObjectSnowBrightness;
bool DisableTerrainVertexColors;
float LODTerrainGamma;
float LODObjectGamma;
float LODObjectSnowGamma;
float pad0;
};

struct HairSpecularSettings
Expand Down
8 changes: 4 additions & 4 deletions package/Shaders/Lighting.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1829,7 +1829,7 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace : SV_IsFrontFace)

# if defined(LOD_BLENDING)
# if defined(LODOBJECTS) || defined(LODOBJECTSHD)
baseColor.xyz *= SharedData::lodBlendingSettings.LODObjectBrightness;
baseColor.xyz = pow(abs(baseColor.xyz), SharedData::lodBlendingSettings.LODObjectGamma) * SharedData::lodBlendingSettings.LODObjectBrightness;
# elif defined(LODLANDSCAPE)
// First apply terrain variation if enabled
# if defined(TERRAIN_VARIATION)
Expand All @@ -1843,7 +1843,7 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace : SV_IsFrontFace)
baseColor.xyz = Color::Diffuse(lodStochasticColor.rgb);
}
# endif
baseColor.xyz *= SharedData::lodBlendingSettings.LODTerrainBrightness;
baseColor.xyz = pow(abs(baseColor.xyz), SharedData::lodBlendingSettings.LODTerrainGamma) * SharedData::lodBlendingSettings.LODTerrainBrightness;
# endif
# endif // LOD_BLENDING

Expand Down Expand Up @@ -1945,7 +1945,7 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace : SV_IsFrontFace)
# endif

# if defined(LOD_BLENDING)
lodLandColor.xyz *= SharedData::lodBlendingSettings.LODTerrainBrightness;
lodLandColor.xyz = pow(abs(lodLandColor.xyz), SharedData::lodBlendingSettings.LODTerrainGamma) * SharedData::lodBlendingSettings.LODTerrainBrightness;
# endif // LOD_BLENDING
float lodBlendParameter = GetLodLandBlendParameter(lodLandColor.xyz);
float lodBlendMask = TexLandLodBlend2Sampler.Sample(SampLandLodBlend2Sampler, 3.0.xx * input.TexCoord0.zw).x;
Expand Down Expand Up @@ -2042,7 +2042,7 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace : SV_IsFrontFace)
}
glintParameters = lerp(glintParameters, projectedGlintParameters, projectedMaterialWeight);
# elif defined(LOD_BLENDING) && (defined(LODOBJECTS) || defined(LODOBJECTSHD))
projBaseColor.xyz *= SharedData::lodBlendingSettings.LODObjectSnowBrightness;
projBaseColor.xyz = pow(abs(projBaseColor.xyz), SharedData::lodBlendingSettings.LODObjectSnowGamma) * SharedData::lodBlendingSettings.LODObjectSnowBrightness;
# endif // TRUE_PBR
normal.xyz = lerp(normal.xyz, finalProjNormal, projectedMaterialWeight);
baseColor.xyz = lerp(baseColor.xyz, projBaseColor, projectedMaterialWeight);
Expand Down
14 changes: 10 additions & 4 deletions src/Features/LODBlending.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,19 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(
LODTerrainBrightness,
LODObjectBrightness,
LODObjectSnowBrightness,
DisableTerrainVertexColors)
DisableTerrainVertexColors,
LODTerrainGamma,
LODObjectGamma,
LODObjectSnowGamma)

void LODBlending::DrawSettings()
{
ImGui::SliderFloat("LOD Terrain Brightness", &settings.LODTerrainBrightness, 0.01f, 2.f, "%.2f");
ImGui::SliderFloat("LOD Object Brightness", &settings.LODObjectBrightness, 0.01f, 2.f, "%.2f");
ImGui::SliderFloat("LOD Object Snow Brightness", &settings.LODObjectSnowBrightness, 0.01f, 2.f, "%.2f");
ImGui::SliderFloat("LOD Terrain Brightness", &settings.LODTerrainBrightness, 0.01f, 5.f, "%.2f");
ImGui::SliderFloat("LOD Object Brightness", &settings.LODObjectBrightness, 0.01f, 5.f, "%.2f");
ImGui::SliderFloat("LOD Object Snow Brightness", &settings.LODObjectSnowBrightness, 0.01f, 5.f, "%.2f");
ImGui::SliderFloat("LOD Terrain Gamma", &settings.LODTerrainGamma, 0.1f, 3.f, "%.2f");
ImGui::SliderFloat("LOD Object Gamma", &settings.LODObjectGamma, 0.1f, 3.f, "%.2f");
ImGui::SliderFloat("LOD Object Snow Gamma", &settings.LODObjectSnowGamma, 0.1f, 3.f, "%.2f");
ImGui::Checkbox("Disable Terrain Vertex Colors", (bool*)&settings.DisableTerrainVertexColors);
if (auto _tt = Util::HoverTooltipWrapper()) {
ImGui::Text(
Expand Down
4 changes: 4 additions & 0 deletions src/Features/LODBlending.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ struct LODBlending : Feature
float LODObjectBrightness = 1;
float LODObjectSnowBrightness = 1;
uint DisableTerrainVertexColors = false;
float LODTerrainGamma = 1;
float LODObjectGamma = 1;
float LODObjectSnowGamma = 1;
float pad;
};

Settings settings;
Expand Down