New ActionMapEditor. Made use of it in ProjectSettings.

godotengine · Oct 7, 2020 · 4865226 · 4865226
1 parent a181c41
commit 4865226
Show file tree

Hide file tree

Showing 9 changed files with 1,506 additions and 1,229 deletions.
diff --git a/core/project_settings.cpp b/core/project_settings.cpp
@@ -1041,24 +1041,25 @@ void ProjectSettings::_bind_methods() {
 }
 
 void ProjectSettings::_add_builtin_input_map() {
-	Array events;
+	if (InputMap::get_singleton()) {
+		OrderedHashMap<String, List<Ref<InputEvent>>> builtins = InputMap::get_singleton()->get_builtins();
 
-	OrderedHashMap<StringName, List<Ref<InputEvent>>> builtins = InputMap::get_singleton()->get_builtins();
-	for (OrderedHashMap<StringName, List<Ref<InputEvent>>>::Element E = builtins.front(); E; E = E.next()) {
-		Array events;
+		for (OrderedHashMap<String, List<Ref<InputEvent>>>::Element E = builtins.front(); E; E = E.next()) {
+			Array events;
 
-		// Convert list of input events into array
-		for (List<Ref<InputEvent>>::Element *I = E.get().front(); I; I = I->next()) {
-			events.push_back(I->get());
-		}
+			// Convert list of input events into array
+			for (List<Ref<InputEvent>>::Element *I = E.get().front(); I; I = I->next()) {
+				events.push_back(I->get());
+			}
 
-		Dictionary action;
-		action["deadzone"] = Variant(0.5f);
-		action["events"] = events;
+			Dictionary action;
+			action["deadzone"] = Variant(0.5f);
+			action["events"] = events;
 
-		String action_name = "input/" + E.key();
-		GLOBAL_DEF(action_name, action);
-		input_presets.push_back(action_name);
+			String action_name = "input/" + E.key();
+			GLOBAL_DEF(action_name, action);
+			input_presets.push_back(action_name);
+		}
 	}
 }