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

Linux: SteamVR overlay support (#1299)

Browse Source 
* fix: open folder and select item on linux

* feat: linux wrist overlay

* feat: linux hmd overlay

* feat: replace unix sockets with shm on linux

* fix: reduce linux wrist overlay fps

* fix: hide electron offscreen windows

* fix: destroy electron offscreen windows when not in use

* fix: open folder and select item on linux

* feat: cpu, uptime and device monitoring on linux

* feat: native wayland gl context with x11 fallback on linux

* fix: use platform agnostic wording for common folders

* fix: crash dumps folder button on linux

* fix: enable missing VR notification options on linux

* fix: update cef, eslint config to include updated AppApiVr names

* merge: rebase linux VR changes to upstream

* Clean up

* Load custom file contents rather than path

Fixes loading custom file in debug mode

* fix: call SetVR on linux as well

* fix: AppApiVrElectron init, properly create and dispose of shm

* Handle avatar history error

* Lint

* Change overlay dispose logic

* macOS DOTNET_ROOT

* Remove moving dotnet bin

* Fix

* fix: init overlay on SteamVR restart

* Fix fetching empty instance, fix user dialog not fetching

* Trim direct access inputs

* Make icon higher res, because mac build would fail 😂

* macOS fixes

* will it build? that's the question

* fix: ensure offscreen windows are ready before vrinit

* will it build? that's the question

* will it build? that's the question

* meow

* one, more, time

* Fix crash and overlay ellipsis

* a

---------

Co-authored-by: Natsumi <cmcooper123@hotmail.com>
This commit is contained in:
rs189
2025-07-19 09:07:43 +09:00
committed by GitHub
parent 53723d37b0
commit a2dc6ba9a4
53 changed files with 10555 additions and 7865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
Dotnet/AppApi/Cef/AppApiVr.cs → Dotnet/AppApi/Cef/AppApiVrCef.cs
View File

@@ -1,43 +1,41 @@
using System;
using System.Diagnostics;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using CefSharp;
namespace VRCX
{
public class AppApiVr
public class AppApiVrCef : AppApiVr
{
public static readonly AppApiVr Instance;
static AppApiVr()
static AppApiVrCef()
{
Instance = new AppApiVr();
Instance = new AppApiVrCef();
}
public void Init()
public override void Init()
{
// Create Instance before Cef tries to bind it
}
public void VrInit()
public override void VrInit()
{
if (MainForm.Instance?.Browser != null && !MainForm.Instance.Browser.IsLoading && MainForm.Instance.Browser.CanExecuteJavascriptInMainFrame)
MainForm.Instance.Browser.ExecuteScriptAsync("$app.store.vr.vrInit", "");
}
public void ToggleSystemMonitor(bool enabled)
public override void ToggleSystemMonitor(bool enabled)
{
SystemMonitor.Instance.Start(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 float CpuUsage()
public override float CpuUsage()
{
return SystemMonitor.Instance.CpuUsage;
return SystemMonitorCef.Instance.CpuUsage;
}
/// <summary>
@@ -45,7 +43,7 @@ namespace VRCX
/// 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 string[][] GetVRDevices()
public override string[][] GetVRDevices()
{
return Program.VRCXVRInstance.GetDevices();
}
@@ -54,36 +52,42 @@ namespace VRCX
/// 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 double GetUptime()
public override double GetUptime()
{
return SystemMonitor.Instance.UpTime;
return SystemMonitorCef.Instance.UpTime;
}
/// <summary>
/// Returns the current language of the operating system.
/// </summary>
/// <returns>The current language of the operating system.</returns>
public string CurrentCulture()
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 string CustomVrScriptPath()
public override string CustomVrScript()
{
var output = string.Empty;
var filePath = Path.Join(Program.AppDataDirectory, "customvr.js");
if (File.Exists(filePath))
output = filePath;
return output;
return File.ReadAllText(filePath);
return string.Empty;
}
public bool IsRunningUnderWine()
public override bool IsRunningUnderWine()
{
return Wine.GetIfWine();
}
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.");
}
}
}

16
Dotnet/AppApi/Common/AppApiCommon.cs
View File

@@ -96,22 +96,22 @@ namespace VRCX
});
}
public string CustomCssPath()
public string CustomCss()
{
var output = string.Empty;
var filePath = Path.Join(Program.AppDataDirectory, "custom.css");
if (File.Exists(filePath))
output = filePath;
return output;
return File.ReadAllText(filePath);
return string.Empty;
}
public string CustomScriptPath()
public string CustomScript()
{
var output = string.Empty;
var filePath = Path.Join(Program.AppDataDirectory, "custom.js");
if (File.Exists(filePath))
output = filePath;
return output;
return File.ReadAllText(filePath);
return string.Empty;
}
public string CurrentCulture()

19
Dotnet/AppApi/Common/AppApiVrCommon.cs Normal file
View File

@@ -0,0 +1,19 @@
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 bool IsRunningUnderWine();
public abstract List<KeyValuePair<string, string>> GetExecuteVrFeedFunctionQueue();
public abstract List<KeyValuePair<string, string>> GetExecuteVrOverlayFunctionQueue();
}

35
Dotnet/AppApi/Electron/AppApiElectron.cs
View File

@@ -9,27 +9,30 @@ namespace VRCX
public partial class AppApiElectron : AppApi
{
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
public override void ShowDevTools()
{
}
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();
}
public override void SetZoom(double zoomLevel)
{
}
public override async Task<double> GetZoom()
{
return 1;
@@ -47,23 +50,25 @@ namespace VRCX
{
return false;
}
public override void ExecuteAppFunction(string function, string json)
{
}
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);
}
public override void FocusWindow()
{
}
public override void ChangeTheme(int value)
{
}
@@ -71,7 +76,7 @@ namespace VRCX
public override void DoFunny()
{
}
public override string GetClipboard()
{
var process = new Process
@@ -102,7 +107,7 @@ namespace VRCX
public override void SetStartup(bool enabled)
{
}
public override void CopyImageToClipboard(string path)
{
if (!File.Exists(path) ||
@@ -113,7 +118,7 @@ namespace VRCX
!path.EndsWith(".bmp") &&
!path.EndsWith(".webp")))
return;
var process = new Process
{
StartInfo = new ProcessStartInfo
@@ -124,7 +129,7 @@ namespace VRCX
CreateNoWindow = true
}
};
try
try
{
process.Start();
process.WaitForExit();
@@ -138,16 +143,16 @@ namespace VRCX
public override void FlashWindow()
{
}
public override void SetUserAgent()
{
}
public override bool IsRunningUnderWine()
{
return false;
}
}
}

102
Dotnet/AppApi/Electron/AppApiVrElectron.cs Normal file
View File

@@ -0,0 +1,102 @@
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;
}
public override bool IsRunningUnderWine()
{
return false;
}
}
}