Address review comments and fix code compilation
This commit is contained in:
parent
e6bd1fd1b8
commit
d176feffad
13 changed files with 218 additions and 155 deletions
|
@ -175,9 +175,11 @@ const GCButtonFactory* InputSubsystem::GetGCButtons() const {
|
|||
return impl->gcbuttons.get();
|
||||
}
|
||||
|
||||
void ReloadInputDevices() {
|
||||
if (udp)
|
||||
udp->ReloadUDPClient();
|
||||
void InputSubsystem::ReloadInputDevices() {
|
||||
if (!impl->udp) {
|
||||
return;
|
||||
}
|
||||
impl->udp->ReloadUDPClient();
|
||||
}
|
||||
|
||||
std::vector<std::unique_ptr<Polling::DevicePoller>> InputSubsystem::GetPollers(
|
||||
|
|
|
@ -118,6 +118,8 @@ public:
|
|||
/// Retrieves the underlying GameCube button handler.
|
||||
[[nodiscard]] const GCButtonFactory* GetGCButtons() const;
|
||||
|
||||
void ReloadInputDevices();
|
||||
|
||||
/// Get all DevicePoller from all backends for a specific device type
|
||||
[[nodiscard]] std::vector<std::unique_ptr<Polling::DevicePoller>> GetPollers(
|
||||
Polling::DeviceType type) const;
|
||||
|
|
|
@ -30,14 +30,15 @@ public:
|
|||
static_cast<int>(Layout::ScreenUndocked::Width);
|
||||
const float y = static_cast<float>(std::get<2>(m)) /
|
||||
static_cast<int>(Layout::ScreenUndocked::Height);
|
||||
return std::make_tuple(x, y, true);
|
||||
return {x, y, true};
|
||||
}
|
||||
}
|
||||
return std::make_tuple(0.0f, 0.0f, false);
|
||||
return {};
|
||||
}
|
||||
|
||||
private:
|
||||
std::vector<std::tuple<std::unique_ptr<Input::ButtonDevice>, int, int>> map; // button, x, y
|
||||
// A vector of the mapped button, its x and its y-coordinate
|
||||
std::vector<std::tuple<std::unique_ptr<Input::ButtonDevice>, int, int>> map;
|
||||
};
|
||||
|
||||
std::unique_ptr<Input::TouchDevice> TouchFromButtonFactory::Create(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue