MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-19 14:53:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Toggle for VR device visibility on wrist overlay

Browse Source
This commit is contained in:
Natsumi
2020-10-21 21:22:17 +13:00
committed by pypy
parent a80bfc71bc
commit a16875bfc2
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
html/src/app.js
View File

@@ -5479,14 +5479,17 @@ CefSharp.BindObjectAsync(
$app.data.openVR = VRCXStorage.GetBool('openVR'); $app.data.openVR = VRCXStorage.GetBool('openVR');
$app.data.openVRAlways = VRCXStorage.GetBool('openVRAlways'); $app.data.openVRAlways = VRCXStorage.GetBool('openVRAlways');
$app.data.hidePrivateFromFeed = VRCXStorage.GetBool('VRCX_hidePrivateFromFeed'); $app.data.hidePrivateFromFeed = VRCXStorage.GetBool('VRCX_hidePrivateFromFeed');
$app.data.hideDevicesFromFeed = VRCXStorage.GetBool('VRCX_hideDevicesFromFeed');
var saveOpenVROption = function () { var saveOpenVROption = function () {
VRCXStorage.SetBool('openVR', this.openVR); VRCXStorage.SetBool('openVR', this.openVR);
VRCXStorage.SetBool('openVRAlways', this.openVRAlways); VRCXStorage.SetBool('openVRAlways', this.openVRAlways);
VRCXStorage.SetBool('VRCX_hidePrivateFromFeed', this.hidePrivateFromFeed); VRCXStorage.SetBool('VRCX_hidePrivateFromFeed', this.hidePrivateFromFeed);
VRCXStorage.SetBool('VRCX_hideDevicesFromFeed', this.hideDevicesFromFeed);
}; };
$app.watch.openVR = saveOpenVROption; $app.watch.openVR = saveOpenVROption;
$app.watch.openVRAlways = saveOpenVROption; $app.watch.openVRAlways = saveOpenVROption;
$app.watch.hidePrivateFromFeed = saveOpenVROption; $app.watch.hidePrivateFromFeed = saveOpenVROption;
$app.watch.hideDevicesFromFeed = saveOpenVROption;
$app.data.isDarkMode = VRCXStorage.GetBool('isDarkMode'); $app.data.isDarkMode = VRCXStorage.GetBool('isDarkMode');
$appDarkStyle.disabled = $app.data.isDarkMode === false; $appDarkStyle.disabled = $app.data.isDarkMode === false;
$app.watch.isDarkMode = function () { $app.watch.isDarkMode = function () {

3
html/src/index.pug
View File

@@ -497,6 +497,9 @@ html
div(style="font-size:12px;margin-top:5px") div(style="font-size:12px;margin-top:5px")
span(style="display:inline-block;min-width:150px") Force Run span(style="display:inline-block;min-width:150px") Force Run
el-switch(v-model="openVRAlways") el-switch(v-model="openVRAlways")
div(style="font-size:12px;margin-top:5px")
span(style="display:inline-block;min-width:150px") Hide VR devices
el-switch(v-model="hideDevicesFromFeed")
div(style="font-size:12px;margin-top:5px") div(style="font-size:12px;margin-top:5px")
span(style="display:inline-block;min-width:150px") Hide Private worlds span(style="display:inline-block;min-width:150px") Hide Private worlds
el-switch(v-model="hidePrivateFromFeed") el-switch(v-model="hidePrivateFromFeed")

17
html/src/vr.js
View File

@@ -664,12 +664,17 @@ CefSharp.BindObjectAsync(
VRCX.CpuUsage().then((cpuUsage) => { VRCX.CpuUsage().then((cpuUsage) => {
this.cpuUsage = cpuUsage.toFixed(2); this.cpuUsage = cpuUsage.toFixed(2);
}); });
VRCX.GetVRDevices().then((devices) => { if (VRCXStorage.GetBool('VRCX_hideDevicesFromFeed') === false) {
devices.forEach((device) => { VRCX.GetVRDevices().then((devices) => {
device[2] = parseInt(device[2], 10); devices.forEach((device) => {
}); device[2] = parseInt(device[2], 10);
this.devices = devices; });
}); this.devices = devices;
});
}
else {
this.devices = "";
}
this.updateSharedFeed(); this.updateSharedFeed();
}; };

2
html/src/vr.pug
View File

@@ -91,8 +91,6 @@ html
img(v-else src="images/other_status_ready.png" style="width:32px;height:32px") img(v-else src="images/other_status_ready.png" style="width:32px;height:32px")
br br
span {{ device[2] }}% span {{ device[2] }}%
div(v-else)
span No SteamVR Devices
.x-container .x-container
span(style="float:right") {{ currentTime | formatDate('YYYY-MM-DD HH:MI:SS AMPM') }} span(style="float:right") {{ currentTime | formatDate('YYYY-MM-DD HH:MI:SS AMPM') }}
span CPU {{ cpuUsage }}% span CPU {{ cpuUsage }}%