sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GunCon: Add relative pointer binding

Browse Source
This commit is contained in:
Stenzek
2023-09-20 16:56:12 +10:00
parent e63b2eec38
commit 7e07d2feb8
21 changed files with 779 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/core/guncon.h
View File

@ -10,13 +10,19 @@
class GunCon final : public Controller
{
public:
enum class Button : u8
enum class Binding : u8
{
Trigger = 0,
A = 1,
B = 2,
ShootOffscreen = 3,
Count
ButtonCount = 4,
RelativeLeft = 4,
RelativeRight = 5,
RelativeUp = 6,
RelativeDown = 7,
BindingCount = 8,
};
static const Controller::ControllerInfo INFO;
@ -30,9 +36,8 @@ public:
void Reset() override;
bool DoState(StateWrapper& sw, bool apply_input_state) override;
void LoadSettings(SettingsInterface& si, const char* section) override;
bool GetSoftwareCursor(std::string* image_path, float* image_scale, bool* relative_mode) override;
float GetBindState(u32 index) const override;
void SetBindState(u32 index, float value) override;
@ -41,8 +46,6 @@ public:
bool Transfer(const u8 data_in, u8* data_out) override;
private:
void UpdatePosition();
enum class TransferState : u8
{
Idle,
@ -56,15 +59,27 @@ private:
YMSB
};
std::string m_crosshair_image_path;
float m_crosshair_image_scale = 1.0f;
void UpdatePosition();
// 0..1, not -1..1.
std::pair<float, float> GetAbsolutePositionFromRelativeAxes() const;
bool CanUseSoftwareCursor() const;
u32 GetSoftwarePointerIndex() const;
void UpdateSoftwarePointerPosition();
std::string m_cursor_path;
float m_cursor_scale = 1.0f;
u32 m_cursor_color = 0xFFFFFFFFu;
float m_x_scale = 1.0f;
float m_relative_pos[4] = {};
// buttons are active low
u16 m_button_state = UINT16_C(0xFFFF);
u16 m_position_x = 0;
u16 m_position_y = 0;
bool m_shoot_offscreen = false;
bool m_has_relative_binds = false;
TransferState m_transfer_state = TransferState::Idle;
};