From 81d3bca79b97d78e5d22a2463ea6679a2a47a058 Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Fri, 17 Feb 2023 07:05:39 -0600 Subject: [PATCH 1/6] Initial commit --- .gitattributes | 2 + .gitignore | 398 +++++++++++++++++++++++++++++++++++++++++++++++++ LICENSE | 21 +++ 3 files changed, 421 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 LICENSE diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..dfe0770 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..426d76d --- /dev/null +++ b/.gitignore @@ -0,0 +1,398 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..4480281 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2023 NotAKidoS + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 25fa179bd8f7acea0a8a03ee97ec18fc90cc856b Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Fri, 17 Feb 2023 07:14:55 -0600 Subject: [PATCH 2/6] initial release --- TrackedControllerFix/HarmonyPatches.cs | 44 ++++++++++++ TrackedControllerFix/Main.cs | 24 +++++++ .../Properties/AssemblyInfo.cs | 30 ++++++++ .../TrackedControllerFix.csproj | 70 +++++++++++++++++++ TrackedControllerFix/TrackedControllerFix.sln | 25 +++++++ TrackedControllerFix/format.json | 23 ++++++ 6 files changed, 216 insertions(+) create mode 100644 TrackedControllerFix/HarmonyPatches.cs create mode 100644 TrackedControllerFix/Main.cs create mode 100644 TrackedControllerFix/Properties/AssemblyInfo.cs create mode 100644 TrackedControllerFix/TrackedControllerFix.csproj create mode 100644 TrackedControllerFix/TrackedControllerFix.sln create mode 100644 TrackedControllerFix/format.json diff --git a/TrackedControllerFix/HarmonyPatches.cs b/TrackedControllerFix/HarmonyPatches.cs new file mode 100644 index 0000000..4399cec --- /dev/null +++ b/TrackedControllerFix/HarmonyPatches.cs @@ -0,0 +1,44 @@ +using ABI_RC.Core.Base; +using ABI_RC.Core.Player; +using HarmonyLib; +using Valve.VR; + +namespace NAK.Melons.TrackedControllerFix.HarmonyPatches; + +internal class PlayerSetupPatches +{ + public static SteamVR_Behaviour_Pose vrLeftHandPose; + public static SteamVR_Behaviour_Pose vrRightHandPose; + + public static SteamVR_TrackedObject vrLeftHandTracker; + public static SteamVR_TrackedObject vrRightHandTracker; + + [HarmonyPostfix] + [HarmonyPatch(typeof(PlayerSetup), "Start")] + private static void Post_PlayerSetup_Start(ref PlayerSetup __instance) + { + // Add SteamVR_TrackedObject and get SteamVR_Behaviour_Pose + vrLeftHandTracker = __instance.vrLeftHandTracker.AddComponent(); + vrRightHandTracker = __instance.vrRightHandTracker.AddComponent(); + vrLeftHandPose = __instance.vrLeftHandTracker.GetComponent(); + vrRightHandPose = __instance.vrRightHandTracker.GetComponent(); + } + + [HarmonyPrefix] + [HarmonyPatch(typeof(PlayerSetup), "SetupAvatarVr")] + private static void Prefix_PlayerSetup_SetupAvatarVr() + { + // This is a super lazy way of doing this... + // but this is the best way to support DesktopVRSwitch & not redo the controller inputs + if (vrLeftHandTracker != null) + { + vrLeftHandTracker.SetDeviceIndex(vrLeftHandPose.GetDeviceIndex()); + vrLeftHandPose.enabled = false; + } + if (vrRightHandTracker != null) + { + vrRightHandTracker.SetDeviceIndex(vrRightHandPose.GetDeviceIndex()); + vrRightHandPose.enabled = false; + } + } +} \ No newline at end of file diff --git a/TrackedControllerFix/Main.cs b/TrackedControllerFix/Main.cs new file mode 100644 index 0000000..1f303a8 --- /dev/null +++ b/TrackedControllerFix/Main.cs @@ -0,0 +1,24 @@ +using MelonLoader; + +namespace NAK.Melons.TrackedControllerFix; + +public class TrackedControllerFixMod : MelonMod +{ + public override void OnInitializeMelon() + { + ApplyPatches(typeof(HarmonyPatches.PlayerSetupPatches)); + } + + private void ApplyPatches(Type type) + { + try + { + HarmonyInstance.PatchAll(type); + } + catch (Exception e) + { + LoggerInstance.Msg($"Failed while patching {type.Name}!"); + LoggerInstance.Error(e); + } + } +} \ No newline at end of file diff --git a/TrackedControllerFix/Properties/AssemblyInfo.cs b/TrackedControllerFix/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..3163e43 --- /dev/null +++ b/TrackedControllerFix/Properties/AssemblyInfo.cs @@ -0,0 +1,30 @@ +using MelonLoader; +using NAK.Melons.TrackedControllerFix.Properties; +using System.Reflection; + +[assembly: AssemblyVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyTitle(nameof(NAK.Melons.TrackedControllerFix))] +[assembly: AssemblyCompany(AssemblyInfoParams.Author)] +[assembly: AssemblyProduct(nameof(NAK.Melons.TrackedControllerFix))] + +[assembly: MelonInfo( + typeof(NAK.Melons.TrackedControllerFix.TrackedControllerFixMod), + nameof(NAK.Melons.TrackedControllerFix), + AssemblyInfoParams.Version, + AssemblyInfoParams.Author, + downloadLink: "https://github.com/NotAKidOnSteam/TrackedControllerFix" +)] + +[assembly: MelonGame("Alpha Blend Interactive", "ChilloutVR")] +[assembly: MelonPlatform(MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] +[assembly: MelonPlatformDomain(MelonPlatformDomainAttribute.CompatibleDomains.MONO)] +[assembly: HarmonyDontPatchAll] + +namespace NAK.Melons.TrackedControllerFix.Properties; +internal static class AssemblyInfoParams +{ + public const string Version = "1.0.0"; + public const string Author = "NotAKidoS"; +} \ No newline at end of file diff --git a/TrackedControllerFix/TrackedControllerFix.csproj b/TrackedControllerFix/TrackedControllerFix.csproj new file mode 100644 index 0000000..e4c8455 --- /dev/null +++ b/TrackedControllerFix/TrackedControllerFix.csproj @@ -0,0 +1,70 @@ + + + + + netstandard2.1 + enable + latest + false + + + + + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\MelonLoader\0Harmony.dll + + + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll + + + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll + + + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Aura2_Core.dll + + + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll + + + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll + + + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\MelonLoader\MelonLoader.dll + + + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\SteamVR.dll + + + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\Mods\UIExpansionKit.dll + + + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Unity.Postprocessing.Runtime.dll + + + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Unity.TextMeshPro.dll + + + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll + + + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll + + + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.InputLegacyModule.dll + + + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.PhysicsModule.dll + + + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.VRModule.dll + + + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.XRModule.dll + + + + + + + + + diff --git a/TrackedControllerFix/TrackedControllerFix.sln b/TrackedControllerFix/TrackedControllerFix.sln new file mode 100644 index 0000000..da2e91a --- /dev/null +++ b/TrackedControllerFix/TrackedControllerFix.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.2.32630.192 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrackedControllerFix", "TrackedControllerFix.csproj", "{988BC351-E04B-4756-A6FC-A7E55E830DB6}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {988BC351-E04B-4756-A6FC-A7E55E830DB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {988BC351-E04B-4756-A6FC-A7E55E830DB6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {988BC351-E04B-4756-A6FC-A7E55E830DB6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {988BC351-E04B-4756-A6FC-A7E55E830DB6}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F38A646E-1C36-4233-AC20-4E9F0CED9BDF} + EndGlobalSection +EndGlobal diff --git a/TrackedControllerFix/format.json b/TrackedControllerFix/format.json new file mode 100644 index 0000000..7d05f54 --- /dev/null +++ b/TrackedControllerFix/format.json @@ -0,0 +1,23 @@ +{ + "_id": -1, + "name": "TrackedControllerFix", + "modversion": "1.0.0", + "gameversion": "2022r170", + "loaderversion": "0.5.7", + "modtype": "Mod", + "author": "NotAKidoS", + "description": "Allows your controllers to track while the SteamVR overlay is open. This also fixes Quest/Touch controllers feeling slow during fast movements.", + "searchtags": [ + "vr", + "quest", + "controller", + "tracking" + ], + "requirements": [ + "None" + ], + "downloadlink": "https://github.com/NotAKidOnSteam/TrackedControllerFix/releases/download/v1.0.0/TrackedControllerFix.dll", + "sourcelink": "https://github.com/NotAKidOnSteam/TrackedControllerFix/", + "changelog": "Initial Release", + "embedcolor": "3498db" +} \ No newline at end of file From a55f1fb739f8a85eacd3b271fb85ca366d5f1268 Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Fri, 17 Feb 2023 07:16:38 -0600 Subject: [PATCH 3/6] Create README.md --- README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..9315328 --- /dev/null +++ b/README.md @@ -0,0 +1,19 @@ +# TrackedControllerFix +lazy af fix for a small issue + +Your Left/Right hand controllers will now track faster and while in the Steam overlay. + +This approach to fixing the issue is made lazy to support DesktopVRSwitch. + +(also because im lazy) + +--- + +Here is the block of text where I tell you this mod is not affiliated or endorsed by ABI. +https://documentation.abinteractive.net/official/legal/tos/#7-modding-our-games + +> This mod is an independent creation and is not affiliated with, supported by or approved by Alpha Blend Interactive. + +> Use of this mod is done so at the user's own risk and the creator cannot be held responsible for any issues arising from its use. + +> To the best of my knowledge, I have adhered to the Modding Guidelines established by Alpha Blend Interactive. From 7403b6c3e715a2f69ef5f2d5c9ed9147474c9485 Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Fri, 17 Feb 2023 07:40:22 -0600 Subject: [PATCH 4/6] f --- TrackedControllerFix/HarmonyPatches.cs | 4 ++++ TrackedControllerFix/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/TrackedControllerFix/HarmonyPatches.cs b/TrackedControllerFix/HarmonyPatches.cs index 4399cec..72434c4 100644 --- a/TrackedControllerFix/HarmonyPatches.cs +++ b/TrackedControllerFix/HarmonyPatches.cs @@ -22,6 +22,8 @@ internal class PlayerSetupPatches vrRightHandTracker = __instance.vrRightHandTracker.AddComponent(); vrLeftHandPose = __instance.vrLeftHandTracker.GetComponent(); vrRightHandPose = __instance.vrRightHandTracker.GetComponent(); + vrLeftHandPose.enabled = false; + vrRightHandPose.enabled = false; } [HarmonyPrefix] @@ -32,11 +34,13 @@ internal class PlayerSetupPatches // but this is the best way to support DesktopVRSwitch & not redo the controller inputs if (vrLeftHandTracker != null) { + vrLeftHandPose.enabled = true; vrLeftHandTracker.SetDeviceIndex(vrLeftHandPose.GetDeviceIndex()); vrLeftHandPose.enabled = false; } if (vrRightHandTracker != null) { + vrRightHandPose.enabled = true; vrRightHandTracker.SetDeviceIndex(vrRightHandPose.GetDeviceIndex()); vrRightHandPose.enabled = false; } diff --git a/TrackedControllerFix/Properties/AssemblyInfo.cs b/TrackedControllerFix/Properties/AssemblyInfo.cs index 3163e43..91426a4 100644 --- a/TrackedControllerFix/Properties/AssemblyInfo.cs +++ b/TrackedControllerFix/Properties/AssemblyInfo.cs @@ -25,6 +25,6 @@ using System.Reflection; namespace NAK.Melons.TrackedControllerFix.Properties; internal static class AssemblyInfoParams { - public const string Version = "1.0.0"; + public const string Version = "1.0.1"; public const string Author = "NotAKidoS"; } \ No newline at end of file From a8b97607e165c0bcfde7e99273c62d611beddd97 Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Thu, 23 Feb 2023 03:08:30 -0600 Subject: [PATCH 5/6] dancing around issues --- TrackedControllerFix/HarmonyPatches.cs | 41 +++------------ TrackedControllerFix/TrackedControllerFix.cs | 54 ++++++++++++++++++++ 2 files changed, 60 insertions(+), 35 deletions(-) create mode 100644 TrackedControllerFix/TrackedControllerFix.cs diff --git a/TrackedControllerFix/HarmonyPatches.cs b/TrackedControllerFix/HarmonyPatches.cs index 72434c4..ce8110e 100644 --- a/TrackedControllerFix/HarmonyPatches.cs +++ b/TrackedControllerFix/HarmonyPatches.cs @@ -1,5 +1,4 @@ -using ABI_RC.Core.Base; -using ABI_RC.Core.Player; +using ABI_RC.Core.Player; using HarmonyLib; using Valve.VR; @@ -7,42 +6,14 @@ namespace NAK.Melons.TrackedControllerFix.HarmonyPatches; internal class PlayerSetupPatches { - public static SteamVR_Behaviour_Pose vrLeftHandPose; - public static SteamVR_Behaviour_Pose vrRightHandPose; - - public static SteamVR_TrackedObject vrLeftHandTracker; - public static SteamVR_TrackedObject vrRightHandTracker; - [HarmonyPostfix] [HarmonyPatch(typeof(PlayerSetup), "Start")] private static void Post_PlayerSetup_Start(ref PlayerSetup __instance) { - // Add SteamVR_TrackedObject and get SteamVR_Behaviour_Pose - vrLeftHandTracker = __instance.vrLeftHandTracker.AddComponent(); - vrRightHandTracker = __instance.vrRightHandTracker.AddComponent(); - vrLeftHandPose = __instance.vrLeftHandTracker.GetComponent(); - vrRightHandPose = __instance.vrRightHandTracker.GetComponent(); - vrLeftHandPose.enabled = false; - vrRightHandPose.enabled = false; - } - - [HarmonyPrefix] - [HarmonyPatch(typeof(PlayerSetup), "SetupAvatarVr")] - private static void Prefix_PlayerSetup_SetupAvatarVr() - { - // This is a super lazy way of doing this... - // but this is the best way to support DesktopVRSwitch & not redo the controller inputs - if (vrLeftHandTracker != null) - { - vrLeftHandPose.enabled = true; - vrLeftHandTracker.SetDeviceIndex(vrLeftHandPose.GetDeviceIndex()); - vrLeftHandPose.enabled = false; - } - if (vrRightHandTracker != null) - { - vrRightHandPose.enabled = true; - vrRightHandTracker.SetDeviceIndex(vrRightHandPose.GetDeviceIndex()); - vrRightHandPose.enabled = false; - } + // Add TrackedControllerFix + var vrLeftHandTracker = __instance.vrLeftHandTracker.AddComponent(); + vrLeftHandTracker.inputSource = SteamVR_Input_Sources.LeftHand; + var vrRightHandTracker = __instance.vrRightHandTracker.AddComponent(); + vrRightHandTracker.inputSource = SteamVR_Input_Sources.RightHand; } } \ No newline at end of file diff --git a/TrackedControllerFix/TrackedControllerFix.cs b/TrackedControllerFix/TrackedControllerFix.cs new file mode 100644 index 0000000..0078e3c --- /dev/null +++ b/TrackedControllerFix/TrackedControllerFix.cs @@ -0,0 +1,54 @@ +using UnityEngine; +using Valve.VR; + +namespace NAK.Melons.TrackedControllerFix; + +public class TrackedControllerFix : MonoBehaviour +{ + public SteamVR_Input_Sources inputSource; + public int deviceIndex; + + private SteamVR_TrackedObject trackedObject; + private SteamVR_Behaviour_Pose oldBehaviourPose; + private SteamVR_Action_Pose actionPose = SteamVR_Input.GetAction("Pose", false); + + private void Start() + { + trackedObject = gameObject.AddComponent(); + oldBehaviourPose = gameObject.GetComponent(); + oldBehaviourPose.broadcastDeviceChanges = false; //this fucks us + if (actionPose != null) CheckDeviceIndex(); + } + + private void OnEnable() + { + if (actionPose != null) actionPose[inputSource].onDeviceConnectedChanged += OnDeviceConnectedChanged; + oldBehaviourPose.enabled = false; + } + + private void OnDisable() + { + if (actionPose != null) actionPose[inputSource].onDeviceConnectedChanged -= OnDeviceConnectedChanged; + oldBehaviourPose.enabled = true; + } + + private void OnDeviceConnectedChanged(SteamVR_Action_Pose changedAction, SteamVR_Input_Sources changedSource, bool connected) + { + if (actionPose != changedAction) actionPose = changedAction; + if (changedSource != inputSource) return; + CheckDeviceIndex(); + } + + private void CheckDeviceIndex() + { + if (actionPose[inputSource].active && actionPose[inputSource].deviceIsConnected) + { + int trackedDeviceIndex = (int)actionPose[inputSource].trackedDeviceIndex; + if (deviceIndex != trackedDeviceIndex) + { + deviceIndex = trackedDeviceIndex; + trackedObject.SetDeviceIndex(deviceIndex); + } + } + } +} \ No newline at end of file From 58962d8f51a9c1b19ccc8ec6a2fc6e15546f6b4f Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Thu, 23 Feb 2023 03:10:08 -0600 Subject: [PATCH 6/6] Update AssemblyInfo.cs --- TrackedControllerFix/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TrackedControllerFix/Properties/AssemblyInfo.cs b/TrackedControllerFix/Properties/AssemblyInfo.cs index 91426a4..6e0b55a 100644 --- a/TrackedControllerFix/Properties/AssemblyInfo.cs +++ b/TrackedControllerFix/Properties/AssemblyInfo.cs @@ -25,6 +25,6 @@ using System.Reflection; namespace NAK.Melons.TrackedControllerFix.Properties; internal static class AssemblyInfoParams { - public const string Version = "1.0.1"; + public const string Version = "1.0.2"; public const string Author = "NotAKidoS"; } \ No newline at end of file