mirror of
https://github.com/NoelFB/blah.git
synced 2024-11-29 17:08:56 +08:00
simplified and cleaned up new input binding implementation
This commit is contained in:
Noel Berry
parent
3f07c03fa5
commit
f3bbda5f6c
|
|
@ -6,9 +6,13 @@
|
|||
|
||||
namespace Blah
|
||||
{
|
||||
// Single input Binding
|
||||
class Binding
|
||||
{
|
||||
public:
|
||||
|
||||
// Represents a Controller Trigger or a single direction of a Controller Axis.
|
||||
// Used in the Binding implementation.
|
||||
struct BoundTrigger
|
||||
struct TriggerBind
|
||||
{
|
||||
// Controller Index we're bound to
|
||||
int controller = 0;
|
||||
|
|
@ -23,26 +27,15 @@ namespace Blah
|
|||
// otherwise requires a negative value
|
||||
bool positive = true;
|
||||
|
||||
BoundTrigger() = default;
|
||||
BoundTrigger(Axis axis);
|
||||
BoundTrigger(int controller, Axis axis, float threshold, bool positive);
|
||||
TriggerBind() = default;
|
||||
TriggerBind(Axis axis);
|
||||
TriggerBind(int controller, Axis axis, float threshold, bool positive);
|
||||
|
||||
bool is_down(float axis_value) const;
|
||||
|
||||
// helper functions for frequent use cases
|
||||
static BoundTrigger left_stick_left(int controller, float threshold);
|
||||
static BoundTrigger left_stick_right(int controller, float threshold);
|
||||
static BoundTrigger left_stick_up(int controller, float threshold);
|
||||
static BoundTrigger left_stick_down(int controller, float threshold);
|
||||
static BoundTrigger right_stick_left(int controller, float threshold);
|
||||
static BoundTrigger right_stick_right(int controller, float threshold);
|
||||
static BoundTrigger right_stick_up(int controller, float threshold);
|
||||
static BoundTrigger right_stick_down(int controller, float threshold);
|
||||
static BoundTrigger left_trigger(int controller, float threshold);
|
||||
static BoundTrigger right_trigger(int controller, float threshold);
|
||||
};
|
||||
|
||||
struct BoundButton
|
||||
// Represents a Controller Button.
|
||||
struct ButtonBind
|
||||
{
|
||||
// Controller Index we're bound to
|
||||
int controller = 0;
|
||||
|
|
@ -50,16 +43,11 @@ namespace Blah
|
|||
// Button we're bound to
|
||||
Button button = Button::None;
|
||||
|
||||
BoundButton() = default;
|
||||
BoundButton(Button button);
|
||||
BoundButton(int controller, Button button);
|
||||
ButtonBind() = default;
|
||||
ButtonBind(Button button);
|
||||
ButtonBind(int controller, Button button);
|
||||
};
|
||||
|
||||
// Single input Binding
|
||||
class Binding
|
||||
{
|
||||
public:
|
||||
|
||||
// Input Buffer for press events
|
||||
float press_buffer = 0;
|
||||
|
||||
|
|
@ -70,14 +58,29 @@ namespace Blah
|
|||
StackVector<Key, 16> keys;
|
||||
|
||||
// List of bound Buttons
|
||||
StackVector<BoundButton, 16> buttons;
|
||||
StackVector<ButtonBind, 16> buttons;
|
||||
|
||||
// List of bound Triggers / Axis
|
||||
StackVector<BoundTrigger, 16> triggers;
|
||||
StackVector<TriggerBind, 16> triggers;
|
||||
|
||||
// List of bound Mouse buttons
|
||||
StackVector<MouseButton, 16> mouse;
|
||||
|
||||
Binding() = default;
|
||||
|
||||
Binding(float press_buffer)
|
||||
: press_buffer(press_buffer)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
template<typename ... Args>
|
||||
Binding(float press_buffer, const Args&... args)
|
||||
: press_buffer(press_buffer)
|
||||
{
|
||||
add(args...);
|
||||
}
|
||||
|
||||
// if the binding has been pressed
|
||||
bool pressed() const;
|
||||
|
||||
|
|
@ -106,27 +109,34 @@ namespace Blah
|
|||
void consume_release();
|
||||
|
||||
// adds a key to the binding
|
||||
void add(Key key);
|
||||
Binding& add(Key key);
|
||||
|
||||
// adds a button to the binding
|
||||
void add(BoundButton button);
|
||||
Binding& add(ButtonBind button);
|
||||
|
||||
// adds an trigger to the binding
|
||||
void add(BoundTrigger trigger);
|
||||
Binding& add(TriggerBind trigger);
|
||||
|
||||
// adds a mouse button to the binding
|
||||
void add(MouseButton mouse);
|
||||
Binding& add(MouseButton mouse);
|
||||
|
||||
// adds an input to the binding
|
||||
template<typename T, typename T2, typename ... Args>
|
||||
void add(T first, T2 second, const Args&... args)
|
||||
Binding& add(T first, T2 second, const Args&... args)
|
||||
{
|
||||
add(first);
|
||||
add(second, args...);
|
||||
return *this;
|
||||
}
|
||||
|
||||
// adds the left trigger to the binding
|
||||
Binding& add_left_trigger(int controller, float threshold);
|
||||
|
||||
// adds the right trigger to the binding
|
||||
Binding& add_right_trigger(int controller, float threshold);
|
||||
|
||||
// assigns all the bindings to the specific controller
|
||||
void set_controller(int index);
|
||||
Binding& set_controller(int index);
|
||||
|
||||
// removes all bindings
|
||||
void clear();
|
||||
|
|
@ -169,6 +179,14 @@ namespace Blah
|
|||
// How to handle overlaps (ex. Left and Right are both held)
|
||||
Overlap overlap = Overlap::Newer;
|
||||
|
||||
AxisBinding() = default;
|
||||
|
||||
AxisBinding(const Binding& negative, const Binding& positive, Overlap overlap = Overlap::Newer)
|
||||
: negative(negative)
|
||||
, positive(positive)
|
||||
, overlap(overlap)
|
||||
{}
|
||||
|
||||
// Current Value from -1 to 1
|
||||
float value() const;
|
||||
|
||||
|
|
@ -186,20 +204,21 @@ namespace Blah
|
|||
|
||||
// Adds a negative & positive binding pair
|
||||
template<typename NegativeT, typename PositiveT>
|
||||
void add(NegativeT negative, PositiveT positive)
|
||||
AxisBinding& add(NegativeT negative, PositiveT positive)
|
||||
{
|
||||
this->negative.add(negative);
|
||||
this->positive.add(positive);
|
||||
return *this;
|
||||
}
|
||||
|
||||
// Adds a Stick binding
|
||||
void add_left_stick_x(int controller, float threshold);
|
||||
void add_left_stick_y(int controller, float threshold);
|
||||
void add_right_stick_x(int controller, float threshold);
|
||||
void add_right_stick_y(int controller, float threshold);
|
||||
AxisBinding& add_left_stick_x(int controller, float threshold);
|
||||
AxisBinding& add_left_stick_y(int controller, float threshold);
|
||||
AxisBinding& add_right_stick_x(int controller, float threshold);
|
||||
AxisBinding& add_right_stick_y(int controller, float threshold);
|
||||
|
||||
// assigns all the bindings to the specific controller
|
||||
void set_controller(int index);
|
||||
AxisBinding& set_controller(int index);
|
||||
|
||||
// Clears all Bindings
|
||||
void clear();
|
||||
|
|
@ -209,15 +228,23 @@ namespace Blah
|
|||
{
|
||||
public:
|
||||
|
||||
// An optional threshold for circular thresholds
|
||||
float round_threshold = 0.0f;
|
||||
|
||||
// X Axis Binding
|
||||
AxisBinding x;
|
||||
|
||||
// Y Axis Binding
|
||||
AxisBinding y;
|
||||
|
||||
// An optional threshold for circular thresholds
|
||||
float round_threshold = 0.0f;
|
||||
|
||||
StickBinding() = default;
|
||||
|
||||
StickBinding(const AxisBinding& x, const AxisBinding& y, float round_threshold = 0)
|
||||
: x(x)
|
||||
, y(y)
|
||||
, round_threshold(round_threshold)
|
||||
{}
|
||||
|
||||
// Current Value, -1 to 1
|
||||
Vec2 value() const;
|
||||
|
||||
|
|
@ -235,25 +262,26 @@ namespace Blah
|
|||
|
||||
// Adds directional bindings
|
||||
template<typename LeftT, typename RightT, typename UpT, typename DownT>
|
||||
void add(LeftT left, RightT right, UpT up, DownT down)
|
||||
StickBinding& add(LeftT left, RightT right, UpT up, DownT down)
|
||||
{
|
||||
x.negative.add(left);
|
||||
x.positive.add(right);
|
||||
y.negative.add(up);
|
||||
y.positive.add(down);
|
||||
return *this;
|
||||
}
|
||||
|
||||
// Adds the dpad binding
|
||||
void add_dpad(int controller);
|
||||
StickBinding& add_dpad(int controller);
|
||||
|
||||
// Adds the left stick binding
|
||||
void add_left_stick(int controller, float threshold);
|
||||
StickBinding& add_left_stick(int controller, float threshold);
|
||||
|
||||
// Adds the right stick binding
|
||||
void add_right_stick(int controller, float threshold);
|
||||
StickBinding& add_right_stick(int controller, float threshold);
|
||||
|
||||
// assigns all the bindings to the specific controller
|
||||
void set_controller(int index);
|
||||
StickBinding& set_controller(int index);
|
||||
|
||||
// Clears all the bindings
|
||||
void clear();
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@ namespace Blah
|
|||
{
|
||||
public:
|
||||
// registers a new binding
|
||||
static BindingRef register_binding();
|
||||
static BindingRef register_binding(const Binding& binding = Binding());
|
||||
|
||||
// registers a new axis binding
|
||||
static AxisBindingRef register_axis();
|
||||
static AxisBindingRef register_axis(const AxisBinding& binding = AxisBinding());
|
||||
|
||||
// registers a new stick binding
|
||||
static StickBindingRef register_stick();
|
||||
static StickBindingRef register_stick(const StickBinding& binding = StickBinding());
|
||||
|
||||
// updates all the bindings. This is called
|
||||
// automatically by the App loop.
|
||||
|
|
|
|||
|
|
@ -4,19 +4,19 @@
|
|||
|
||||
using namespace Blah;
|
||||
|
||||
BoundTrigger::BoundTrigger(Axis axis)
|
||||
Binding::TriggerBind::TriggerBind(Axis axis)
|
||||
: axis(axis)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
BoundTrigger::BoundTrigger(int controller, Axis axis, float threshold, bool positive)
|
||||
Binding::TriggerBind::TriggerBind(int controller, Axis axis, float threshold, bool positive)
|
||||
: controller(controller), axis(axis), threshold(threshold), positive(positive)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
bool BoundTrigger::is_down(float axis_value) const
|
||||
bool Binding::TriggerBind::is_down(float axis_value) const
|
||||
{
|
||||
if ((axis_value > 0 && positive) || (axis_value < 0 && !positive))
|
||||
{
|
||||
|
|
@ -27,60 +27,10 @@ bool BoundTrigger::is_down(float axis_value) const
|
|||
return false;
|
||||
}
|
||||
|
||||
BoundTrigger BoundTrigger::left_stick_left(int controller, float threshold)
|
||||
{
|
||||
return BoundTrigger(controller, Axis::LeftX, threshold, false);
|
||||
}
|
||||
|
||||
BoundTrigger BoundTrigger::left_stick_right(int controller, float threshold)
|
||||
{
|
||||
return BoundTrigger(controller, Axis::LeftX, threshold, true);
|
||||
}
|
||||
|
||||
BoundTrigger BoundTrigger::left_stick_up(int controller, float threshold)
|
||||
{
|
||||
return BoundTrigger(controller, Axis::LeftY, threshold, false);
|
||||
}
|
||||
|
||||
BoundTrigger BoundTrigger::left_stick_down(int controller, float threshold)
|
||||
{
|
||||
return BoundTrigger(controller, Axis::LeftY, threshold, true);
|
||||
}
|
||||
|
||||
BoundTrigger BoundTrigger::right_stick_left(int controller, float threshold)
|
||||
{
|
||||
return BoundTrigger(controller, Axis::RightX, threshold, false);
|
||||
}
|
||||
|
||||
BoundTrigger BoundTrigger::right_stick_right(int controller, float threshold)
|
||||
{
|
||||
return BoundTrigger(controller, Axis::RightX, threshold, true);
|
||||
}
|
||||
|
||||
BoundTrigger BoundTrigger::right_stick_up(int controller, float threshold)
|
||||
{
|
||||
return BoundTrigger(controller, Axis::RightY, threshold, false);
|
||||
}
|
||||
|
||||
BoundTrigger BoundTrigger::right_stick_down(int controller, float threshold)
|
||||
{
|
||||
return BoundTrigger(controller, Axis::RightY, threshold, true);
|
||||
}
|
||||
|
||||
BoundTrigger BoundTrigger::left_trigger(int controller, float threshold)
|
||||
{
|
||||
return BoundTrigger(controller, Axis::LeftTrigger, threshold, true);
|
||||
}
|
||||
|
||||
BoundTrigger BoundTrigger::right_trigger(int controller, float threshold)
|
||||
{
|
||||
return BoundTrigger(controller, Axis::RightTrigger, threshold, true);
|
||||
}
|
||||
|
||||
BoundButton::BoundButton(Button button)
|
||||
Binding::ButtonBind::ButtonBind(Button button)
|
||||
: button(button) {}
|
||||
|
||||
BoundButton::BoundButton(int controller, Button button)
|
||||
Binding::ButtonBind::ButtonBind(int controller, Button button)
|
||||
: controller(controller), button(button) {}
|
||||
|
||||
bool Binding::pressed() const
|
||||
|
|
@ -167,32 +117,50 @@ void Binding::consume_release()
|
|||
m_last_release_time = -1;
|
||||
}
|
||||
|
||||
void Binding::add(Key key)
|
||||
Binding& Binding::add(Key key)
|
||||
{
|
||||
keys.push_back(key);
|
||||
return *this;
|
||||
}
|
||||
|
||||
void Binding::add(BoundButton button)
|
||||
Binding& Binding::add(ButtonBind button)
|
||||
{
|
||||
buttons.push_back(button);
|
||||
return *this;
|
||||
}
|
||||
|
||||
void Binding::add(BoundTrigger trigger)
|
||||
Binding& Binding::add(TriggerBind trigger)
|
||||
{
|
||||
triggers.push_back(trigger);
|
||||
return *this;
|
||||
}
|
||||
|
||||
void Binding::add(MouseButton button)
|
||||
Binding& Binding::add(MouseButton button)
|
||||
{
|
||||
mouse.push_back(button);
|
||||
return *this;
|
||||
}
|
||||
|
||||
void Binding::set_controller(int index)
|
||||
Binding& Binding::add_left_trigger(int controller, float threshold)
|
||||
{
|
||||
triggers.push_back(TriggerBind(controller, Axis::LeftTrigger, threshold, true));
|
||||
return *this;
|
||||
}
|
||||
|
||||
Binding& Binding::add_right_trigger(int controller, float threshold)
|
||||
{
|
||||
triggers.push_back(TriggerBind(controller, Axis::RightTrigger, threshold, true));
|
||||
return *this;
|
||||
}
|
||||
|
||||
Binding& Binding::set_controller(int index)
|
||||
{
|
||||
for (auto& it : buttons)
|
||||
it.controller = index;
|
||||
for (auto& it : triggers)
|
||||
it.controller = index;
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
void Binding::clear()
|
||||
|
|
@ -391,34 +359,39 @@ void AxisBinding::consume_release()
|
|||
positive.consume_release();
|
||||
}
|
||||
|
||||
void AxisBinding::add_left_stick_x(int controller, float threshold)
|
||||
AxisBinding& AxisBinding::add_left_stick_x(int controller, float threshold)
|
||||
{
|
||||
negative.add(BoundTrigger::left_stick_left(controller, threshold));
|
||||
positive.add(BoundTrigger::left_stick_right(controller, threshold));
|
||||
negative.add(Binding::TriggerBind(controller, Axis::LeftX, threshold, false));
|
||||
positive.add(Binding::TriggerBind(controller, Axis::LeftX, threshold, true));
|
||||
return *this;
|
||||
}
|
||||
|
||||
void AxisBinding::add_left_stick_y(int controller, float threshold)
|
||||
AxisBinding& AxisBinding::add_left_stick_y(int controller, float threshold)
|
||||
{
|
||||
negative.add(BoundTrigger::left_stick_up(controller, threshold));
|
||||
positive.add(BoundTrigger::left_stick_down(controller, threshold));
|
||||
negative.add(Binding::TriggerBind(controller, Axis::LeftY, threshold, false));
|
||||
positive.add(Binding::TriggerBind(controller, Axis::LeftY, threshold, true));
|
||||
return *this;
|
||||
}
|
||||
|
||||
void AxisBinding::add_right_stick_x(int controller, float threshold)
|
||||
AxisBinding& AxisBinding::add_right_stick_x(int controller, float threshold)
|
||||
{
|
||||
negative.add(BoundTrigger::right_stick_left(controller, threshold));
|
||||
positive.add(BoundTrigger::right_stick_right(controller, threshold));
|
||||
negative.add(Binding::TriggerBind(controller, Axis::RightX, threshold, false));
|
||||
positive.add(Binding::TriggerBind(controller, Axis::RightX, threshold, true));
|
||||
return *this;
|
||||
}
|
||||
|
||||
void AxisBinding::add_right_stick_y(int controller, float threshold)
|
||||
AxisBinding& AxisBinding::add_right_stick_y(int controller, float threshold)
|
||||
{
|
||||
negative.add(BoundTrigger::right_stick_up(controller, threshold));
|
||||
positive.add(BoundTrigger::right_stick_down(controller, threshold));
|
||||
negative.add(Binding::TriggerBind(controller, Axis::RightY, threshold, false));
|
||||
positive.add(Binding::TriggerBind(controller, Axis::RightY, threshold, true));
|
||||
return *this;
|
||||
}
|
||||
|
||||
void AxisBinding::set_controller(int index)
|
||||
AxisBinding& AxisBinding::set_controller(int index)
|
||||
{
|
||||
negative.set_controller(index);
|
||||
positive.set_controller(index);
|
||||
return *this;
|
||||
}
|
||||
|
||||
void AxisBinding::clear()
|
||||
|
|
@ -459,30 +432,34 @@ void StickBinding::consume_release()
|
|||
y.consume_release();
|
||||
}
|
||||
|
||||
void StickBinding::add_dpad(int controller)
|
||||
StickBinding& StickBinding::add_dpad(int controller)
|
||||
{
|
||||
x.negative.add(BoundButton(controller, Button::Left));
|
||||
x.positive.add(BoundButton(controller, Button::Right));
|
||||
y.negative.add(BoundButton(controller, Button::Up));
|
||||
y.positive.add(BoundButton(controller, Button::Down));
|
||||
x.negative.add(Binding::ButtonBind(controller, Button::Left));
|
||||
x.positive.add(Binding::ButtonBind(controller, Button::Right));
|
||||
y.negative.add(Binding::ButtonBind(controller, Button::Up));
|
||||
y.positive.add(Binding::ButtonBind(controller, Button::Down));
|
||||
return *this;
|
||||
}
|
||||
|
||||
void StickBinding::add_left_stick(int controller, float threshold)
|
||||
StickBinding& StickBinding::add_left_stick(int controller, float threshold)
|
||||
{
|
||||
x.add_left_stick_x(controller, threshold);
|
||||
y.add_left_stick_y(controller, threshold);
|
||||
return *this;
|
||||
}
|
||||
|
||||
void StickBinding::add_right_stick(int controller, float threshold)
|
||||
StickBinding& StickBinding::add_right_stick(int controller, float threshold)
|
||||
{
|
||||
x.add_right_stick_x(controller, threshold);
|
||||
y.add_right_stick_y(controller, threshold);
|
||||
return *this;
|
||||
}
|
||||
|
||||
void StickBinding::set_controller(int index)
|
||||
StickBinding& StickBinding::set_controller(int index)
|
||||
{
|
||||
x.set_controller(index);
|
||||
y.set_controller(index);
|
||||
return *this;
|
||||
}
|
||||
|
||||
void StickBinding::clear()
|
||||
|
|
|
|||
|
|
@ -6,25 +6,25 @@ Vector<std::weak_ptr<Binding>> BindingRegistry::bindings;
|
|||
Vector<std::weak_ptr<AxisBinding>> BindingRegistry::axes;
|
||||
Vector<std::weak_ptr<StickBinding>> BindingRegistry::sticks;
|
||||
|
||||
BindingRef BindingRegistry::register_binding()
|
||||
BindingRef BindingRegistry::register_binding(const Binding& binding)
|
||||
{
|
||||
auto binding = std::make_shared<Binding>();
|
||||
bindings.push_back(std::weak_ptr<Binding>(binding));
|
||||
return binding;
|
||||
auto result = std::make_shared<Binding>(binding);
|
||||
bindings.push_back(std::weak_ptr<Binding>(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
AxisBindingRef BindingRegistry::register_axis()
|
||||
AxisBindingRef BindingRegistry::register_axis(const AxisBinding& binding)
|
||||
{
|
||||
auto binding = std::make_shared<AxisBinding>();
|
||||
axes.push_back(std::weak_ptr<AxisBinding>(binding));
|
||||
return binding;
|
||||
auto result = std::make_shared<AxisBinding>(binding);
|
||||
axes.push_back(std::weak_ptr<AxisBinding>(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
StickBindingRef BindingRegistry::register_stick()
|
||||
StickBindingRef BindingRegistry::register_stick(const StickBinding& binding)
|
||||
{
|
||||
auto binding = std::make_shared<StickBinding>();
|
||||
sticks.push_back(std::weak_ptr<StickBinding>(binding));
|
||||
return binding;
|
||||
auto result = std::make_shared<StickBinding>(binding);
|
||||
sticks.push_back(std::weak_ptr<StickBinding>(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
void BindingRegistry::update()
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user