Changed the default deadzone value for new actions from 0.5 to 0.2

This commit is contained in:
Roman Morozov 2024-09-21 17:11:00 +04:00
parent e4e024ab88
commit d532eecc81
8 changed files with 62 additions and 7 deletions

View File

@ -1398,7 +1398,7 @@ void ProjectSettings::_add_builtin_input_map() {
} }
Dictionary action; Dictionary action;
action["deadzone"] = Variant(0.5f); action["deadzone"] = Variant(0.2f);
action["events"] = events; action["events"] = events;
String action_name = "input/" + E.key; String action_name = "input/" + E.key;

View File

@ -0,0 +1,41 @@
/**************************************************************************/
/* input_map.compat.inc */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/**************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef DISABLE_DEPRECATED
void InputMap::_add_action_bind_compat_97281(const StringName &p_action, float p_deadzone) {
add_action(p_action, p_deadzone);
}
void InputMap::_bind_compatibility_methods() {
ClassDB::bind_compatibility_method(D_METHOD("add_action", "action", "deadzone"), &InputMap::_add_action_bind_compat_97281, DEFVAL(0.5f));
}
#endif // DISABLE_DEPRECATED

View File

@ -29,6 +29,7 @@
/**************************************************************************/ /**************************************************************************/
#include "input_map.h" #include "input_map.h"
#include "input_map.compat.inc"
#include "core/config/project_settings.h" #include "core/config/project_settings.h"
#include "core/input/input.h" #include "core/input/input.h"
@ -43,7 +44,7 @@ int InputMap::ALL_DEVICES = -1;
void InputMap::_bind_methods() { void InputMap::_bind_methods() {
ClassDB::bind_method(D_METHOD("has_action", "action"), &InputMap::has_action); ClassDB::bind_method(D_METHOD("has_action", "action"), &InputMap::has_action);
ClassDB::bind_method(D_METHOD("get_actions"), &InputMap::_get_actions); ClassDB::bind_method(D_METHOD("get_actions"), &InputMap::_get_actions);
ClassDB::bind_method(D_METHOD("add_action", "action", "deadzone"), &InputMap::add_action, DEFVAL(0.5f)); ClassDB::bind_method(D_METHOD("add_action", "action", "deadzone"), &InputMap::add_action, DEFVAL(0.2f));
ClassDB::bind_method(D_METHOD("erase_action", "action"), &InputMap::erase_action); ClassDB::bind_method(D_METHOD("erase_action", "action"), &InputMap::erase_action);
ClassDB::bind_method(D_METHOD("action_set_deadzone", "action", "deadzone"), &InputMap::action_set_deadzone); ClassDB::bind_method(D_METHOD("action_set_deadzone", "action", "deadzone"), &InputMap::action_set_deadzone);
@ -306,7 +307,7 @@ void InputMap::load_from_project_settings() {
String name = pi.name.substr(pi.name.find("/") + 1, pi.name.length()); String name = pi.name.substr(pi.name.find("/") + 1, pi.name.length());
Dictionary action = GLOBAL_GET(pi.name); Dictionary action = GLOBAL_GET(pi.name);
float deadzone = action.has("deadzone") ? (float)action["deadzone"] : 0.5f; float deadzone = action.has("deadzone") ? (float)action["deadzone"] : 0.2f;
Array events = action["events"]; Array events = action["events"];
add_action(name, deadzone); add_action(name, deadzone);

View File

@ -69,12 +69,17 @@ private:
protected: protected:
static void _bind_methods(); static void _bind_methods();
#ifndef DISABLE_DEPRECATED
void _add_action_bind_compat_97281(const StringName &p_action, float p_deadzone = 0.5);
static void _bind_compatibility_methods();
#endif // DISABLE_DEPRECATED
public: public:
static _FORCE_INLINE_ InputMap *get_singleton() { return singleton; } static _FORCE_INLINE_ InputMap *get_singleton() { return singleton; }
bool has_action(const StringName &p_action) const; bool has_action(const StringName &p_action) const;
List<StringName> get_actions() const; List<StringName> get_actions() const;
void add_action(const StringName &p_action, float p_deadzone = 0.5); void add_action(const StringName &p_action, float p_deadzone = 0.2);
void erase_action(const StringName &p_action); void erase_action(const StringName &p_action);
float action_get_deadzone(const StringName &p_action); float action_get_deadzone(const StringName &p_action);

View File

@ -67,7 +67,7 @@
<method name="add_action"> <method name="add_action">
<return type="void" /> <return type="void" />
<param index="0" name="action" type="StringName" /> <param index="0" name="action" type="StringName" />
<param index="1" name="deadzone" type="float" default="0.5" /> <param index="1" name="deadzone" type="float" default="0.2" />
<description> <description>
Adds an empty action to the [InputMap] with a configurable [param deadzone]. Adds an empty action to the [InputMap] with a configurable [param deadzone].
An [InputEvent] can then be added to this action with [method action_add_event]. An [InputEvent] can then be added to this action with [method action_add_event].

View File

@ -390,7 +390,7 @@ void ProjectSettingsEditor::_action_added(const String &p_name) {
Dictionary action; Dictionary action;
action["events"] = Array(); action["events"] = Array();
action["deadzone"] = 0.5f; action["deadzone"] = 0.2f;
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton(); EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
undo_redo->create_action(TTR("Add Input Action")); undo_redo->create_action(TTR("Add Input Action"));

View File

@ -87,3 +87,11 @@ GH-94684
Validate extension JSON: Error: Field 'classes/SoftBody3D/methods/set_point_pinned/arguments': size changed value in new API, from 3 to 4. Validate extension JSON: Error: Field 'classes/SoftBody3D/methods/set_point_pinned/arguments': size changed value in new API, from 3 to 4.
Optional argument added to allow for adding pin point at specific index. Compatibility method registered. Optional argument added to allow for adding pin point at specific index. Compatibility method registered.
GH-97281
--------
Validate extension JSON: Error: Field 'classes/InputMap/methods/add_action/arguments/1': default_value changed value in new API, from "0.5" to "0.2".
Default deadzone value was changed. No adjustments should be necessary.
Compatibility method registered.

View File

@ -12,6 +12,6 @@ config/name="GDScript Integration Test Suite"
[input] [input]
test_input_action={ test_input_action={
"deadzone": 0.5, "deadzone": 0.2,
"events": [] "events": []
} }