Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-24 05:04:10 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Replace default deadzone magic number with named constant

Browse Source
This commit is contained in:
Malcolm Anderson 2024-11-12 09:43:29 -08:00
parent 0f5f3bc954
commit 829dade53b
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/config/project_settings.cpp
View File

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

2
core/input/input_event.cpp
View File

@ -1097,7 +1097,7 @@ JoyAxis InputEventJoypadMotion::get_axis() const {
void InputEventJoypadMotion::set_axis_value(float p_value) { void InputEventJoypadMotion::set_axis_value(float p_value) {
axis_value = p_value; axis_value = p_value;
pressed = Math::abs(axis_value) >= 0.5f; pressed = Math::abs(axis_value) >= InputMap::DEFAULT_DEADZONE;
emit_changed(); emit_changed();
} }

4
core/input/input_map.cpp
View File

@ -42,7 +42,7 @@ InputMap *InputMap::singleton = nullptr;
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.2f)); ClassDB::bind_method(D_METHOD("add_action", "action", "deadzone"), &InputMap::add_action, DEFVAL(DEFAULT_DEADZONE));
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);
@ -305,7 +305,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.2f; float deadzone = action.has("deadzone") ? (float)action["deadzone"] : DEFAULT_DEADZONE;
Array events = action["events"]; Array events = action["events"];
add_action(name, deadzone); add_action(name, deadzone);

4
core/input/input_map.h
View File

@ -49,6 +49,8 @@ public:
List<Ref<InputEvent>> inputs; List<Ref<InputEvent>> inputs;
}; };
static constexpr float DEFAULT_DEADZONE = 0.2f;
private: private:
static InputMap *singleton; static InputMap *singleton;
@ -74,7 +76,7 @@ public:
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.2); void add_action(const StringName &p_action, float p_deadzone = DEFAULT_DEADZONE);
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);

3
editor/project_settings_editor.cpp
View File

@ -31,6 +31,7 @@
#include "project_settings_editor.h" #include "project_settings_editor.h"
#include "core/config/project_settings.h" #include "core/config/project_settings.h"
#include "core/input/input_map.h"
#include "editor/editor_inspector.h" #include "editor/editor_inspector.h"
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
@ -390,7 +391,7 @@ void ProjectSettingsEditor::_action_added(const String &p_name) {
Dictionary action; Dictionary action;
action["events"] = Array(); action["events"] = Array();
action["deadzone"] = 0.2f; action["deadzone"] = InputMap::DEFAULT_DEADZONE;
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"));