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

Port VR Overlay to Silk.NET

Browse Source
This commit is contained in:
BenjaminZehowlt
2025-10-19 18:32:33 -04:00
committed by Natsumi
parent 090395bb61
commit b4cafe2f3d
5 changed files with 318 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

224
Dotnet/Overlay/Cef/VRCXVRCef.cs
View File

@@ -8,20 +8,16 @@ using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
using System.Numerics;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
using CefSharp;
using NLog;
using SharpDX;
using SharpDX.Direct3D11;
using SharpDX.DXGI;
using Silk.NET.Core.Native;
using Silk.NET.Direct3D11;
using Silk.NET.DXGI;
using Valve.VR;
using Device = SharpDX.Direct3D11.Device;
using Device1 = SharpDX.Direct3D11.Device1;
using Device2 = SharpDX.Direct3D11.Device2;
using Device3 = SharpDX.Direct3D11.Device3;
using Device4 = SharpDX.Direct3D11.Device4;
namespace VRCX
{
@@ -40,12 +36,8 @@ namespace VRCX
private readonly List<string[]> _deviceList;
private readonly ReaderWriterLockSlim _deviceListLock;
private bool _active;
private Device _device;
private bool _menuButton;
private int _overlayHand;
private Factory _factory;
private Texture2D _texture1;
private Texture2D _texture2;
private Thread _thread;
private DateTime _nextOverlayUpdate;
@@ -57,6 +49,16 @@ namespace VRCX
private bool _wristOverlayActive;
private bool _wristOverlayWasActive;
private DXGI _dxgi;
private D3D11 _d3d11;
private ComPtr<IDXGIFactory2> _factory;
private ComPtr<IDXGIAdapter> _adapter;
private ComPtr<ID3D11Device> _device;
private ComPtr<ID3D11Multithread> _multithread;
private ComPtr<ID3D11DeviceContext> _deviceContext;
private ComPtr<ID3D11Texture2D> _texture1;
private ComPtr<ID3D11Texture2D> _texture2;
static VRCXVRCef()
{
@@ -99,81 +101,76 @@ namespace VRCX
private void SetupTextures()
{
_factory ??= new Factory1();
unsafe
{
_dxgi?.Dispose();
_dxgi = DXGI.GetApi(null);
_d3d11?.Dispose();
_d3d11 = D3D11.GetApi(null);
_device?.Dispose();
_device = new Device(_factory.GetAdapter(OpenVR.System.GetD3D9AdapterIndex()),
DeviceCreationFlags.BgraSupport);
UpgradeDevice();
_factory.Dispose();
SilkMarshal.ThrowHResult(_dxgi.CreateDXGIFactory<IDXGIFactory2>(out _factory));
_adapter.Dispose();
SilkMarshal.ThrowHResult(_factory.EnumAdapters((uint)OpenVR.System.GetD3D9AdapterIndex(),
ref _adapter));
_texture1?.Dispose();
_texture1 = new Texture2D(
_device,
new Texture2DDescription
_device.Dispose();
_deviceContext.Dispose();
SilkMarshal.ThrowHResult
(
_d3d11.CreateDevice
(
_adapter,
D3DDriverType.Unknown,
Software: default,
(uint)(CreateDeviceFlag.BgraSupport | CreateDeviceFlag.Debug),
null,
0,
D3D11.SdkVersion,
ref _device,
null,
ref _deviceContext
)
);
_multithread = _device.QueryInterface<ID3D11Multithread>();
_multithread.SetMultithreadProtected(true);
_device.SetInfoQueueCallback(msg => logger.Info(SilkMarshal.PtrToString((nint)msg.PDescription)!));
_texture1.Dispose();
_device.CreateTexture2D(new Texture2DDesc
{
Width = 512,
Height = 512,
MipLevels = 1,
ArraySize = 1,
Format = Format.B8G8R8A8_UNorm,
SampleDescription = new SampleDescription(1, 0),
BindFlags = BindFlags.ShaderResource
}
);
_wristOverlay?.UpdateRender(_device, _texture1);
Format = Format.FormatB8G8R8A8Unorm,
SampleDesc = new SampleDesc
{
Count = 1,
Quality = 0
},
BindFlags = (uint)BindFlag.ShaderResource
}, null, ref _texture1);
_wristOverlay?.UpdateRender(_device, _deviceContext, _texture1);
_texture2?.Dispose();
_texture2 = new Texture2D(
_device,
new Texture2DDescription
_texture2.Dispose();
_device.CreateTexture2D(new Texture2DDesc
{
Width = 1024,
Height = 1024,
MipLevels = 1,
ArraySize = 1,
Format = Format.B8G8R8A8_UNorm,
SampleDescription = new SampleDescription(1, 0),
BindFlags = BindFlags.ShaderResource
}
);
_hmdOverlay?.UpdateRender(_device, _texture2);
}
private void UpgradeDevice()
{
Device5 device5 = _device.QueryInterfaceOrNull<Device5>();
if (device5 != null)
{
_device.Dispose();
_device = device5;
return;
}
Device4 device4 = _device.QueryInterfaceOrNull<Device4>();
if (device4 != null)
{
_device.Dispose();
_device = device4;
return;
}
Device3 device3 = _device.QueryInterfaceOrNull<Device3>();
if (device3 != null)
{
_device.Dispose();
_device = device3;
return;
}
Device2 device2 = _device.QueryInterfaceOrNull<Device2>();
if (device2 != null)
{
_device.Dispose();
_device = device2;
return;
}
Device1 device1 = _device.QueryInterfaceOrNull<Device1>();
if (device1 != null)
{
_device.Dispose();
_device = device1;
Format = Format.FormatB8G8R8A8Unorm,
SampleDesc = new SampleDesc
{
Count = 1,
Quality = 0
},
BindFlags = (uint)BindFlag.ShaderResource
}, null, ref _texture2);
_hmdOverlay?.UpdateRender(_device, _deviceContext, _texture2);
}
}
@@ -324,9 +321,11 @@ namespace VRCX
_hmdOverlay?.Dispose();
_wristOverlay?.Dispose();
_texture2?.Dispose();
_texture1?.Dispose();
_device?.Dispose();
_texture2.Dispose();
_texture1.Dispose();
_device.Dispose();
_adapter.Dispose();
_factory.Dispose();
}
public override void SetActive(bool active, bool hmdOverlay, bool wristOverlay, bool menuButton, int overlayHand)
@@ -581,6 +580,12 @@ namespace VRCX
{
return err;
}
err = overlay.SetOverlayFlag(dashboardHandle, VROverlayFlags.NoDashboardTab, true);
if (err != EVROverlayError.None)
{
return err;
}
}
}
@@ -611,14 +616,17 @@ namespace VRCX
if (dashboardVisible)
{
var texture = new Texture_t
unsafe
{
handle = _texture1.NativePointer
};
err = overlay.SetOverlayTexture(dashboardHandle, ref texture);
if (err != EVROverlayError.None)
{
return err;
var texture = new Texture_t
{
handle = (IntPtr)_texture1.Handle
};
err = overlay.SetOverlayTexture(dashboardHandle, ref texture);
if (err != EVROverlayError.None)
{
return err;
}
}
}
@@ -670,11 +678,11 @@ namespace VRCX
{
// http://www.opengl-tutorial.org/beginners-tutorials/tutorial-3-matrices
// Scaling-Rotation-Translation
var m = Matrix.Scaling(0.25f);
m *= Matrix.RotationX(_rotation[0]);
m *= Matrix.RotationY(_rotation[1]);
m *= Matrix.RotationZ(_rotation[2]);
m *= Matrix.Translation(_translation[0], _translation[1], _translation[2]);
var m = Matrix4x4.CreateScale(0.25f);
m *= Matrix4x4.CreateRotationX(_rotation[0]);
m *= Matrix4x4.CreateRotationY(_rotation[1]);
m *= Matrix4x4.CreateRotationZ(_rotation[2]);
m *= Matrix4x4.CreateTranslation(new Vector3(_translation[0], _translation[1], _translation[2]));
var hm34 = new HmdMatrix34_t
{
m0 = m.M11,
@@ -700,14 +708,17 @@ namespace VRCX
if (!dashboardVisible &&
DateTime.UtcNow.CompareTo(_nextOverlayUpdate) <= 0)
{
var texture = new Texture_t
unsafe
{
handle = _texture1.NativePointer
};
err = overlay.SetOverlayTexture(overlayHandle, ref texture);
if (err != EVROverlayError.None)
{
return err;
var texture = new Texture_t
{
handle = (IntPtr)_texture1.Handle
};
err = overlay.SetOverlayTexture(overlayHandle, ref texture);
if (err != EVROverlayError.None)
{
return err;
}
}
if (!overlayVisible)
@@ -774,8 +785,8 @@ namespace VRCX
return err;
}
var m = Matrix.Scaling(1f);
m *= Matrix.Translation(0, -0.3f, -1.5f);
var m = Matrix4x4.CreateScale(1f);
m *= Matrix4x4.CreateTranslation(0, -0.3f, -1.5f);
var hm34 = new HmdMatrix34_t
{
m0 = m.M11,
@@ -801,14 +812,17 @@ namespace VRCX
if (!dashboardVisible)
{
var texture = new Texture_t
unsafe
{
handle = _texture2.NativePointer
};
err = overlay.SetOverlayTexture(overlayHandle, ref texture);
if (err != EVROverlayError.None)
{
return err;
var texture = new Texture_t
{
handle = (IntPtr)_texture2.Handle
};
err = overlay.SetOverlayTexture(overlayHandle, ref texture);
if (err != EVROverlayError.None)
{
return err;
}
}
if (!overlayVisible)