6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2026-04-19 19:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Moves the joystick class towards accepting analogue inputs.

Browse Source
This commit is contained in:
Thomas Harte
2018-06-10 20:45:52 -04:00
parent a1c60152d4
commit 3ea2a4ccb8
7 changed files with 109 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.cpp
+5 -5
View File
@@ -25,11 +25,11 @@ class MultiJoystick: public Inputs::Joystick {
}
}
std::vector<DigitalInput> get_inputs() override {
std::vector<DigitalInput> inputs;
std::vector<Input> get_inputs() override {
std::vector<Input> inputs;
for(const auto &joystick: joysticks_) {
std::vector<DigitalInput> joystick_inputs = joystick->get_inputs();
std::vector<Input> joystick_inputs = joystick->get_inputs();
for(const auto &input: joystick_inputs) {
if(std::find(inputs.begin(), inputs.end(), input) != inputs.end()) {
inputs.push_back(input);
@@ -40,9 +40,9 @@ class MultiJoystick: public Inputs::Joystick {
return inputs;
}
void set_digital_input(const DigitalInput &digital_input, bool is_active) override {
void set_input(const Input &digital_input, bool is_active) override {
for(const auto &joystick: joysticks_) {
joystick->set_digital_input(digital_input, is_active);
joystick->set_input(digital_input, is_active);
}
}
void reset_all_inputs() override {