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

VR overlay progress bar filter

Browse Source
This commit is contained in:
Natsumi
2021-09-30 00:02:05 +13:00
parent 00bd2b9946
commit 67a54c6965
3 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VRCXVR.cs
View File

@@ -140,7 +140,7 @@ namespace VRCX
{ {
_browser1.RenderToTexture(_texture1); _browser1.RenderToTexture(_texture1);
} }
if ("true".Equals(SharedVariable.Instance.Get("config:vrcx_overlaynotifications"))) if ("true".Equals(SharedVariable.Instance.Get("config:vrcx_overlaynotifications")) || "true".Equals(SharedVariable.Instance.Get("config:vrcx_progresspie")))
{ {
_browser2.RenderToTexture(_texture2); _browser2.RenderToTexture(_texture2);
} }

23
html/src/app.js
View File

@@ -9618,6 +9618,9 @@ speechSynthesis.getVoices();
$app.data.youTubeApiKey = configRepository.getString('VRCX_youtubeAPIKey'); $app.data.youTubeApiKey = configRepository.getString('VRCX_youtubeAPIKey');
$app.data.progressPie = configRepository.getBool('VRCX_progressPie'); $app.data.progressPie = configRepository.getBool('VRCX_progressPie');
$app.data.progressPieFilter = configRepository.getBool(
'VRCX_progressPieFilter'
);
var downloadProgressStateChange = function () { var downloadProgressStateChange = function () {
this.updateVRConfigVars(); this.updateVRConfigVars();
@@ -9629,6 +9632,20 @@ speechSynthesis.getVoices();
if (this.isDarkMode) { if (this.isDarkMode) {
notificationTheme = 'sunset'; notificationTheme = 'sunset';
} }
var progressPie = false;
if (this.progressPie) {
progressPie = true;
if (this.progressPieFilter) {
var L = API.parseLocation(this.lastLocation.location);
var danceWorlds = [
'wrld_f20326da-f1ac-45fc-a062-609723b097b1',
'wrld_42377cf1-c54f-45ed-8996-5875b0573a83'
];
if (!danceWorlds.includes(L.worldId)) {
progressPie = false;
}
}
}
var VRConfigVars = { var VRConfigVars = {
notificationTTS: this.notificationTTS, notificationTTS: this.notificationTTS,
notificationTTSVoice: this.notificationTTSVoice, notificationTTSVoice: this.notificationTTSVoice,
@@ -9642,7 +9659,7 @@ speechSynthesis.getVoices();
isGameRunning: this.isGameRunning, isGameRunning: this.isGameRunning,
isGameNoVR: this.isGameNoVR, isGameNoVR: this.isGameNoVR,
downloadProgress: this.downloadProgress, downloadProgress: this.downloadProgress,
progressPie: this.progressPie progressPie
}; };
var json = JSON.stringify(VRConfigVars); var json = JSON.stringify(VRConfigVars);
AppApi.ExecuteVrFeedFunction('configUpdate', json); AppApi.ExecuteVrFeedFunction('configUpdate', json);
@@ -14478,6 +14495,10 @@ speechSynthesis.getVoices();
$app.methods.changeYouTubeApi = function () { $app.methods.changeYouTubeApi = function () {
configRepository.setBool('VRCX_youtubeAPI', this.youTubeApi); configRepository.setBool('VRCX_youtubeAPI', this.youTubeApi);
configRepository.setBool('VRCX_progressPie', this.progressPie); configRepository.setBool('VRCX_progressPie', this.progressPie);
configRepository.setBool(
'VRCX_progressPieFilter',
this.progressPieFilter
);
this.updateVRConfigVars(); this.updateVRConfigVars();
}; };

8
html/src/index.pug
View File

@@ -937,10 +937,14 @@ html
span.name Enabled span.name Enabled
el-switch(v-model="youTubeApi" @change="changeYouTubeApi") el-switch(v-model="youTubeApi" @change="changeYouTubeApi")
div.options-container-item div.options-container-item
span.name Progress pie overlay for videos el-button(size="small" icon="el-icon-caret-right" @click="showYouTubeApiDialog") YouTube API Key
span.header Progress pie overlay for videos
div.options-container-item
span.name Enable
el-switch(v-model="progressPie" @change="changeYouTubeApi") el-switch(v-model="progressPie" @change="changeYouTubeApi")
div.options-container-item div.options-container-item
el-button(size="small" icon="el-icon-caret-right" @click="showYouTubeApiDialog") YouTube API Key span.name Dance worlds only
el-switch(v-model="progressPieFilter" @change="changeYouTubeApi")
div.options-container div.options-container
span.header VRCX Cache/Debug span.header VRCX Cache/Debug
div.options-container-item div.options-container-item