Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 15:47:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix initial tablet scale

Browse source
This commit is contained in:
David Rowe 2018-09-29 12:42:41 +12:00
parent 7b7447739a
commit 8464a70c9e
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/system/libraries/utils.js
View file

@ -356,13 +356,14 @@ getTabletWidthFromSettings = function () {
var DEFAULT_TABLET_WIDTH = 0.4375; var DEFAULT_TABLET_WIDTH = 0.4375;
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
var toolbarMode = tablet.toolbarMode; var toolbarMode = tablet.toolbarMode;
var DEFAULT_TABLET_SCALE = 70; var DEFAULT_DESKTOP_TABLET_SCALE = 75;
var tabletScalePercentage = DEFAULT_TABLET_SCALE; var DEFAULT_HMD_TABLET_SCALE = 60;
var tabletScalePercentage = DEFAULT_HMD_TABLET_SCALE;
if (!toolbarMode) { if (!toolbarMode) {
if (HMD.active) { if (HMD.active) {
tabletScalePercentage = Settings.getValue("hmdTabletScale") || DEFAULT_TABLET_SCALE; tabletScalePercentage = Settings.getValue("hmdTabletScale") || DEFAULT_HMD_TABLET_SCALE;
} else { } else {
tabletScalePercentage = Settings.getValue("desktopTabletScale") || DEFAULT_TABLET_SCALE; tabletScalePercentage = Settings.getValue("desktopTabletScale") || DEFAULT_DESKTOP_TABLET_SCALE;
} }
} }
return DEFAULT_TABLET_WIDTH * (tabletScalePercentage / 100); return DEFAULT_TABLET_WIDTH * (tabletScalePercentage / 100);

13
scripts/system/tablet-ui/tabletUI.js
View file

@ -19,11 +19,12 @@
var tabletRezzed = false; var tabletRezzed = false;
var activeHand = null; var activeHand = null;
var DEFAULT_WIDTH = 0.4375; var DEFAULT_WIDTH = 0.4375;
var DEFAULT_TABLET_SCALE = 70; var DEFAULT_DESKTOP_TABLET_SCALE = 75;
var DEFAULT_HMD_TABLET_SCALE = 60;
var preMakeTime = Date.now(); var preMakeTime = Date.now();
var validCheckTime = Date.now(); var validCheckTime = Date.now();
var debugTablet = false; var debugTablet = false;
var tabletScalePercentage = 70.0; var tabletScalePercentage = DEFAULT_HMD_TABLET_SCALE;
var UIWebTablet = null; var UIWebTablet = null;
var MSECS_PER_SEC = 1000.0; var MSECS_PER_SEC = 1000.0;
var MUTE_MICROPHONE_MENU_ITEM = "Mute Microphone"; var MUTE_MICROPHONE_MENU_ITEM = "Mute Microphone";
@ -66,14 +67,14 @@
} }
function getTabletScalePercentageFromSettings() { function getTabletScalePercentageFromSettings() {
checkTablet() checkTablet();
var toolbarMode = gTablet.toolbarMode; var toolbarMode = gTablet.toolbarMode;
var tabletScalePercentage = DEFAULT_TABLET_SCALE; var tabletScalePercentage = DEFAULT_HMD_TABLET_SCALE;
if (!toolbarMode) { if (!toolbarMode) {
if (HMD.active) { if (HMD.active) {
tabletScalePercentage = Settings.getValue("hmdTabletScale") || DEFAULT_TABLET_SCALE; tabletScalePercentage = Settings.getValue("hmdTabletScale") || DEFAULT_HMD_TABLET_SCALE;
} else { } else {
tabletScalePercentage = Settings.getValue("desktopTabletScale") || DEFAULT_TABLET_SCALE; tabletScalePercentage = Settings.getValue("desktopTabletScale") || DEFAULT_DESKTOP_TABLET_SCALE;
} }
} }
return tabletScalePercentage; return tabletScalePercentage;