Add geometry detail to the graphics presets

This commit is contained in:
Alayan 2024-05-07 18:27:15 +02:00
parent e83fdc9324
commit 8dbf0a9922
No known key found for this signature in database
2 changed files with 39 additions and 18 deletions

View File

@ -43,7 +43,7 @@ void OptionsScreenVideo::initPresets()
false /* light */, 0 /* shadow */, false /* bloom */, false /* lightshaft */, false /* light */, 0 /* shadow */, false /* bloom */, false /* lightshaft */,
false /* glow */, false /* mlaa */, false /* ssao */, false /* light scatter */, false /* glow */, false /* mlaa */, false /* ssao */, false /* light scatter */,
false /* animatedCharacters */, 1 /* particles */, 0 /* image_quality */, false /* animatedCharacters */, 1 /* particles */, 0 /* image_quality */,
true /* degraded IBL */ true /* degraded IBL */, 0 /* Geometry Detail */
}); });
m_presets.push_back // Level 2 m_presets.push_back // Level 2
@ -51,7 +51,7 @@ void OptionsScreenVideo::initPresets()
false /* light */, 0 /* shadow */, false /* bloom */, false /* lightshaft */, false /* light */, 0 /* shadow */, false /* bloom */, false /* lightshaft */,
false /* glow */, false /* mlaa */, false /* ssao */, false /* light scatter */, false /* glow */, false /* mlaa */, false /* ssao */, false /* light scatter */,
true /* animatedCharacters */, 2 /* particles */, 0 /* image_quality */, true /* animatedCharacters */, 2 /* particles */, 0 /* image_quality */,
true /* degraded IBL */ true /* degraded IBL */, 1 /* Geometry Detail */
}); });
m_presets.push_back // Level 3 m_presets.push_back // Level 3
@ -59,7 +59,7 @@ void OptionsScreenVideo::initPresets()
true /* light */, 0 /* shadow */, false /* bloom */, false /* lightshaft */, true /* light */, 0 /* shadow */, false /* bloom */, false /* lightshaft */,
false /* glow */, false /* mlaa */, false /* ssao */, false /* light scatter */, false /* glow */, false /* mlaa */, false /* ssao */, false /* light scatter */,
true /* animatedCharacters */, 2 /* particles */, 1 /* image_quality */, true /* animatedCharacters */, 2 /* particles */, 1 /* image_quality */,
true /* degraded IBL */ true /* degraded IBL */, 2 /* Geometry Detail */
}); });
m_presets.push_back // Level 4 m_presets.push_back // Level 4
@ -67,7 +67,7 @@ void OptionsScreenVideo::initPresets()
true /* light */, 0 /* shadow */, false /* bloom */, true /* lightshaft */, true /* light */, 0 /* shadow */, false /* bloom */, true /* lightshaft */,
true /* glow */, true /* mlaa */, false /* ssao */, true /* light scatter */, true /* glow */, true /* mlaa */, false /* ssao */, true /* light scatter */,
true /* animatedCharacters */, 2 /* particles */, 1 /* image_quality */, true /* animatedCharacters */, 2 /* particles */, 1 /* image_quality */,
false /* degraded IBL */ false /* degraded IBL */, 3 /* Geometry Detail */
}); });
m_presets.push_back // Level 5 m_presets.push_back // Level 5
@ -75,7 +75,7 @@ void OptionsScreenVideo::initPresets()
true /* light */, 512 /* shadow */, true /* bloom */, true /* lightshaft */, true /* light */, 512 /* shadow */, true /* bloom */, true /* lightshaft */,
true /* glow */, true /* mlaa */, false /* ssao */, true /* light scatter */, true /* glow */, true /* mlaa */, false /* ssao */, true /* light scatter */,
true /* animatedCharacters */, 2 /* particles */, 2 /* image_quality */, true /* animatedCharacters */, 2 /* particles */, 2 /* image_quality */,
false /* degraded IBL */ false /* degraded IBL */, 3 /* Geometry Detail */
}); });
m_presets.push_back // Level 6 m_presets.push_back // Level 6
@ -83,7 +83,7 @@ void OptionsScreenVideo::initPresets()
true /* light */, 1024 /* shadow */, true /* bloom */, true /* lightshaft */, true /* light */, 1024 /* shadow */, true /* bloom */, true /* lightshaft */,
true /* glow */, true /* mlaa */, true /* ssao */, true /* light scatter */, true /* glow */, true /* mlaa */, true /* ssao */, true /* light scatter */,
true /* animatedCharacters */, 2 /* particles */, 2 /* image_quality */, true /* animatedCharacters */, 2 /* particles */, 2 /* image_quality */,
false /* degraded IBL */ false /* degraded IBL */, 4 /* Geometry Detail */
}); });
m_blur_presets.push_back m_blur_presets.push_back
@ -326,7 +326,10 @@ void OptionsScreenVideo::updateGfxSlider()
m_presets[l].shadows == UserConfigParams::m_shadows_resolution && m_presets[l].shadows == UserConfigParams::m_shadows_resolution &&
m_presets[l].ssao == UserConfigParams::m_ssao && m_presets[l].ssao == UserConfigParams::m_ssao &&
m_presets[l].light_scatter == UserConfigParams::m_light_scatter && m_presets[l].light_scatter == UserConfigParams::m_light_scatter &&
m_presets[l].degraded_ibl == UserConfigParams::m_degraded_IBL) m_presets[l].degraded_ibl == UserConfigParams::m_degraded_IBL &&
m_presets[l].geometry_detail == (UserConfigParams::m_geometry_level == 0 ? 2 :
UserConfigParams::m_geometry_level == 2 ? 0 :
UserConfigParams::m_geometry_level))
{ {
gfx->setValue(l + 1); gfx->setValue(l + 1);
found = true; found = true;
@ -426,14 +429,17 @@ void OptionsScreenVideo::updateTooltip()
const core::stringw important_only = _("Important only"); const core::stringw important_only = _("Important only");
//I18N: in the graphical options tooltip; //I18N: in the graphical options tooltip;
// indicates the rendered image quality is very low
const core::stringw very_low = _("Very Low"); const core::stringw very_low = _("Very Low");
//I18N: in the graphical options tooltip; //I18N: in the graphical options tooltip;
// indicates the rendered image quality is low
const core::stringw low = _("Low"); const core::stringw low = _("Low");
//I18N: in the graphical options tooltip; //I18N: in the graphical options tooltip;
// indicates the rendered image quality is high const core::stringw medium = _("Medium");
//I18N: in the graphical options tooltip;
const core::stringw high = _("High"); const core::stringw high = _("High");
//I18N: in the graphical options tooltip;
const core::stringw very_high = _("Very High");
//I18N: in the graphical options tooltip;
const core::stringw ultra = _("Ultra");
//I18N: in graphical options //I18N: in graphical options
tooltip = _("Particles Effects: %s", tooltip = _("Particles Effects: %s",
@ -479,6 +485,17 @@ void OptionsScreenVideo::updateTooltip()
tooltip = tooltip + L"\n" + _("Rendered image quality: %s", tooltip = tooltip + L"\n" + _("Rendered image quality: %s",
quality == 0 ? very_low : quality == 1 ? low : high); quality == 0 ? very_low : quality == 1 ? low : high);
//I18N: in graphical options
int geometry_detail = (UserConfigParams::m_geometry_level == 0 ? 2 :
UserConfigParams::m_geometry_level == 2 ? 0 :
UserConfigParams::m_geometry_level);
tooltip = tooltip + L"\n" + _("Geometry detail: %s",
geometry_detail == 0 ? very_low :
geometry_detail == 1 ? low :
geometry_detail == 2 ? medium :
geometry_detail == 3 ? high :
geometry_detail == 4 ? very_high : ultra);
gfx->setTooltip(tooltip); gfx->setTooltip(tooltip);
} // updateTooltip } // updateTooltip
@ -556,6 +573,9 @@ void OptionsScreenVideo::eventCallback(Widget* widget, const std::string& name,
UserConfigParams::m_ssao = m_presets[level].ssao; UserConfigParams::m_ssao = m_presets[level].ssao;
UserConfigParams::m_light_scatter = m_presets[level].light_scatter; UserConfigParams::m_light_scatter = m_presets[level].light_scatter;
UserConfigParams::m_degraded_IBL = m_presets[level].degraded_ibl; UserConfigParams::m_degraded_IBL = m_presets[level].degraded_ibl;
UserConfigParams::m_geometry_level = (m_presets[level].geometry_detail == 0 ? 2 :
m_presets[level].geometry_detail == 2 ? 0 :
m_presets[level].geometry_detail);
updateGfxSlider(); updateGfxSlider();
} }

View File

@ -39,6 +39,7 @@ struct GFXPreset
int particles; int particles;
int image_quality; int image_quality;
bool degraded_ibl; bool degraded_ibl;
int geometry_detail;
}; };
struct BlurPreset struct BlurPreset