History

Exposed sixense and mouse options and oculus UI angle to preferences

barnold1953 committed 12 years ago

Commit e4a02751 parent e8ba3c89 files · +367 −15Browse files

Showing the changes to interface/src/Menu.cpp (1 of 9 files). Show all

Unified · Split

interface/src/Menu.cpp+5−1
@@ -45,6 +45,7 @@ · 44 unmodified lines
45#include "ui/ModelsBrowser.h"45#include "ui/ModelsBrowser.h"
46#include "ui/LoginDialog.h"46#include "ui/LoginDialog.h"
47#include "ui/NodeBounds.h"47#include "ui/NodeBounds.h"
48#include "devices/OculusManager.h"
48 49
49 50
50Menu* Menu::_instance = NULL;51Menu* Menu::_instance = NULL;
@@ -83,6 +84,7 @@ Menu::Menu() : · 32 unmodified lines
83 _audioJitterBufferSamples(0),84 _audioJitterBufferSamples(0),
84 _bandwidthDialog(NULL),85 _bandwidthDialog(NULL),
85 _fieldOfView(DEFAULT_FIELD_OF_VIEW_DEGREES),86 _fieldOfView(DEFAULT_FIELD_OF_VIEW_DEGREES),
87 _realWorldFieldOfView(DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES),
86 _faceshiftEyeDeflection(DEFAULT_FACESHIFT_EYE_DEFLECTION),88 _faceshiftEyeDeflection(DEFAULT_FACESHIFT_EYE_DEFLECTION),
87 _frustumDrawMode(FRUSTUM_DRAW_MODE_ALL),89 _frustumDrawMode(FRUSTUM_DRAW_MODE_ALL),
88 _viewFrustumOffset(DEFAULT_FRUSTUM_OFFSET),90 _viewFrustumOffset(DEFAULT_FRUSTUM_OFFSET),
@@ -91,6 +93,9 @@ Menu::Menu() : · 2 unmodified lines
91 _lodToolsDialog(NULL),93 _lodToolsDialog(NULL),
92 _maxVoxels(DEFAULT_MAX_VOXELS_PER_SYSTEM),94 _maxVoxels(DEFAULT_MAX_VOXELS_PER_SYSTEM),
93 _voxelSizeScale(DEFAULT_OCTREE_SIZE_SCALE),95 _voxelSizeScale(DEFAULT_OCTREE_SIZE_SCALE),
96 _oculusUIAngularSize(DEFAULT_OCULUS_UI_ANGULAR_SIZE),
97 _sixenseReticleMoveSpeed(DEFAULT_SIXENSE_RETICLE_MOVE_SPEED),
98 _invertSixenseButtons(DEFAULT_INVERT_SIXENSE_MOUSE_BUTTONS),
94 _automaticAvatarLOD(true),99 _automaticAvatarLOD(true),
95 _avatarLODDecreaseFPS(DEFAULT_ADJUST_AVATAR_LOD_DOWN_FPS),100 _avatarLODDecreaseFPS(DEFAULT_ADJUST_AVATAR_LOD_DOWN_FPS),
96 _avatarLODIncreaseFPS(ADJUST_LOD_UP_FPS),101 _avatarLODIncreaseFPS(ADJUST_LOD_UP_FPS),
@@ -387,7 +392,6 @@ Menu::Menu() : · 290 unmodified lines
387 392
388 QMenu* sixenseOptionsMenu = developerMenu->addMenu("Sixense Options");393 QMenu* sixenseOptionsMenu = developerMenu->addMenu("Sixense Options");
389 addCheckableActionToQMenuAndActionHash(sixenseOptionsMenu, MenuOption::SixenseMouseInput, 0, true);394 addCheckableActionToQMenuAndActionHash(sixenseOptionsMenu, MenuOption::SixenseMouseInput, 0, true);
390 addCheckableActionToQMenuAndActionHash(sixenseOptionsMenu, MenuOption::SixenseInvertInputButtons, 0, false);
391 395
392 QMenu* handOptionsMenu = developerMenu->addMenu("Hand Options");396 QMenu* handOptionsMenu = developerMenu->addMenu("Hand Options");
393 397