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

Merge overlays, move overlay to separate process (#44)

Browse Source 
* refactor: merge two overlay offScreenBrowser into one

* Electron support for shared overlay

* Separate overlay into its own process

* fix: invalid overlay texture size

* Handle duplicate processes

* Remove logging

---------

Co-authored-by: pa <maplenagisa@gmail.com>
Co-authored-by: rs189 <35667100+rs189@users.noreply.github.com>
This commit is contained in:
Natsumi
2026-01-12 11:31:10 +13:00
committed by Natsumi
parent 9135adf6d1
commit d2fd205476
41 changed files with 1122 additions and 2108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dotnet/AppApi/Cef/AppApiCef.cs
+17 -17
View File
@@ -7,6 +7,7 @@ using System.Globalization;
using System.IO;
using System.Security.Cryptography;
using System.Text;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -31,17 +32,15 @@ namespace VRCX
public override void SetVR(bool active, bool hmdOverlay, bool wristOverlay, bool menuButton, int overlayHand)
{
Program.VRCXVRInstance.SetActive(active, hmdOverlay, wristOverlay, menuButton, overlayHand);
}
public override void RefreshVR()
{
Program.VRCXVRInstance.Restart();
}
public override void RestartVR()
{
Program.VRCXVRInstance.Restart();
var updateVars = new OverlayVars
{
Active = active,
HmdOverlay = hmdOverlay,
WristOverlay = wristOverlay,
MenuButton = menuButton,
OverlayHand = overlayHand
};
OverlayServer.Instance.UpdateVars(updateVars);
}
public override void SetZoom(double zoomLevel)
@@ -116,14 +115,15 @@ namespace VRCX
return File.Exists(Path.Join(Program.AppDataDirectory, "update.exe"));
}
public override void ExecuteVrFeedFunction(string function, string json)
{
Program.VRCXVRInstance.ExecuteVrFeedFunction(function, json);
}
public override void ExecuteVrOverlayFunction(string function, string json)
{
Program.VRCXVRInstance.ExecuteVrOverlayFunction(function, json);
var message = new OverlayMessage
{
Type = OverlayMessageType.JsFunctionCall,
FunctionName = function,
Data = json
};
OverlayServer.Instance.SendMessage(message);
}
public override void FocusWindow()
Dotnet/AppApi/Cef/AppApiVrCef.cs
-88
View File
@@ -1,88 +0,0 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using CefSharp;
namespace VRCX
{
public class AppApiVrCef : AppApiVr
{
static AppApiVrCef()
{
Instance = new AppApiVrCef();
}
public override void Init()
{
// Create Instance before Cef tries to bind it
}
public override void VrInit()
{
if (MainForm.Instance?.Browser != null && !MainForm.Instance.Browser.IsLoading && MainForm.Instance.Browser.CanExecuteJavascriptInMainFrame)
MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia?.vr.vrInit();");
}
public override void ToggleSystemMonitor(bool enabled)
{
SystemMonitorCef.Instance.Start(enabled);
}
/// <summary>
/// Returns the current CPU usage as a percentage.
/// </summary>
/// <returns>The current CPU usage as a percentage.</returns>
public override float CpuUsage()
{
return SystemMonitorCef.Instance.CpuUsage;
}
/// <summary>
/// Returns an array of arrays containing information about the connected VR devices.
/// Each sub-array contains the type of device and its current state
/// </summary>
/// <returns>An array of arrays containing information about the connected VR devices.</returns>
public override string[][] GetVRDevices()
{
return Program.VRCXVRInstance.GetDevices();
}
/// <summary>
/// Returns the number of milliseconds that the system has been running.
/// </summary>
/// <returns>The number of milliseconds that the system has been running.</returns>
public override double GetUptime()
{
return SystemMonitorCef.Instance.UpTime;
}
/// <summary>
/// Returns the current language of the operating system.
/// </summary>
/// <returns>The current language of the operating system.</returns>
public override string CurrentCulture()
{
return CultureInfo.CurrentCulture.ToString();
}
public override string CustomVrScript()
{
var filePath = Path.Join(Program.AppDataDirectory, "customvr.js");
if (File.Exists(filePath))
return File.ReadAllText(filePath);
return string.Empty;
}
public override List<KeyValuePair<string, string>> GetExecuteVrFeedFunctionQueue()
{
throw new NotImplementedException("GetExecuteVrFeedFunctionQueue is not implemented in AppApiVrCef.");
}
public override List<KeyValuePair<string, string>> GetExecuteVrOverlayFunctionQueue()
{
throw new NotImplementedException("GetExecuteVrOverlayFunctionQueue is not implemented in AppApiVrCef.");
}
}
}
Dotnet/AppApi/Cef/GameHandler.cs
+1 -5
View File
@@ -23,7 +23,6 @@ namespace VRCX
{
var isGameRunning = false;
var isSteamVRRunning = false;
var isHmdAfk = false;
if (ProcessMonitor.Instance.IsProcessRunning("VRChat"))
isGameRunning = true;
@@ -31,12 +30,9 @@ namespace VRCX
if (ProcessMonitor.Instance.IsProcessRunning("vrserver"))
isSteamVRRunning = true;
if (Program.VRCXVRInstance != null)
isHmdAfk = Program.VRCXVRInstance.IsHmdAfk;
// TODO: fix this throwing an exception for being called before the browser is ready. somehow it gets past the checks
if (MainForm.Instance?.Browser != null && !MainForm.Instance.Browser.IsLoading && MainForm.Instance.Browser.CanExecuteJavascriptInMainFrame)
MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia?.game.updateIsGameRunning", isGameRunning, isSteamVRRunning, isHmdAfk);
MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia?.game.updateIsGameRunning", isGameRunning, isSteamVRRunning);
}
public override bool IsGameRunning()
Dotnet/AppApi/Common/AppApiCommonBase.cs
-3
View File
@@ -9,8 +9,6 @@ namespace VRCX
// AppApi
public abstract void ShowDevTools();
public abstract void SetVR(bool active, bool hmdOverlay, bool wristOverlay, bool menuButton, int overlayHand);
public abstract void RefreshVR();
public abstract void RestartVR();
public abstract void SetZoom(double zoomLevel);
public abstract Task<double> GetZoom();
public abstract void DesktopNotification(string BoldText, string Text = "", string Image = "");
@@ -18,7 +16,6 @@ namespace VRCX
public abstract void RestartApplication(bool isUpgrade);
public abstract bool CheckForUpdateExe();
public abstract void ExecuteVrFeedFunction(string function, string json);
public abstract void ExecuteVrOverlayFunction(string function, string json);
public abstract void FocusWindow();
public abstract void ChangeTheme(int value);
Dotnet/AppApi/Common/AppApiVrCommon.cs
-18
View File
@@ -1,18 +0,0 @@
using System.Collections.Generic;
namespace VRCX;
public abstract partial class AppApiVr
{
public static AppApiVr Instance;
public abstract void Init();
public abstract void VrInit();
public abstract void ToggleSystemMonitor(bool enabled);
public abstract float CpuUsage();
public abstract string[][] GetVRDevices();
public abstract double GetUptime();
public abstract string CurrentCulture();
public abstract string CustomVrScript();
public abstract List<KeyValuePair<string, string>> GetExecuteVrFeedFunctionQueue();
public abstract List<KeyValuePair<string, string>> GetExecuteVrOverlayFunctionQueue();
}
Dotnet/AppApi/Electron/AppApiElectron.cs
-15
View File
@@ -19,16 +19,6 @@ namespace VRCX
Program.VRCXVRInstance.SetActive(active, hmdOverlay, wristOverlay, menuButton, overlayHand);
}
public override void RefreshVR()
{
Program.VRCXVRInstance.Restart();
}
public override void RestartVR()
{
Program.VRCXVRInstance.Restart();
}
public override void SetZoom(double zoomLevel)
{
}
@@ -51,11 +41,6 @@ namespace VRCX
return false;
}
public override void ExecuteVrFeedFunction(string function, string json)
{
Program.VRCXVRInstance.ExecuteVrFeedFunction(function, json);
}
public override void ExecuteVrOverlayFunction(string function, string json)
{
Program.VRCXVRInstance.ExecuteVrOverlayFunction(function, json);
Dotnet/AppApi/Electron/AppApiVrElectron.cs
-97
View File
@@ -1,97 +0,0 @@
using System.Collections.Generic;
using System.Globalization;
using System.IO;
namespace VRCX
{
public class AppApiVrElectron : AppApiVr
{
static AppApiVrElectron()
{
Instance = new AppApiVrElectron();
}
public override void Init()
{
}
public override void VrInit()
{
}
public override List<KeyValuePair<string, string>> GetExecuteVrFeedFunctionQueue()
{
var list = new List<KeyValuePair<string, string>>();
while (Program.VRCXVRInstance.GetExecuteVrFeedFunctionQueue().TryDequeue(out var item))
{
list.Add(item);
}
return list;
}
public override List<KeyValuePair<string, string>> GetExecuteVrOverlayFunctionQueue()
{
var list = new List<KeyValuePair<string, string>>();
while (Program.VRCXVRInstance.GetExecuteVrOverlayFunctionQueue().TryDequeue(out var item))
{
list.Add(item);
}
return list;
}
public override void ToggleSystemMonitor(bool enabled)
{
SystemMonitorElectron.Instance.Start(enabled);
}
/// <summary>
/// Returns the current CPU usage as a percentage.
/// </summary>
/// <returns>The current CPU usage as a percentage.</returns>
public override float CpuUsage()
{
return SystemMonitorElectron.Instance.CpuUsage;
}
/// <summary>
/// Returns an array of arrays containing information about the connected VR devices.
/// Each sub-array contains the type of device and its current state
/// </summary>
/// <returns>An array of arrays containing information about the connected VR devices.</returns>
public override string[][] GetVRDevices()
{
return Program.VRCXVRInstance.GetDevices();
}
/// <summary>
/// Returns the number of milliseconds that the system has been running.
/// </summary>
/// <returns>The number of milliseconds that the system has been running.</returns>
public override double GetUptime()
{
return SystemMonitorElectron.Instance.UpTime;
}
/// <summary>
/// Returns the current language of the operating system.
/// </summary>
/// <returns>The current language of the operating system.</returns>
public override string CurrentCulture()
{
return CultureInfo.CurrentCulture.ToString();
}
/// <summary>
/// Returns the file path of the custom user js file, if it exists.
/// </summary>
/// <returns>The file path of the custom user js file, or an empty string if it doesn't exist.</returns>
public override string CustomVrScript()
{
var filePath = Path.Join(Program.AppDataDirectory, "customvr.js");
if (File.Exists(filePath))
return File.ReadAllText(filePath);
return string.Empty;
}
}
}