Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 17:38:08 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

frontend: Allow cycling modifiers for an absolute axis by pressing repeatedly without going through an append step.

Browse Source
This commit is contained in:
Vas Crabb 2021-11-06 20:23:11 +11:00
parent 3ee378dc4f
commit 2b025ea08d
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/frontend/mame/iptseqpoll.cpp
View File

@ -82,21 +82,44 @@ bool input_code_poller::code_pressed_once(input_code code, bool moved)
axis_code_poller::axis_code_poller(input_manager &manager) noexcept : axis_code_poller::axis_code_poller(input_manager &manager) noexcept :
input_code_poller(manager) input_code_poller(manager),
m_axis_active()
{ {
} }
void axis_code_poller::reset()
{
input_code_poller::reset();
m_axis_active.clear();
m_axis_active.resize(m_axis_memory.size(), false);
}
input_code axis_code_poller::poll() input_code axis_code_poller::poll()
{ {
// iterate over the axis items we found // iterate over the axis items we found
for (auto memory = m_axis_memory.begin(); m_axis_memory.end() != memory; ++memory) for (std::size_t i = 0; m_axis_memory.size() > i; ++i)
{ {
input_code code = memory->first->code(); auto &memory = m_axis_memory[i];
if (memory->first->check_axis(code.item_modifier(), memory->second)) input_code code = memory.first->code();
if (!memory.first->check_axis(code.item_modifier(), memory.second))
{ {
m_axis_memory.erase(memory); m_axis_active[i] = false;
if (!m_manager.device_class(memory->first->device().devclass()).multi()) }
else if (!m_axis_active[i])
{
if (code.item_class() == ITEM_CLASS_ABSOLUTE)
{
m_axis_active[i] = true;
}
else
{
// can only cycle modifiers on a relative item with append
m_axis_memory.erase(m_axis_memory.begin() + i);
m_axis_active.erase(m_axis_active.begin() + i);
}
if (!m_manager.device_class(memory.first->device().devclass()).multi())
code.set_device_index(0); code.set_device_index(0);
return code; return code;
} }

4
src/frontend/mame/iptseqpoll.h
View File

@ -40,7 +40,11 @@ class axis_code_poller : public input_code_poller
public: public:
axis_code_poller(input_manager &manager) noexcept; axis_code_poller(input_manager &manager) noexcept;
virtual void reset() override;
virtual input_code poll() override; virtual input_code poll() override;
private:
std::vector<bool> m_axis_active;
}; };