asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #72460 from Calinou/project-manager-disable-incompatible-rendering-methods

Browse source 
Disable incompatible rendering methods in the project manager
This commit is contained in:
Rémi Verschelde 2023-02-22 22:47:07 +01:00
commit 02583ddde8
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
editor/editor_settings.cpp
View file

@ -746,7 +746,16 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
// TRANSLATORS: Project Manager here refers to the tool used to create/manage Godot projects. // TRANSLATORS: Project Manager here refers to the tool used to create/manage Godot projects.
EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "project_manager/sorting_order", 0, "Last Edited,Name,Path") EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "project_manager/sorting_order", 0, "Last Edited,Name,Path")
#if defined(WEB_ENABLED)
// Web platform only supports `gl_compatibility`.
EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_NONE, "project_manager/default_renderer", "gl_compatibility", "forward_plus,mobile,gl_compatibility")
#elif defined(ANDROID_ENABLED)
// Use more suitable rendering method by default.
EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_NONE, "project_manager/default_renderer", "mobile", "forward_plus,mobile,gl_compatibility")
#else
EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_NONE, "project_manager/default_renderer", "forward_plus", "forward_plus,mobile,gl_compatibility") EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_NONE, "project_manager/default_renderer", "forward_plus", "forward_plus,mobile,gl_compatibility")
#endif
if (p_extra_config.is_valid()) { if (p_extra_config.is_valid()) {
if (p_extra_config->has_section("init_projects") && p_extra_config->has_section_key("init_projects", "list")) { if (p_extra_config->has_section("init_projects") && p_extra_config->has_section_key("init_projects", "list")) {

14
editor/project_manager.cpp
View file

@ -911,33 +911,41 @@ public:
Button *rs_button = memnew(CheckBox); Button *rs_button = memnew(CheckBox);
rs_button->set_button_group(renderer_button_group); rs_button->set_button_group(renderer_button_group);
rs_button->set_text(TTR("Forward+")); rs_button->set_text(TTR("Forward+"));
#if defined(WEB_ENABLED)
rs_button->set_disabled(true);
#endif
rs_button->set_meta(SNAME("rendering_method"), "forward_plus"); rs_button->set_meta(SNAME("rendering_method"), "forward_plus");
rs_button->connect("pressed", callable_mp(this, &ProjectDialog::_renderer_selected)); rs_button->connect("pressed", callable_mp(this, &ProjectDialog::_renderer_selected));
rvb->add_child(rs_button); rvb->add_child(rs_button);
if (default_renderer_type == "forward_plus") { if (default_renderer_type == "forward_plus") {
rs_button->set_pressed(true); rs_button->set_pressed(true);
} }
rs_button = memnew(CheckBox); rs_button = memnew(CheckBox);
rs_button->set_button_group(renderer_button_group); rs_button->set_button_group(renderer_button_group);
rs_button->set_text(TTR("Mobile")); rs_button->set_text(TTR("Mobile"));
#if defined(WEB_ENABLED)
rs_button->set_disabled(true);
#endif
rs_button->set_meta(SNAME("rendering_method"), "mobile"); rs_button->set_meta(SNAME("rendering_method"), "mobile");
rs_button->connect("pressed", callable_mp(this, &ProjectDialog::_renderer_selected)); rs_button->connect("pressed", callable_mp(this, &ProjectDialog::_renderer_selected));
rvb->add_child(rs_button); rvb->add_child(rs_button);
if (default_renderer_type == "mobile") { if (default_renderer_type == "mobile") {
rs_button->set_pressed(true); rs_button->set_pressed(true);
} }
rs_button = memnew(CheckBox); rs_button = memnew(CheckBox);
rs_button->set_button_group(renderer_button_group); rs_button->set_button_group(renderer_button_group);
rs_button->set_text(TTR("Compatibility")); rs_button->set_text(TTR("Compatibility"));
#if !defined(GLES3_ENABLED)
rs_button->set_disabled(true);
#endif
rs_button->set_meta(SNAME("rendering_method"), "gl_compatibility"); rs_button->set_meta(SNAME("rendering_method"), "gl_compatibility");
rs_button->connect("pressed", callable_mp(this, &ProjectDialog::_renderer_selected)); rs_button->connect("pressed", callable_mp(this, &ProjectDialog::_renderer_selected));
rvb->add_child(rs_button); rvb->add_child(rs_button);
#if defined(GLES3_ENABLED)
if (default_renderer_type == "gl_compatibility") { if (default_renderer_type == "gl_compatibility") {
rs_button->set_pressed(true); rs_button->set_pressed(true);
} }
#endif
rshc->add_child(memnew(VSeparator)); rshc->add_child(memnew(VSeparator));
// Right hand side, used for text explaining each choice. // Right hand side, used for text explaining each choice.