encounter
/
aurora
mirror of https://github.com/encounter/aurora.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

input: Updates for absl

This commit is contained in:
Luke Street 2022-08-29 17:06:38 -04:00
parent 610b6ba8bf
commit 99bb9e5f83
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/input.cpp
View File

@ -80,48 +80,51 @@ Sint32 get_instance_for_player(uint32_t player) noexcept {
return {}; return {};
} }
static std::optional<std::string> remap_controller_layout(std::string_view mapping) { static std::optional<std::string> remap_controller_layout(std::string mapping) {
std::string newMapping; std::string newMapping;
newMapping.reserve(mapping.size()); newMapping.reserve(mapping.size());
absl::btree_map<std::string_view, std::string_view> entries; absl::btree_map<absl::string_view, absl::string_view> entries;
for (size_t idx = 0; const auto value : absl::StrSplit(mapping, ',')) { for (size_t idx = 0; const auto value : absl::StrSplit(mapping, ',')) {
if (idx < 2) { if (idx < 2) {
if (idx > 0) { if (idx > 0) {
newMapping.push_back(','); newMapping.push_back(',');
} }
newMapping.append(value); auto str = value.operator std::string();
newMapping.append(str);
} else { } else {
const auto split = absl::StrSplit(value, absl::MaxSplits(':', 2)); const auto split = absl::StrSplit(value, absl::MaxSplits(':', 2));
auto iter = split.begin(); auto iter = split.begin();
entries.emplace(*iter++, *iter); auto first = *iter++;
auto second = *iter;
entries.emplace(std::move(first), std::move(second));
} }
idx++; idx++;
} }
if (entries.contains("rightshoulder"sv) && !entries.contains("leftshoulder"sv)) { if (entries.contains("rightshoulder") && !entries.contains("leftshoulder")) {
Log.report(LOG_INFO, FMT_STRING("Remapping GameCube controller layout")); Log.report(LOG_INFO, FMT_STRING("Remapping GameCube controller layout"));
entries.insert_or_assign("back"sv, entries["rightshoulder"sv]); entries.insert_or_assign("back", entries["rightshoulder"]);
// TODO trigger buttons may differ per platform // TODO trigger buttons may differ per platform
entries.insert_or_assign("leftshoulder"sv, "b11"sv); entries.insert_or_assign("leftshoulder", "b11");
entries.insert_or_assign("rightshoulder"sv, "b10"sv); entries.insert_or_assign("rightshoulder", "b10");
} else if (entries.contains("leftshoulder"sv) && entries.contains("rightshoulder"sv) && entries.contains("back"sv)) { } else if (entries.contains("leftshoulder") && entries.contains("rightshoulder") && entries.contains("back")) {
Log.report(LOG_INFO, FMT_STRING("Controller has standard layout")); Log.report(LOG_INFO, FMT_STRING("Controller has standard layout"));
#if 0 #if 0
auto a = entries["a"sv]; auto a = entries["a"sv];
entries.insert_or_assign("a"sv, entries["b"sv]); entries.insert_or_assign("a"sv, entries["b"sv]);
entries.insert_or_assign("b"sv, a); entries.insert_or_assign("b"sv, a);
#endif #endif
auto x = entries["x"sv]; auto x = entries["x"];
entries.insert_or_assign("x"sv, entries["y"sv]); entries.insert_or_assign("x", entries["y"]);
entries.insert_or_assign("y"sv, x); entries.insert_or_assign("y", x);
} else { } else {
Log.report(LOG_ERROR, FMT_STRING("Controller has unsupported layout: {}"), mapping); Log.report(LOG_ERROR, FMT_STRING("Controller has unsupported layout: {}"), mapping);
return {}; return {};
} }
for (auto [k, v] : entries) { for (auto [k, v] : entries) {
newMapping.push_back(','); newMapping.push_back(',');
newMapping.append(k); newMapping.append(k.operator std::string());
newMapping.push_back(':'); newMapping.push_back(':');
newMapping.append(v); newMapping.append(v.operator std::string());
} }
return newMapping; return newMapping;
} }