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

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.");
}
}
}