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

Merge pull request #70204 from Calinou/ios-remove-disable-touch-setting

Browse source 
Remove Disable Touch debug project setting
This commit is contained in:
Rémi Verschelde 2022-12-17 20:56:28 +01:00
commit d25a64ffca
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/config/project_settings.cpp
View file

@ -1277,7 +1277,6 @@ ProjectSettings::ProjectSettings() {
GLOBAL_DEF("physics/2d/run_on_separate_thread", false); GLOBAL_DEF("physics/2d/run_on_separate_thread", false);
GLOBAL_DEF("physics/3d/run_on_separate_thread", false); GLOBAL_DEF("physics/3d/run_on_separate_thread", false);
GLOBAL_DEF("debug/disable_touch", false);
GLOBAL_DEF("debug/settings/profiler/max_functions", 16384); GLOBAL_DEF("debug/settings/profiler/max_functions", 16384);
custom_prop_info["debug/settings/profiler/max_functions"] = PropertyInfo(Variant::INT, "debug/settings/profiler/max_functions", PROPERTY_HINT_RANGE, "128,65535,1"); custom_prop_info["debug/settings/profiler/max_functions"] = PropertyInfo(Variant::INT, "debug/settings/profiler/max_functions", PROPERTY_HINT_RANGE, "128,65535,1");

3
doc/classes/ProjectSettings.xml
View file

@ -344,9 +344,6 @@
<member name="compression/formats/zstd/window_log_size" type="int" setter="" getter="" default="27"> <member name="compression/formats/zstd/window_log_size" type="int" setter="" getter="" default="27">
Largest size limit (in power of 2) allowed when compressing using long-distance matching with Zstandard. Higher values can result in better compression, but will require more memory when compressing and decompressing. Largest size limit (in power of 2) allowed when compressing using long-distance matching with Zstandard. Higher values can result in better compression, but will require more memory when compressing and decompressing.
</member> </member>
<member name="debug/disable_touch" type="bool" setter="" getter="" default="false">
Disable touch input. Only has effect on iOS.
</member>
<member name="debug/file_logging/enable_file_logging" type="bool" setter="" getter="" default="false"> <member name="debug/file_logging/enable_file_logging" type="bool" setter="" getter="" default="false">
If [code]true[/code], logs all output to files. If [code]true[/code], logs all output to files.
</member> </member>

30
platform/ios/display_server_ios.mm
View file

@ -227,27 +227,23 @@ void DisplayServerIOS::_window_callback(const Callable &p_callable, const Varian
// MARK: Touches // MARK: Touches
void DisplayServerIOS::touch_press(int p_idx, int p_x, int p_y, bool p_pressed, bool p_double_click) { void DisplayServerIOS::touch_press(int p_idx, int p_x, int p_y, bool p_pressed, bool p_double_click) {
if (!GLOBAL_GET("debug/disable_touch")) { Ref<InputEventScreenTouch> ev;
Ref<InputEventScreenTouch> ev; ev.instantiate();
ev.instantiate();
ev->set_index(p_idx); ev->set_index(p_idx);
ev->set_pressed(p_pressed); ev->set_pressed(p_pressed);
ev->set_position(Vector2(p_x, p_y)); ev->set_position(Vector2(p_x, p_y));
ev->set_double_tap(p_double_click); ev->set_double_tap(p_double_click);
perform_event(ev); perform_event(ev);
}
} }
void DisplayServerIOS::touch_drag(int p_idx, int p_prev_x, int p_prev_y, int p_x, int p_y) { void DisplayServerIOS::touch_drag(int p_idx, int p_prev_x, int p_prev_y, int p_x, int p_y) {
if (!GLOBAL_GET("debug/disable_touch")) { Ref<InputEventScreenDrag> ev;
Ref<InputEventScreenDrag> ev; ev.instantiate();
ev.instantiate(); ev->set_index(p_idx);
ev->set_index(p_idx); ev->set_position(Vector2(p_x, p_y));
ev->set_position(Vector2(p_x, p_y)); ev->set_relative(Vector2(p_x - p_prev_x, p_y - p_prev_y));
ev->set_relative(Vector2(p_x - p_prev_x, p_y - p_prev_y)); perform_event(ev);
perform_event(ev);
}
} }
void DisplayServerIOS::perform_event(const Ref<InputEvent> &p_event) { void DisplayServerIOS::perform_event(const Ref<InputEvent> &p_event) {