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

.?

Browse Source
This commit is contained in:
Natsumi
2025-10-23 18:19:12 +11:00
parent ac622ae35c
commit 99bc15e2ba
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dotnet/AppApi/Cef/AppApiVrCef.cs
View File

@@ -21,7 +21,7 @@ namespace VRCX
public override void VrInit() public override void VrInit()
{ {
if (MainForm.Instance?.Browser != null && !MainForm.Instance.Browser.IsLoading && MainForm.Instance.Browser.CanExecuteJavascriptInMainFrame) if (MainForm.Instance?.Browser != null && !MainForm.Instance.Browser.IsLoading && MainForm.Instance.Browser.CanExecuteJavascriptInMainFrame)
MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia.vr.vrInit"); MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia?.vr.vrInit");
} }
public override void ToggleSystemMonitor(bool enabled) public override void ToggleSystemMonitor(bool enabled)

2
Dotnet/AppApi/Cef/GameHandler.cs
View File

@@ -36,7 +36,7 @@ namespace VRCX
// TODO: fix this throwing an exception for being called before the browser is ready. somehow it gets past the checks // 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) 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, isHmdAfk);
} }
public override bool IsGameRunning() public override bool IsGameRunning()

4
Dotnet/Cef/CefCustomDragHandler.cs
View File

@@ -24,9 +24,9 @@ namespace VRCX
dragData.Dispose(); dragData.Dispose();
return true; return true;
} }
if (MainForm.Instance?.Browser != null && !MainForm.Instance.Browser.IsLoading && MainForm.Instance.Browser.CanExecuteJavascriptInMainFrame) if (MainForm.Instance?.Browser != null && !MainForm.Instance.Browser.IsLoading && MainForm.Instance.Browser.CanExecuteJavascriptInMainFrame)
MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia.vrcx.dragEnterCef", file); MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia?.vrcx.dragEnterCef", file);
dragData.Dispose(); dragData.Dispose();
return false; return false;

4
Dotnet/Cef/MainForm.cs
View File

@@ -86,7 +86,7 @@ namespace VRCX
Browser.GotFocus += (_, _) => Browser.GotFocus += (_, _) =>
{ {
if (Browser != null && !Browser.IsLoading && Browser.CanExecuteJavascriptInMainFrame) if (Browser != null && !Browser.IsLoading && Browser.CanExecuteJavascriptInMainFrame)
Browser.ExecuteScriptAsync("window?.$pinia.vrcStatus.onBrowserFocus"); Browser.ExecuteScriptAsync("window?.$pinia?.vrcStatus?.onBrowserFocus");
}; };
JavascriptBindings.ApplyAppJavascriptBindings(Browser.JavascriptObjectRepository); JavascriptBindings.ApplyAppJavascriptBindings(Browser.JavascriptObjectRepository);
@@ -162,7 +162,7 @@ namespace VRCX
if (WindowState != FormWindowState.Normal) if (WindowState != FormWindowState.Normal)
return; return;
LastSizeWidth = Size.Width; LastSizeWidth = Size.Width;
LastSizeHeight = Size.Height; LastSizeHeight = Size.Height;

2
Dotnet/IPC/IPCClient.cs
View File

@@ -90,7 +90,7 @@ namespace VRCX
#if !LINUX #if !LINUX
if (MainForm.Instance?.Browser != null && !MainForm.Instance.Browser.IsLoading && MainForm.Instance.Browser.CanExecuteJavascriptInMainFrame) if (MainForm.Instance?.Browser != null && !MainForm.Instance.Browser.IsLoading && MainForm.Instance.Browser.CanExecuteJavascriptInMainFrame)
MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia.vrcx.ipcEvent", packet); MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia?.vrcx.ipcEvent", packet);
#endif #endif
} }

4
Dotnet/LogWatcher.cs
View File

@@ -297,7 +297,7 @@ namespace VRCX
m_LogQueue.Enqueue(logLine); m_LogQueue.Enqueue(logLine);
#else #else
if (MainForm.Instance != null && MainForm.Instance.Browser != null) if (MainForm.Instance != null && MainForm.Instance.Browser != null)
MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia.gameLog.addGameLogEvent", logLine); MainForm.Instance.Browser.ExecuteScriptAsync("window?.$pinia?.gameLog.addGameLogEvent", logLine);
#endif #endif
} }
@@ -729,7 +729,7 @@ namespace VRCX
return false; return false;
var data = line.Substring(offset + 13); var data = line.Substring(offset + 13);
// PWI, deprecated // PWI, deprecated
logger.Info("VRCX-World data: {0}", data); logger.Info("VRCX-World data: {0}", data);
return true; return true;