godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Remove other platform specific project setting defaults.

This commit is contained in:
Pāvels Nadtočajevs 2025-02-19 13:43:11 +02:00
parent e567f49cbb
commit 3f7a075462
7 changed files with 69 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
doc/classes/ProjectSettings.xml
View File

@ -375,12 +375,24 @@
<member name="audio/buses/default_bus_layout" type="String" setter="" getter="" default="&quot;res://default_bus_layout.tres&quot;">
Default [AudioBusLayout] resource file to use in the project, unless overridden by the scene.
</member>
<member name="audio/driver/driver" type="String" setter="" getter="">
<member name="audio/driver/driver" type="String" setter="" getter="" default="&quot;auto&quot;">
Specifies the audio driver to use. This setting is platform-dependent as each platform supports different audio drivers. If left empty, the default audio driver will be used.
The [code]Dummy[/code] audio driver disables all audio playback and recording, which is useful for non-game applications as it reduces CPU usage. It also prevents the engine from appearing as an application playing audio in the OS' audio mixer.
To query the value that is being used at run-time (which may be overridden by command-line arguments or headless mode), use [method AudioServer.get_driver_name].
[b]Note:[/b] The driver in use can be overridden at runtime via the [code]--audio-driver[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]command line argument[/url].
</member>
<member name="audio/driver/driver.android" type="String" setter="" getter="" default="&quot;auto&quot;">
</member>
<member name="audio/driver/driver.ios" type="String" setter="" getter="" default="&quot;auto&quot;">
</member>
<member name="audio/driver/driver.linuxbsd" type="String" setter="" getter="" default="&quot;auto&quot;">
</member>
<member name="audio/driver/driver.macos" type="String" setter="" getter="" default="&quot;auto&quot;">
</member>
<member name="audio/driver/driver.web" type="String" setter="" getter="" default="&quot;auto&quot;">
</member>
<member name="audio/driver/driver.windows" type="String" setter="" getter="" default="&quot;auto&quot;">
</member>
<member name="audio/driver/enable_input" type="bool" setter="" getter="" default="false">
If [code]true[/code], microphone input will be allowed. This requires appropriate permissions to be set when exporting to Android or iOS.
[b]Note:[/b] If the operating system blocks access to audio input devices (due to the user's privacy settings), audio capture will only return silence. On Windows 10 and later, make sure that apps are allowed to access the microphone in the OS' privacy settings.
@ -787,22 +799,22 @@
<member name="debug/shapes/paths/geometry_width" type="float" setter="" getter="" default="2.0">
Line width of the curve path geometry, visible when "Visible Paths" is enabled in the Debug menu.
</member>
<member name="display/display_server/driver" type="String" setter="" getter="">
<member name="display/display_server/driver" type="String" setter="" getter="" default="&quot;default&quot;">
Sets the driver to be used by the display server. This property can not be edited directly, instead, set the driver using the platform-specific overrides.
</member>
<member name="display/display_server/driver.android" type="String" setter="" getter="">
<member name="display/display_server/driver.android" type="String" setter="" getter="" default="&quot;default&quot;">
Android override for [member display/display_server/driver].
</member>
<member name="display/display_server/driver.ios" type="String" setter="" getter="">
<member name="display/display_server/driver.ios" type="String" setter="" getter="" default="&quot;default&quot;">
iOS override for [member display/display_server/driver].
</member>
<member name="display/display_server/driver.linuxbsd" type="String" setter="" getter="">
<member name="display/display_server/driver.linuxbsd" type="String" setter="" getter="" default="&quot;default&quot;">
LinuxBSD override for [member display/display_server/driver].
</member>
<member name="display/display_server/driver.macos" type="String" setter="" getter="">
<member name="display/display_server/driver.macos" type="String" setter="" getter="" default="&quot;default&quot;">
MacOS override for [member display/display_server/driver].
</member>
<member name="display/display_server/driver.windows" type="String" setter="" getter="">
<member name="display/display_server/driver.windows" type="String" setter="" getter="" default="&quot;default&quot;">
Windows override for [member display/display_server/driver].
</member>
<member name="display/mouse_cursor/custom_image" type="String" setter="" getter="" default="&quot;&quot;">
@ -1056,7 +1068,7 @@
<member name="gui/common/snap_controls_to_pixels" type="bool" setter="" getter="" default="true">
If [code]true[/code], snaps [Control] node vertices to the nearest pixel to ensure they remain crisp even when the camera moves or zooms.
</member>
<member name="gui/common/swap_cancel_ok" type="bool" setter="" getter="">
<member name="gui/common/swap_cancel_ok" type="String" setter="" getter="" default="&quot;auto&quot;">
If [code]true[/code], swaps [b]Cancel[/b] and [b]OK[/b] buttons in dialogs on Windows to follow interface conventions. [method DisplayServer.get_swap_cancel_ok] can be used to query whether buttons are swapped at run-time.
[b]Note:[/b] This doesn't affect native dialogs such as the ones spawned by [method DisplayServer.dialog_show].
</member>
@ -1426,12 +1438,12 @@
If [code]false[/code], no input will be lost.
[b]Note:[/b] You should in nearly all cases prefer the [code]false[/code] setting. The legacy behavior is to enable supporting old projects that rely on the old logic, without changes to script.
</member>
<member name="input_devices/pen_tablet/driver" type="String" setter="" getter="">
<member name="input_devices/pen_tablet/driver" type="String" setter="" getter="" default="&quot;&quot;">
Specifies the tablet driver to use. If left empty, the default driver will be used.
[b]Note:[/b] The driver in use can be overridden at runtime via the [code]--tablet-driver[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]command line argument[/url].
[b]Note:[/b] Use [method DisplayServer.tablet_set_current_driver] to switch tablet driver in runtime.
</member>
<member name="input_devices/pen_tablet/driver.windows" type="String" setter="" getter="">
<member name="input_devices/pen_tablet/driver.windows" type="String" setter="" getter="" default="&quot;&quot;">
Override for [member input_devices/pen_tablet/driver] on Windows. Supported values are:
- [code]auto[/code] (default), uses [code]wintab[/code] if Windows Ink is disabled in the Wacom Tablet Properties or system settings, [code]winink[/code] otherwise.
- [code]winink[/code], uses Windows native "Windows Ink" driver.

9
editor/project_manager.cpp
View File

@ -1618,7 +1618,14 @@ ProjectManager::ProjectManager(bool p_custom_res) {
ask_update_settings = memnew(ConfirmationDialog);
ask_update_settings->set_autowrap(true);
ask_update_settings->get_ok_button()->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_open_selected_projects_with_migration));
full_convert_button = ask_update_settings->add_button(TTR("Convert Full Project"), !GLOBAL_GET("gui/common/swap_cancel_ok"));
bool swap_cancel_ok = false;
String swap_cancel_ok_str = GLOBAL_GET("gui/common/swap_cancel_ok");
if (swap_cancel_ok_str == "auto") {
swap_cancel_ok = DisplayServer::get_singleton()->get_swap_cancel_ok();
} else {
swap_cancel_ok = (swap_cancel_ok_str == "yes");
}
full_convert_button = ask_update_settings->add_button(TTR("Convert Full Project"), !swap_cancel_ok);
full_convert_button->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_full_convert_button_pressed));
add_child(ask_update_settings);

9
editor/project_manager/quick_settings_dialog.cpp
View File

@ -192,7 +192,14 @@ void QuickSettingsDialog::_set_setting_value(const String &p_setting, const Vari
restart_required_label->show();
if (!restart_required_button) {
restart_required_button = add_button(TTR("Restart Now"), !GLOBAL_GET("gui/common/swap_cancel_ok"));
bool swap_cancel_ok_val = false;
String swap_cancel_ok_str = GLOBAL_GET("gui/common/swap_cancel_ok");
if (swap_cancel_ok_str == "auto") {
swap_cancel_ok_val = DisplayServer::get_singleton()->get_swap_cancel_ok();
} else {
swap_cancel_ok_val = (swap_cancel_ok_str == "yes");
}
restart_required_button = add_button(TTR("Restart Now"), !swap_cancel_ok_val);
restart_required_button->connect(SceneStringName(pressed), callable_mp(this, &QuickSettingsDialog::_request_restart));
}
}

36
main/main.cpp
View File

@ -262,7 +262,7 @@ bool profile_gpu = false;
// Constants.
static const String NULL_DISPLAY_DRIVER("headless");
static const String NULL_AUDIO_DRIVER("Dummy");
static const String NULL_AUDIO_DRIVER("dummy");
// The length of the longest column in the command-line help we should align to
// (excluding the 2-space left and right margins).
@ -2550,29 +2550,39 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
// Make sure that headless is the last one, which it is assumed to be by design.
DEV_ASSERT(NULL_DISPLAY_DRIVER == DisplayServer::get_create_function_name(DisplayServer::get_create_function_count() - 1));
GLOBAL_DEF_NOVAL("display/display_server/driver", "default");
GLOBAL_DEF_NOVAL(PropertyInfo(Variant::STRING, "display/display_server/driver.windows", PROPERTY_HINT_ENUM_SUGGESTION, "default,windows,headless"), "default");
GLOBAL_DEF_NOVAL(PropertyInfo(Variant::STRING, "display/display_server/driver.linuxbsd", PROPERTY_HINT_ENUM_SUGGESTION, "default,x11,wayland,headless"), "default");
GLOBAL_DEF_NOVAL(PropertyInfo(Variant::STRING, "display/display_server/driver.android", PROPERTY_HINT_ENUM_SUGGESTION, "default,android,headless"), "default");
GLOBAL_DEF_NOVAL(PropertyInfo(Variant::STRING, "display/display_server/driver.ios", PROPERTY_HINT_ENUM_SUGGESTION, "default,iOS,headless"), "default");
GLOBAL_DEF_NOVAL(PropertyInfo(Variant::STRING, "display/display_server/driver.macos", PROPERTY_HINT_ENUM_SUGGESTION, "default,macos,headless"), "default");
GLOBAL_DEF("display/display_server/driver", "default");
GLOBAL_DEF(PropertyInfo(Variant::STRING, "display/display_server/driver.windows", PROPERTY_HINT_ENUM, "default,windows,headless"), "default");
GLOBAL_DEF(PropertyInfo(Variant::STRING, "display/display_server/driver.linuxbsd", PROPERTY_HINT_ENUM, "default,x11,wayland,headless"), "default");
GLOBAL_DEF(PropertyInfo(Variant::STRING, "display/display_server/driver.android", PROPERTY_HINT_ENUM, "default,android,headless"), "default");
GLOBAL_DEF(PropertyInfo(Variant::STRING, "display/display_server/driver.ios", PROPERTY_HINT_ENUM, "default,ios,headless"), "default");
GLOBAL_DEF(PropertyInfo(Variant::STRING, "display/display_server/driver.macos", PROPERTY_HINT_ENUM, "default,macos,headless"), "default");
GLOBAL_DEF_RST("audio/driver/driver", "auto");
GLOBAL_DEF_RST(PropertyInfo(Variant::STRING, "audio/driver/driver.windows", PROPERTY_HINT_ENUM, "auto,wasapi,xaudio2,dummy"), "auto");
GLOBAL_DEF_RST(PropertyInfo(Variant::STRING, "audio/driver/driver.linuxbsd", PROPERTY_HINT_ENUM, "auto,pulseaudio,alsa,dummy"), "auto");
GLOBAL_DEF_RST(PropertyInfo(Variant::STRING, "audio/driver/driver.web", PROPERTY_HINT_ENUM, "auto,audioworklet,dummy"), "auto");
GLOBAL_DEF_RST(PropertyInfo(Variant::STRING, "audio/driver/driver.android", PROPERTY_HINT_ENUM, "auto,opensles,dummy"), "auto");
GLOBAL_DEF_RST(PropertyInfo(Variant::STRING, "audio/driver/driver.ios", PROPERTY_HINT_ENUM, "auto,coreaudio,dummy"), "auto");
GLOBAL_DEF_RST(PropertyInfo(Variant::STRING, "audio/driver/driver.macos", PROPERTY_HINT_ENUM, "auto,coreaudio,dummy"), "auto");
GLOBAL_DEF_RST_NOVAL("audio/driver/driver", AudioDriverManager::get_driver(0)->get_name());
if (audio_driver.is_empty()) { // Specified in project.godot.
if (project_manager) {
// The project manager doesn't need to play sound (TTS audio output is not emitted by Godot, but by the system itself).
// Disable audio output so it doesn't appear in the list of applications outputting sound in the OS.
// On macOS, this also prevents the project manager from inhibiting suspend.
audio_driver = "Dummy";
audio_driver = "dummy";
} else {
audio_driver = GLOBAL_GET("audio/driver/driver");
if (audio_driver == "auto") {
audio_driver = String(AudioDriverManager::get_driver(0)->get_name()).to_lower();
}
}
}
// Make sure that dummy is the last one, which it is assumed to be by design.
DEV_ASSERT(NULL_AUDIO_DRIVER == AudioDriverManager::get_driver(AudioDriverManager::get_driver_count() - 1)->get_name());
DEV_ASSERT(NULL_AUDIO_DRIVER == String(AudioDriverManager::get_driver(AudioDriverManager::get_driver_count() - 1)->get_name()).to_lower());
for (int i = 0; i < AudioDriverManager::get_driver_count(); i++) {
if (audio_driver == AudioDriverManager::get_driver(i)->get_name()) {
if (audio_driver == String(AudioDriverManager::get_driver(i)->get_name()).to_lower()) {
audio_driver_idx = i;
break;
}
@ -3120,8 +3130,8 @@ Error Main::setup2(bool p_show_boot_logo) {
{
OS::get_singleton()->benchmark_begin_measure("Servers", "Tablet Driver");
GLOBAL_DEF_RST_NOVAL("input_devices/pen_tablet/driver", "");
GLOBAL_DEF_RST_NOVAL(PropertyInfo(Variant::STRING, "input_devices/pen_tablet/driver.windows", PROPERTY_HINT_ENUM, "auto,winink,wintab,dummy"), "");
GLOBAL_DEF_RST("input_devices/pen_tablet/driver", "");
GLOBAL_DEF_RST(PropertyInfo(Variant::STRING, "input_devices/pen_tablet/driver.windows", PROPERTY_HINT_ENUM, "auto,winink,wintab,dummy"), "");
if (tablet_driver.is_empty()) { // specified in project.godot
tablet_driver = GLOBAL_GET("input_devices/pen_tablet/driver");

2
platform/android/audio_driver_opensl.h
View File

@ -88,7 +88,7 @@ class AudioDriverOpenSL : public AudioDriver {
public:
virtual const char *get_name() const override {
return "Android";
return "OpenSLES";
}
virtual Error init() override;

2
platform/ios/display_server_ios.mm
View File

@ -219,7 +219,7 @@ Vector<String> DisplayServerIOS::get_rendering_drivers_func() {
}
void DisplayServerIOS::register_ios_driver() {
register_create_function("iOS", create_func, get_rendering_drivers_func);
register_create_function("ios", create_func, get_rendering_drivers_func);
}
// MARK: Events

7
scene/register_scene_types.cpp
View File

@ -493,7 +493,12 @@ void register_scene_types() {
bool swap_cancel_ok = false;
if (DisplayServer::get_singleton()) {
swap_cancel_ok = GLOBAL_DEF_NOVAL("gui/common/swap_cancel_ok", bool(DisplayServer::get_singleton()->get_swap_cancel_ok()));
String swap_cancel_ok_str = GLOBAL_DEF(PropertyInfo(Variant::STRING, "gui/common/swap_cancel_ok", PROPERTY_HINT_ENUM, "auto,yes,no"), "auto");
if (swap_cancel_ok_str == "auto") {
swap_cancel_ok = DisplayServer::get_singleton()->get_swap_cancel_ok();
} else {
swap_cancel_ok = (swap_cancel_ok_str == "yes");
}
}
AcceptDialog::set_swap_cancel_ok(swap_cancel_ok);
#endif