feat: updated godot version
This commit is contained in:
parent
0c508b0831
commit
42b028dbb5
4694 changed files with 236470 additions and 401376 deletions
|
|
@ -33,7 +33,6 @@
|
|||
|
||||
#include "core/config/project_settings.h"
|
||||
#include "core/input/input.h"
|
||||
#include "core/object/class_db.h"
|
||||
#include "core/os/keyboard.h"
|
||||
#include "core/os/os.h"
|
||||
#include "core/variant/typed_array.h"
|
||||
|
|
@ -206,22 +205,6 @@ void InputMap::action_add_event(const StringName &p_action, RequiredParam<InputE
|
|||
return; // Already added.
|
||||
}
|
||||
|
||||
// Normalize legacy device IDs: before the device ID change,
|
||||
// keyboard and mouse events defaulted to device=0.
|
||||
if (p_event->get_device() == 0) {
|
||||
switch (p_event->get_type()) {
|
||||
case InputEventType::KEY:
|
||||
p_event->set_device(InputEvent::DEVICE_ID_KEYBOARD);
|
||||
break;
|
||||
case InputEventType::MOUSE_BUTTON:
|
||||
case InputEventType::MOUSE_MOTION:
|
||||
p_event->set_device(InputEvent::DEVICE_ID_MOUSE);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
input_map[p_action].inputs.push_back(p_event);
|
||||
}
|
||||
|
||||
|
|
@ -336,11 +319,6 @@ void InputMap::load_from_project_settings() {
|
|||
String name = pi.name.substr(pi.name.find_char('/') + 1);
|
||||
|
||||
Dictionary action = GLOBAL_GET(pi.name);
|
||||
|
||||
if (!action.has("events")) {
|
||||
continue;
|
||||
}
|
||||
|
||||
float deadzone = action.has("deadzone") ? (float)action["deadzone"] : DEFAULT_DEADZONE;
|
||||
Array events = action["events"];
|
||||
|
||||
|
|
@ -926,7 +904,7 @@ const HashMap<String, List<Ref<InputEvent>>> &InputMap::get_builtins_with_featur
|
|||
}
|
||||
|
||||
void InputMap::load_default() {
|
||||
HashMap<String, List<Ref<InputEvent>>> builtins(get_builtins_with_feature_overrides_applied());
|
||||
HashMap<String, List<Ref<InputEvent>>> builtins = get_builtins_with_feature_overrides_applied();
|
||||
|
||||
for (const KeyValue<String, List<Ref<InputEvent>>> &E : builtins) {
|
||||
String name = E.key;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue