History

Merge remote-tracking branch 'overte/master' into application

HifiExperiments committed 1 year ago

Commit 22bd86f2 parents 7f4efaf 27f4ce4100 files · +1224 −1249Browse files

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

Unified · Split

interface/src/Application.cpp+2−0
@@ -159,6 +159,7 @@ const bool DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR = true; · 158 unmodified lines
159const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false;159const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false;
160const bool DEFAULT_PREFER_STYLUS_OVER_LASER = false;160const bool DEFAULT_PREFER_STYLUS_OVER_LASER = false;
161const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false;161const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false;
162const bool DEFAULT_SHOW_GRAPHICS_ICON = true;
162const bool DEFAULT_MINI_TABLET_ENABLED = false;163const bool DEFAULT_MINI_TABLET_ENABLED = false;
163const bool DEFAULT_AWAY_STATE_WHEN_FOCUS_LOST_IN_VR_ENABLED = true;164const bool DEFAULT_AWAY_STATE_WHEN_FOCUS_LOST_IN_VR_ENABLED = true;
164 165
@@ -224,6 +225,7 @@ Application::Application( · 59 unmodified lines
224 _hmdTabletBecomesToolbarSetting("hmdTabletBecomesToolbar", DEFAULT_HMD_TABLET_BECOMES_TOOLBAR),225 _hmdTabletBecomesToolbarSetting("hmdTabletBecomesToolbar", DEFAULT_HMD_TABLET_BECOMES_TOOLBAR),
225 _preferStylusOverLaserSetting("preferStylusOverLaser", DEFAULT_PREFER_STYLUS_OVER_LASER),226 _preferStylusOverLaserSetting("preferStylusOverLaser", DEFAULT_PREFER_STYLUS_OVER_LASER),
226 _preferAvatarFingerOverStylusSetting("preferAvatarFingerOverStylus", DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS),227 _preferAvatarFingerOverStylusSetting("preferAvatarFingerOverStylus", DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS),
228 _showGraphicsIconSetting("showGraphicsIcon", DEFAULT_SHOW_GRAPHICS_ICON),
227 _constrainToolbarPosition("toolbar/constrainToolbarToCenterX", true),229 _constrainToolbarPosition("toolbar/constrainToolbarToCenterX", true),
228 _awayStateWhenFocusLostInVREnabled("awayStateWhenFocusLostInVREnabled", DEFAULT_AWAY_STATE_WHEN_FOCUS_LOST_IN_VR_ENABLED),230 _awayStateWhenFocusLostInVREnabled("awayStateWhenFocusLostInVREnabled", DEFAULT_AWAY_STATE_WHEN_FOCUS_LOST_IN_VR_ENABLED),
229 _preferredCursor("preferredCursor", DEFAULT_CURSOR_NAME),231 _preferredCursor("preferredCursor", DEFAULT_CURSOR_NAME),