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

Make buttons on SpaceMouse to switch between local and global roll

Browse Source
This commit is contained in:
Malin Ejdbo
2021-05-14 17:09:06 +02:00
parent 64985614bf
commit 9cdd252781
3 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/interaction/joystickcamerastates.cpp
View File

@@ -194,7 +194,7 @@ void JoystickCameraStates::setAxisMapping(int axis, AxisType mapping,
global::joystickInputStates->at(axis).isStatic = true;
}
_prevAxisValues[axis] = 0.f;
_prevAxisValues[axis] = global::joystickInputStates->axis(axis);
}
JoystickCameraStates::AxisInformation JoystickCameraStates::axisMapping(int axis) const {

8
src/interaction/navigationhandler_lua.inl
View File

@@ -227,10 +227,12 @@ int joystickAxis(lua_State* L) {
lua_settop(L, 0);
const bool invert = info.invert;
const bool normalize = info.normalize;
ghoul::lua::push(L, ghoul::to_string(info.type), invert, normalize);
const bool isStatic = info.isStatic;
const float sensitivity = info.sensitivity;
ghoul::lua::push(L, ghoul::to_string(info.type), invert, normalize, isStatic, sensitivity);
ghoul_assert(lua_gettop(L) == 3, "Incorrect number of items left on stack");
return 3;
ghoul_assert(lua_gettop(L) == 5, "Incorrect number of items left on stack");
return 5;
}
int setJoystickAxisDeadzone(lua_State* L) {