mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-05 19:09:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Enable reversing of movement for joystick axes

Browse Source
This commit is contained in:
Malin E
2023-05-17 10:14:47 +02:00
parent f31dce7f01
commit 6ce55400d1
13 changed files with 89 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/interaction/joystickcamerastates.h
+6 -2
View File
@@ -60,11 +60,13 @@ public:
BooleanType(AxisInvert);
BooleanType(ButtonCommandRemote);
BooleanType(AxisFlip);
struct AxisInformation {
AxisType type = AxisType::None;
AxisInvert invert = AxisInvert::No;
JoystickType joystickType = JoystickType::JoystickLike;
AxisFlip flip = AxisFlip::No;
// The axis values can either go back to 0 when the joystick is released or it can
// stay at the value it was before the joystick was released.
@@ -91,12 +93,14 @@ public:
void setAxisMapping(std::string joystickName, int axis, AxisType mapping,
AxisInvert shouldInvert = AxisInvert::No,
JoystickType joystickType = JoystickType::JoystickLike,
bool isSticky = false, double sensitivity = 0.0
bool isSticky = false, AxisFlip shouldFlip = AxisFlip::No,
double sensitivity = 0.0
);
void setAxisMappingProperty(std::string joystickName, int axis,
std::string propertyUri, float min = 0.f, float max = 1.f,
AxisInvert shouldInvert = AxisInvert::No, bool isRemote = true
AxisInvert shouldInvert = AxisInvert::No, AxisFlip shouldFlip = AxisFlip::No,
bool isRemote = true
);
AxisInformation axisMapping(const std::string& joystickName, int axis) const;
include/openspace/navigation/navigationhandler.h
+6 -4
View File
@@ -105,15 +105,17 @@ public:
JoystickCameraStates::AxisInvert::No,
JoystickCameraStates::JoystickType joystickType =
JoystickCameraStates::JoystickType::JoystickLike,
bool isSticky = false, double sensitivity = 0.0
);
bool isSticky = false,
JoystickCameraStates::AxisFlip shouldFlip = JoystickCameraStates::AxisFlip::No,
double sensitivity = 0.0);
void setJoystickAxisMappingProperty(std::string joystickName,
int axis, std::string propertyUri,
float min = 0.f, float max = 1.f,
JoystickCameraStates::AxisInvert shouldInvert =
JoystickCameraStates::AxisInvert::No, bool isRemote = true
);
JoystickCameraStates::AxisInvert::No,
JoystickCameraStates::AxisFlip shouldFlip = JoystickCameraStates::AxisFlip::No,
bool isRemote = true);
JoystickCameraStates::AxisInformation joystickAxisMapping(
const std::string& joystickName, int axis) const;