mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 13:28:09 +02:00
make tablet invisible in secondary-camera if wallet passphrase page is up
This commit is contained in:
parent
a5b94f22fa
commit
8a0b8aa034
1 changed files with 13 additions and 2 deletions
|
@ -9,7 +9,8 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
/* global Tablet, Script, HMD, UserActivityLogger, Entities, Account, Wallet, ContextOverlay, Settings, Camera, Vec3,
|
/* global Tablet, Script, HMD, UserActivityLogger, Entities, Account, Wallet, ContextOverlay, Settings, Camera, Vec3,
|
||||||
Quat, MyAvatar, Clipboard, Menu, Grid, Uuid, GlobalServices, openLoginWindow */
|
Quat, MyAvatar, Clipboard, Menu, Grid, Uuid, GlobalServices, openLoginWindow, Overlays, SoundCache,
|
||||||
|
DesktopPreviewProvider */
|
||||||
/* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
|
/* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
|
||||||
|
|
||||||
var selectionDisplay = null; // for gridTool.js to ignore
|
var selectionDisplay = null; // for gridTool.js to ignore
|
||||||
|
@ -117,6 +118,13 @@ var selectionDisplay = null; // for gridTool.js to ignore
|
||||||
var onWalletScreen = false;
|
var onWalletScreen = false;
|
||||||
var onCommerceScreen = false;
|
var onCommerceScreen = false;
|
||||||
|
|
||||||
|
function setTabletVisibleInSecondaryCamera(visibleInSecondaryCam) {
|
||||||
|
Overlays.editOverlay(HMD.tabletID, { isVisibleInSecondaryCamera : visibleInSecondaryCam });
|
||||||
|
Overlays.editOverlay(HMD.homeButtonID, { isVisibleInSecondaryCamera : visibleInSecondaryCam });
|
||||||
|
Overlays.editOverlay(HMD.homeButtonHighlightIDtabletID, { isVisibleInSecondaryCamera : visibleInSecondaryCam });
|
||||||
|
Overlays.editOverlay(HMD.tabletScreenID, { isVisibleInSecondaryCamera : visibleInSecondaryCam });
|
||||||
|
}
|
||||||
|
|
||||||
function onScreenChanged(type, url) {
|
function onScreenChanged(type, url) {
|
||||||
onMarketplaceScreen = type === "Web" && url.indexOf(MARKETPLACE_URL) !== -1;
|
onMarketplaceScreen = type === "Web" && url.indexOf(MARKETPLACE_URL) !== -1;
|
||||||
var onWalletScreenNow = url.indexOf(MARKETPLACE_WALLET_QML_PATH) !== -1;
|
var onWalletScreenNow = url.indexOf(MARKETPLACE_WALLET_QML_PATH) !== -1;
|
||||||
|
@ -127,6 +135,7 @@ var selectionDisplay = null; // for gridTool.js to ignore
|
||||||
if (isHmdPreviewDisabledBySecurity) {
|
if (isHmdPreviewDisabledBySecurity) {
|
||||||
DesktopPreviewProvider.setPreviewDisabledReason("USER");
|
DesktopPreviewProvider.setPreviewDisabledReason("USER");
|
||||||
Menu.setIsOptionChecked("Disable Preview", false);
|
Menu.setIsOptionChecked("Disable Preview", false);
|
||||||
|
setTabletVisibleInSecondaryCamera(true);
|
||||||
isHmdPreviewDisabledBySecurity = false;
|
isHmdPreviewDisabledBySecurity = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -245,7 +254,7 @@ var selectionDisplay = null; // for gridTool.js to ignore
|
||||||
var wearableDimensions = null;
|
var wearableDimensions = null;
|
||||||
|
|
||||||
if (itemType === "contentSet") {
|
if (itemType === "contentSet") {
|
||||||
console.log("Item is a content set; codepath shouldn't go here.")
|
console.log("Item is a content set; codepath shouldn't go here.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -575,6 +584,7 @@ var selectionDisplay = null; // for gridTool.js to ignore
|
||||||
if (!isHmdPreviewDisabled) {
|
if (!isHmdPreviewDisabled) {
|
||||||
DesktopPreviewProvider.setPreviewDisabledReason("SECURE_SCREEN");
|
DesktopPreviewProvider.setPreviewDisabledReason("SECURE_SCREEN");
|
||||||
Menu.setIsOptionChecked("Disable Preview", true);
|
Menu.setIsOptionChecked("Disable Preview", true);
|
||||||
|
setTabletVisibleInSecondaryCamera(false);
|
||||||
isHmdPreviewDisabledBySecurity = true;
|
isHmdPreviewDisabledBySecurity = true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -582,6 +592,7 @@ var selectionDisplay = null; // for gridTool.js to ignore
|
||||||
if (isHmdPreviewDisabledBySecurity) {
|
if (isHmdPreviewDisabledBySecurity) {
|
||||||
DesktopPreviewProvider.setPreviewDisabledReason("USER");
|
DesktopPreviewProvider.setPreviewDisabledReason("USER");
|
||||||
Menu.setIsOptionChecked("Disable Preview", false);
|
Menu.setIsOptionChecked("Disable Preview", false);
|
||||||
|
setTabletVisibleInSecondaryCamera(true);
|
||||||
isHmdPreviewDisabledBySecurity = false;
|
isHmdPreviewDisabledBySecurity = false;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue