kneesox/NAK_CVR_Mods
1
0
Fork 0
mirror of https://github.com/NotAKidoS/NAK_CVR_Mods.git synced 2025-09-02 06:19:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stickers: hacky workaround for bug in MTJobManager

Browse source
This commit is contained in:
NotAKidoS 2024-08-25 21:20:27 -05:00
parent d635b45db2
commit d1102bb1e5
6 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Stickers/Integrations/BTKUI/UIAddon.Page.StickerSelect.cs
View file

@ -175,6 +175,8 @@ public static partial class BTKUIAddon
// StickerMod.Logger.Msg("Populating menu items.");
try
{
Thread.CurrentThread.IsBackground = false; // working around bug in MTJobManager
var directories = _curDirectoryInfo.GetDirectories();
var files = _curDirectoryInfo.GetFiles();
@ -213,6 +215,7 @@ public static partial class BTKUIAddon
finally
{
IsPopulatingPage = false;
Thread.CurrentThread.IsBackground = true; // working around bug in MTJobManager
}
}
@ -220,10 +223,10 @@ public static partial class BTKUIAddon
{
for (int i = 0; i < _folderButtons.Length; i++)
{
Button button = _folderButtons[i];
if (i >= directories.Count)
break;
Button button = _folderButtons[i];
button.ButtonText = directories[i].Name;
button.ButtonTooltip = $"Open {directories[i].Name}";
MTJobManager.RunOnMainThread("PopulateMenuItems", () => button.Hidden = false);
@ -236,7 +239,6 @@ public static partial class BTKUIAddon
{
for (int i = 0; i < _fileButtons.Length; i++)
{
Button button = _fileButtons[i];
if (i >= files.Count)
break;
@ -248,6 +250,7 @@ public static partial class BTKUIAddon
string relativePath = Path.GetRelativePath(_initialDirectory, fileInfo.FullName);
string relativePathWithoutExtension = relativePath[..^fileInfo.Extension.Length];
Button button = _fileButtons[i];
button.ButtonTooltip = $"Load {fileInfo.Name}"; // Do not change "Load " prefix, we extract file name
if (StickerCache.IsThumbnailAvailable(relativePathWithoutExtension))

3
Stickers/Main.cs
View file

@ -35,7 +35,8 @@ public class StickerMod : MelonMod
if (StickerSystem.Instance == null)
return;
if (Input.mouseScrollDelta.y != 0f
if (StickerSystem.Instance.IsInStickerMode
&& Input.mouseScrollDelta.y != 0f
&& Cursor.lockState == CursorLockMode.Locked // prevent scrolling while in menus
&& !CVRInputManager.Instance.zoom) // prevent scrolling while using scroll zoom
StickerSystem.Instance.SelectedStickerSlot += (int)Input.mouseScrollDelta.y;

3
Stickers/Stickers/Networking/ModNetwork.Outbound.cs
View file

@ -146,6 +146,8 @@ public static partial class ModNetwork
{
try
{
Thread.CurrentThread.IsBackground = false; // working around bug in MTJobManager
var textureData = _textureStorage[stickerSlot].textureData;
var textureHash = _textureStorage[stickerSlot].textureHash;
var width = _textureStorage[stickerSlot].width;
@ -181,6 +183,7 @@ public static partial class ModNetwork
{
IsSendingTexture = false;
InvokeTextureOutboundStateChanged(false);
Thread.CurrentThread.IsBackground = true; // working around bug in MTJobManager
}
});
}

2
Stickers/Stickers/StickerSystem.ImageLoading.cs
View file

@ -50,6 +50,7 @@ public partial class StickerSystem
{
try
{
Thread.CurrentThread.IsBackground = false; // working around bug in MTJobManager
if (!TryLoadImage(imageName, slotIndex, out string errorMessage))
throw new Exception(errorMessage);
}
@ -61,6 +62,7 @@ public partial class StickerSystem
finally
{
_isLoadingImage[slotIndex] = false;
Thread.CurrentThread.IsBackground = true; // working around bug in MTJobManager
}
});
}

3
Stickers/Stickers/Utilities/StickerCache.cs
View file

@ -83,6 +83,8 @@ public static class StickerCache
{
try
{
Thread.CurrentThread.IsBackground = false; // working around bug in MTJobManager
int generatedThumbnails = 0;
while (BTKUIAddon.IsPopulatingPage || _filesToGenerateThumbnails.Count > 0)
@ -113,6 +115,7 @@ public static class StickerCache
finally
{
IsGeneratingThumbnails = false;
Thread.CurrentThread.IsBackground = true; // working around bug in MTJobManager
}
});
}

2
copy_and_nstrip_dll.ps1
View file

@ -10,7 +10,7 @@ $cvrDefaultPath = "C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR"
# $cvrDefaultPath = "E:\temp\CVR_Experimental"
# Array with the dlls to strip
$dllsToStrip = @('Assembly-CSharp.dll','Assembly-CSharp-firstpass.dll','AVProVideo.Runtime.dll', 'Unity.TextMeshPro.dll', 'MagicaCloth.dll', 'MagicaClothV2.dll', 'ECM2.dll', 'TheClapper.dll')
$dllsToStrip = @('Assembly-CSharp.dll','Assembly-CSharp-firstpass.dll','AVProVideo.Runtime.dll', 'Unity.TextMeshPro.dll', 'MagicaCloth.dll', 'MagicaClothV2.dll', 'ECM2.dll', 'TheClapper.dll', 'MTJobSystem.dll')
# Array with the mods to grab
$modNames = @("BTKUILib", "BTKSAImmersiveHud", "PortableMirrorMod", "VRBinding", "TheClapper")