unfix: overlay scaling issue

This commit is contained in:
Natsumi
2025-12-14 14:11:10 +11:00
parent 684482daaf
commit 3cd68622d3
4 changed files with 10 additions and 30 deletions

View File

@@ -26,7 +26,7 @@ namespace VRCX
private static readonly Logger logger = LogManager.GetCurrentClassLogger(); private static readonly Logger logger = LogManager.GetCurrentClassLogger();
public OffScreenBrowser(string address, int width, int height, IRequestContext requestContext = null) public OffScreenBrowser(string address, int width, int height)
: base(address, automaticallyCreateBrowser: false) : base(address, automaticallyCreateBrowser: false)
{ {
var windowInfo = new WindowInfo(); var windowInfo = new WindowInfo();
@@ -42,7 +42,7 @@ namespace VRCX
WindowlessFrameRate = 60 WindowlessFrameRate = 60
}; };
CreateBrowser(windowInfo, browserSettings, requestContext); CreateBrowser(windowInfo, browserSettings);
Size = new System.Drawing.Size(width, height); Size = new System.Drawing.Size(width, height);
RenderHandler = this; RenderHandler = this;

View File

@@ -24,7 +24,7 @@ namespace VRCX
private int _width; private int _width;
private int _height; private int _height;
public OffScreenBrowserLegacy(string address, int width, int height, IRequestContext requestContext = null) public OffScreenBrowserLegacy(string address, int width, int height)
: base(address, automaticallyCreateBrowser: false) : base(address, automaticallyCreateBrowser: false)
{ {
_paintBufferLock = new ReaderWriterLockSlim(); _paintBufferLock = new ReaderWriterLockSlim();
@@ -42,7 +42,7 @@ namespace VRCX
WindowlessFrameRate = 24 WindowlessFrameRate = 24
}; };
CreateBrowser(windowInfo, browserSettings, requestContext); CreateBrowser(windowInfo, browserSettings);
Size = new System.Drawing.Size(width, height); Size = new System.Drawing.Size(width, height);
RenderHandler = this; RenderHandler = this;

View File

@@ -34,14 +34,6 @@ namespace VRCX
private static OffScreenBrowser _wristOverlay; private static OffScreenBrowser _wristOverlay;
private static OffScreenBrowser _hmdOverlay; private static OffScreenBrowser _hmdOverlay;
private static readonly IRequestContext VrOverlayRequestContext = new RequestContext(
new RequestContextSettings
{
CachePath = string.Empty,
PersistSessionCookies = false,
PersistUserPreferences = false
}
);
private readonly List<string[]> _deviceList; private readonly List<string[]> _deviceList;
private readonly ReaderWriterLockSlim _deviceListLock; private readonly ReaderWriterLockSlim _deviceListLock;
private bool _active; private bool _active;
@@ -205,15 +197,13 @@ namespace VRCX
_wristOverlay = new OffScreenBrowser( _wristOverlay = new OffScreenBrowser(
Program.LaunchDebug ? "http://localhost:9000/vr.html?wrist" : "file://vrcx/vr.html?wrist", Program.LaunchDebug ? "http://localhost:9000/vr.html?wrist" : "file://vrcx/vr.html?wrist",
512, 512,
512, 512
VrOverlayRequestContext
); );
_hmdOverlay = new OffScreenBrowser( _hmdOverlay = new OffScreenBrowser(
Program.LaunchDebug ? "http://localhost:9000/vr.html?hmd" : "file://vrcx/vr.html?hmd", Program.LaunchDebug ? "http://localhost:9000/vr.html?hmd" : "file://vrcx/vr.html?hmd",
1024, 1024,
1024, 1024
VrOverlayRequestContext
); );
while (_thread != null) while (_thread != null)

View File

@@ -34,14 +34,6 @@ namespace VRCX
private static OffScreenBrowserLegacy _wristOverlay; private static OffScreenBrowserLegacy _wristOverlay;
private static OffScreenBrowserLegacy _hmdOverlay; private static OffScreenBrowserLegacy _hmdOverlay;
private static readonly IRequestContext VrOverlayRequestContext = new RequestContext(
new RequestContextSettings
{
CachePath = string.Empty,
PersistSessionCookies = false,
PersistUserPreferences = false
}
);
private readonly List<string[]> _deviceList; private readonly List<string[]> _deviceList;
private readonly ReaderWriterLockSlim _deviceListLock; private readonly ReaderWriterLockSlim _deviceListLock;
private bool _active; private bool _active;
@@ -203,15 +195,13 @@ namespace VRCX
_wristOverlay = new OffScreenBrowserLegacy( _wristOverlay = new OffScreenBrowserLegacy(
Program.LaunchDebug ? "http://localhost:9000/vr.html?wrist" : "file://vrcx/vr.html?wrist", Program.LaunchDebug ? "http://localhost:9000/vr.html?wrist" : "file://vrcx/vr.html?wrist",
512, 512,
512, 512
VrOverlayRequestContext
); );
_hmdOverlay = new OffScreenBrowserLegacy( _hmdOverlay = new OffScreenBrowserLegacy(
Program.LaunchDebug ? "http://localhost:9000/vr.html?hmd" : "file://vrcx/vr.html?hmd", Program.LaunchDebug ? "http://localhost:9000/vr.html?hmd" : "file://vrcx/vr.html?hmd",
1024, 1024,
1024, 1024
VrOverlayRequestContext
); );
while (_thread != null) while (_thread != null)