6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-06-17 06:29:28 +00:00
Code Issues Projects Releases Wiki Activity

Adds a joystick class.

Browse Source
This commit is contained in:
Thomas Harte 2021-11-17 14:26:51 -05:00
parent 6df0227ab1
commit c3b4bee210
3 changed files with 64 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Inputs/Joystick.hpp
View File

@ -36,7 +36,10 @@ class Joystick {
// Fire buttons.
Fire,
// Other labelled keys.
Key
Key,
// The maximum value this enum can contain.
Max = Key
};
const Type type;

43
Machines/Amiga/Chipset.cpp
View File

@ -1270,7 +1270,7 @@ void Chipset::Mouse::set_button_pressed(int button, bool is_set) {
}
}
uint8_t Chipset::Mouse::get_cia_button() {
uint8_t Chipset::Mouse::get_cia_button() const {
return cia_state_;
}
@ -1319,5 +1319,46 @@ uint16_t Chipset::Mouse::get_position() {
);
}
// MARK: - Joystick.
void Chipset::Joystick::did_set_input(const Input &input, bool is_active) {
// Accumulate state.
inputs_[input.type] = is_active;
// Determine what that does to the two position bits.
const auto low =
(inputs_[Input::Type::Down] ^ inputs_[Input::Type::Right]) |
(inputs_[Input::Type::Right] << 1);
const auto high =
(inputs_[Input::Type::Up] ^ inputs_[Input::Type::Left]) |
(inputs_[Input::Type::Left] << 1);
// Ripple upwards if that affects the mouse position counters.
const uint8_t previous_low = position_ & 3;
uint8_t low_upper = (position_ >> 2) & 0x3f;
const uint8_t previous_high = (position_ >> 8) & 3;
uint8_t high_upper = (position_ >> 10) & 0x3f;
if(!low && previous_low == 3) ++low_upper;
if(!previous_low && low == 3) --low_upper;
if(!high && previous_high == 3) ++high_upper;
if(!previous_high && high == 3) --high_upper;
position_ = uint16_t(
low | ((low_upper & 0x3f) << 2) |
(high << 8) | ((high_upper & 0x3f) << 10)
);
}
uint16_t Chipset::Joystick::get_position() const {
return position_;
}
uint8_t Chipset::Joystick::get_cia_button() const {
return inputs_[Input::Type::Fire] ? 0xbf : 0xff;
}
// MARK: - Synchronisation.
void Chipset::flush() {
}

19
Machines/Amiga/Chipset.hpp
View File

@ -19,6 +19,7 @@
#include "../../ClockReceiver/ClockingHintSource.hpp"
#include "../../ClockReceiver/JustInTime.hpp"
#include "../../Components/6526/6526.hpp"
#include "../../Inputs/Joystick.hpp"
#include "../../Inputs/Mouse.hpp"
#include "../../Outputs/CRT/CRT.hpp"
#include "../../Processors/68000/68000.hpp"
@ -336,7 +337,7 @@ class Chipset: private ClockingHint::Observer {
class Mouse: public Inputs::Mouse {
public:
uint16_t get_position();
uint8_t get_cia_button();
uint8_t get_cia_button() const;
private:
int get_number_of_buttons() final;
@ -352,6 +353,22 @@ class Chipset: private ClockingHint::Observer {
public:
Inputs::Mouse &get_mouse();
// MARK: - Joystick.
private:
class Joystick: public Inputs::ConcreteJoystick {
public:
Joystick();
uint16_t get_position() const;
uint8_t get_cia_button() const;
private:
void did_set_input(const Input &input, bool is_active) final;
bool inputs_[Joystick::Input::Type::Max]{};
uint16_t position_ = 0;
};
// MARK: - CIAs.
private:
class DiskController;