MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-06 22:46:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes

Browse Source
This commit is contained in:
Natsumi
2024-06-26 23:27:21 +12:00
parent a1118ff43d
commit 5ff24ebe9b
2 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dotnet/Overlay/VRCXVR.cs
+7 -5
View File
@@ -42,6 +42,7 @@ namespace VRCX
private Texture2D _texture2; private Texture2D _texture2;
private Thread _thread; private Thread _thread;
private bool _wristOverlayActive; private bool _wristOverlayActive;
private DateTime _nextOverlayUpdate;
public bool IsHmdAfk { get; private set; } public bool IsHmdAfk { get; private set; }
static VRCXVR() static VRCXVR()
@@ -129,7 +130,7 @@ namespace VRCX
var e = new VREvent_t(); var e = new VREvent_t();
var nextInit = DateTime.MinValue; var nextInit = DateTime.MinValue;
var nextDeviceUpdate = DateTime.MinValue; var nextDeviceUpdate = DateTime.MinValue;
var nextOverlay = DateTime.MinValue; _nextOverlayUpdate = DateTime.MinValue;
var overlayIndex = OpenVR.k_unTrackedDeviceIndexInvalid; var overlayIndex = OpenVR.k_unTrackedDeviceIndexInvalid;
var overlayVisible1 = false; var overlayVisible1 = false;
var overlayVisible2 = false; var overlayVisible2 = false;
@@ -207,7 +208,7 @@ namespace VRCX
UpdateDevices(system, ref overlayIndex); UpdateDevices(system, ref overlayIndex);
if (overlayIndex != OpenVR.k_unTrackedDeviceIndexInvalid) if (overlayIndex != OpenVR.k_unTrackedDeviceIndexInvalid)
{ {
nextOverlay = DateTime.UtcNow.AddSeconds(10); _nextOverlayUpdate = DateTime.UtcNow.AddSeconds(10);
} }
nextDeviceUpdate = DateTime.UtcNow.AddSeconds(0.1); nextDeviceUpdate = DateTime.UtcNow.AddSeconds(0.1);
@@ -226,7 +227,7 @@ namespace VRCX
logger.Error(err); logger.Error(err);
} }
err = ProcessOverlay1(overlay, ref overlayHandle1, ref overlayVisible1, dashboardVisible, overlayIndex, nextOverlay); err = ProcessOverlay1(overlay, ref overlayHandle1, ref overlayVisible1, dashboardVisible, overlayIndex);
if (err != EVROverlayError.None && if (err != EVROverlayError.None &&
overlayHandle1 != 0) overlayHandle1 != 0)
{ {
@@ -397,6 +398,7 @@ namespace VRCX
if (system.GetControllerState(i, ref state, (uint)Marshal.SizeOf(state)) && if (system.GetControllerState(i, ref state, (uint)Marshal.SizeOf(state)) &&
(state.ulButtonPressed & (_menuButton ? 2u : isOculus ? 128u : 4u)) != 0) (state.ulButtonPressed & (_menuButton ? 2u : isOculus ? 128u : 4u)) != 0)
{ {
_nextOverlayUpdate = DateTime.MinValue;
if (role == ETrackedControllerRole.LeftHand) if (role == ETrackedControllerRole.LeftHand)
{ {
Array.Copy(_translationLeft, _translation, 3); Array.Copy(_translationLeft, _translation, 3);
@@ -549,7 +551,7 @@ namespace VRCX
return err; return err;
} }
internal EVROverlayError ProcessOverlay1(CVROverlay overlay, ref ulong overlayHandle, ref bool overlayVisible, bool dashboardVisible, uint overlayIndex, DateTime nextOverlay) internal EVROverlayError ProcessOverlay1(CVROverlay overlay, ref ulong overlayHandle, ref bool overlayVisible, bool dashboardVisible, uint overlayIndex)
{ {
var err = EVROverlayError.None; var err = EVROverlayError.None;
@@ -622,7 +624,7 @@ namespace VRCX
} }
if (!dashboardVisible && if (!dashboardVisible &&
DateTime.UtcNow.CompareTo(nextOverlay) <= 0) DateTime.UtcNow.CompareTo(_nextOverlayUpdate) <= 0)
{ {
var texture = new Texture_t var texture = new Texture_t
{ {
html/src/app.js
+28 -8
View File
@@ -11847,7 +11847,8 @@ speechSynthesis.getVoices();
groupOnNameplate: user.groupOnNameplate, groupOnNameplate: user.groupOnNameplate,
showGroupBadgeToOthers: user.showGroupBadgeToOthers, showGroupBadgeToOthers: user.showGroupBadgeToOthers,
showSocialRank: user.showSocialRank, showSocialRank: user.showSocialRank,
useImpostorAsFallback: user.useImpostorAsFallback useImpostorAsFallback: user.useImpostorAsFallback,
platform: user.platform
}); });
this.photonUserJoin(id, user, gameLogDate); this.photonUserJoin(id, user, gameLogDate);
} }
@@ -11884,7 +11885,8 @@ speechSynthesis.getVoices();
groupOnNameplate: user.groupOnNameplate, groupOnNameplate: user.groupOnNameplate,
showGroupBadgeToOthers: user.showGroupBadgeToOthers, showGroupBadgeToOthers: user.showGroupBadgeToOthers,
showSocialRank: user.showSocialRank, showSocialRank: user.showSocialRank,
useImpostorAsFallback: user.useImpostorAsFallback useImpostorAsFallback: user.useImpostorAsFallback,
platform: user.platform
}); });
this.photonUserJoin(id, user, gameLogDate); this.photonUserJoin(id, user, gameLogDate);
} }
@@ -11918,7 +11920,8 @@ speechSynthesis.getVoices();
groupOnNameplate: user.groupOnNameplate, groupOnNameplate: user.groupOnNameplate,
showGroupBadgeToOthers: user.showGroupBadgeToOthers, showGroupBadgeToOthers: user.showGroupBadgeToOthers,
showSocialRank: user.showSocialRank, showSocialRank: user.showSocialRank,
useImpostorAsFallback: user.useImpostorAsFallback useImpostorAsFallback: user.useImpostorAsFallback,
platform: user.platform
}); });
break; break;
case 255: case 255:
@@ -11968,7 +11971,8 @@ speechSynthesis.getVoices();
data.Parameters[249].showGroupBadgeToOthers, data.Parameters[249].showGroupBadgeToOthers,
showSocialRank: data.Parameters[249].showSocialRank, showSocialRank: data.Parameters[249].showSocialRank,
useImpostorAsFallback: useImpostorAsFallback:
data.Parameters[249].useImpostorAsFallback data.Parameters[249].useImpostorAsFallback,
platform: data.Parameters[249].platform
}); });
this.photonUserJoin( this.photonUserJoin(
data.Parameters[254], data.Parameters[254],
@@ -18130,6 +18134,13 @@ speechSynthesis.getVoices();
return { isPC, isQuest, isIos }; return { isPC, isQuest, isIos };
}; };
$app.methods.replaceVrcPackageUrl = function (url) {
if (!url) {
return '';
}
return url.replace('https://api.vrchat.cloud/', 'https://vrchat.com/');
};
$app.methods.selectCurrentInstanceRow = function (val) { $app.methods.selectCurrentInstanceRow = function (val) {
if (val === null) { if (val === null) {
return; return;
@@ -19306,7 +19317,11 @@ speechSynthesis.getVoices();
this.showSetWorldTagsDialog(); this.showSetWorldTagsDialog();
break; break;
case 'Download Unity Package': case 'Download Unity Package':
this.openExternalLink(this.worldDialog.ref.unityPackageUrl); this.openExternalLink(
this.replaceVrcPackageUrl(
this.worldDialog.ref.unityPackageUrl
)
);
break; break;
default: default:
this.$confirm(`Continue? ${command}`, 'Confirm', { this.$confirm(`Continue? ${command}`, 'Confirm', {
@@ -19610,7 +19625,11 @@ speechSynthesis.getVoices();
this.showSetAvatarTagsDialog(D.id); this.showSetAvatarTagsDialog(D.id);
break; break;
case 'Download Unity Package': case 'Download Unity Package':
this.openExternalLink(this.avatarDialog.ref.unityPackageUrl); this.openExternalLink(
this.replaceVrcPackageUrl(
this.avatarDialog.ref.unityPackageUrl
)
);
break; break;
case 'Add Favorite': case 'Add Favorite':
this.showFavoriteDialog('avatar', D.id); this.showFavoriteDialog('avatar', D.id);
@@ -26057,7 +26076,8 @@ speechSynthesis.getVoices();
groupOnNameplate: user.groupOnNameplate, groupOnNameplate: user.groupOnNameplate,
showGroupBadgeToOthers: user.showGroupBadgeToOthers, showGroupBadgeToOthers: user.showGroupBadgeToOthers,
showSocialRank: user.showSocialRank, showSocialRank: user.showSocialRank,
useImpostorAsFallback: user.useImpostorAsFallback useImpostorAsFallback: user.useImpostorAsFallback,
platform: user.platform
}); });
} }
} }
@@ -26114,7 +26134,7 @@ speechSynthesis.getVoices();
var data = input.replace(`import/${type}/`, ''); var data = input.replace(`import/${type}/`, '');
if (type === 'avatar') { if (type === 'avatar') {
this.showAvatarImportDialog(); this.showAvatarImportDialog();
this.worldImportDialog.input = data; this.avatarImportDialog.input = data;
} else if (type === 'world') { } else if (type === 'world') {
this.showWorldImportDialog(); this.showWorldImportDialog();
this.worldImportDialog.input = data; this.worldImportDialog.input = data;