Skip to content
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

Jump to bottom

Disable dynamic shadow dropdown on OGLES2 #12637

Merged
merged 7 commits into from
Aug 4, 2022
Merged

Disable dynamic shadow dropdown on OGLES2 #12637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
351705f
Disable dynamic shadow dropdown on OGLES2
rollerozxa Aug 2, 2022
a3abe6b
Explicitly set dynamic shadow setting to false
rollerozxa Aug 2, 2022
8247a1f
Undo explicitly setting the dynamic shadow setting
rollerozxa Aug 3, 2022
fa9461f
Fix greyed out dynamic shadows text disappearing
rollerozxa Aug 3, 2022
6dd705b
Disable dynamic shadows in C++ when video driver is not OpenGL
rollerozxa Aug 3, 2022
d8f6d8f
Revert "Disable dynamic shadows in C++ when video driver is not OpenGL"
sfan5 Aug 3, 2022
2ab356b
simpler
sfan5 Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 11 additions & 3 deletions builtin/mainmenu/tab_settings.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,19 @@ local function formspec(tabview, name, tabdata)
"checkbox[8.25,1.5;cb_waving_leaves;" .. fgettext("Waving Leaves") .. ";"
.. dump(core.settings:get_bool("enable_waving_leaves")) .. "]" ..
"checkbox[8.25,2;cb_waving_plants;" .. fgettext("Waving Plants") .. ";"
.. dump(core.settings:get_bool("enable_waving_plants")) .. "]"..
"label[8.25,2.8;" .. fgettext("Dynamic shadows:") .. "]" ..
"label[8.25,3.2;" .. fgettext("(game support required)") .. "]" ..
.. dump(core.settings:get_bool("enable_waving_plants")) .. "]"

if video_driver == "opengl" then
tab_string = tab_string ..
"label[8.25,2.8;" .. fgettext("Dynamic shadows:") .. "]" ..
"label[8.25,3.2;" .. fgettext("(game support required)") .. "]" ..
"dropdown[8.25,3.7;3.5;dd_shadows;" .. dd_options.shadow_levels[1] .. ";"
.. getSettingIndex.ShadowMapping() .. "]"
else
tab_string = tab_string ..
"label[8.38,2.7;" .. core.colorize("#888888",
fgettext("Dynamic shadows")) .. "]"
end
else
tab_string = tab_string ..
"label[8.38,0.7;" .. core.colorize("#888888",
Expand Down
7 changes: 7 additions & 0 deletions src/client/render/core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ RenderingCore::RenderingCore(IrrlichtDevice *_device, Client *_client, Hud *_hud
screensize = driver->getScreenSize();
virtual_size = screensize;

// disable if unsupported
if (g_settings->getBool("enable_dynamic_shadows") && (
g_settings->get("video_driver") != "opengl" ||
!g_settings->getBool("enable_shaders"))) {
g_settings->setBool("enable_dynamic_shadows", false);
}

if (g_settings->getBool("enable_shaders") &&
g_settings->getBool("enable_dynamic_shadows")) {
shadow_renderer = new ShadowRenderer(device, client);
Expand Down