mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-21 12:29:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/multiple-joysticks' into project/spaceship-installation

Browse Source 
* Resolve conflicts in joystickcamerastates.cpp
This commit is contained in:
Malin E
2021-12-07 11:22:53 +01:00
parent 08cdfd3125 cfd8b145f3
commit de54a5c09b
8 changed files with 176 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/openspace/navigation/navigationhandler.h
View File

@@ -98,7 +98,7 @@ public:
void mousePositionCallback(double x, double y);
void mouseScrollWheelCallback(double pos);
void setJoystickAxisMapping(const std::string& joystickName,
void setJoystickAxisMapping(std::string joystickName,
int axis, JoystickCameraStates::AxisType mapping,
JoystickCameraStates::AxisInvert shouldInvert =
JoystickCameraStates::AxisInvert::No,
@@ -107,8 +107,8 @@ public:
bool isSticky = false, double sensitivity = 0.0
);
void setJoystickAxisMappingProperty(const std::string& joystickName,
int axis, const std::string& propertyUri,
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