From 287db410c4c737f1accbfa92b2cc63beb59f8dd6 Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Fri, 20 Jan 2023 02:33:59 -0600 Subject: [PATCH 1/7] Initial commit --- .gitattributes | 2 + .gitignore | 398 +++++++++++++++++++++++++++++++++++++++++++++++++ LICENSE | 21 +++ README.md | 2 + 4 files changed, 423 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README.md 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. diff --git a/README.md b/README.md new file mode 100644 index 0000000..b3579e6 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# PortableCameraAdditions + added few more settings to camera From ef01bd85977ce2ebb30dfc101e0bb41600f8198d Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Fri, 20 Jan 2023 02:39:57 -0600 Subject: [PATCH 2/7] initial release i built this in like 4 hours fuck --- PortableCamera-FarClipFix/HarmonyPatches.cs | 33 +++ PortableCamera-FarClipFix/Main.cs | 11 + .../PortableCameraAdditions.csproj | 64 +++++ .../PortableCameraAdditions.sln | 25 ++ .../Properties/AssemblyInfo.cs | 30 +++ .../VisualMods/AdditionalSettings.cs | 222 ++++++++++++++++++ PortableCamera-FarClipFix/format.json | 24 ++ 7 files changed, 409 insertions(+) create mode 100644 PortableCamera-FarClipFix/HarmonyPatches.cs create mode 100644 PortableCamera-FarClipFix/Main.cs create mode 100644 PortableCamera-FarClipFix/PortableCameraAdditions.csproj create mode 100644 PortableCamera-FarClipFix/PortableCameraAdditions.sln create mode 100644 PortableCamera-FarClipFix/Properties/AssemblyInfo.cs create mode 100644 PortableCamera-FarClipFix/VisualMods/AdditionalSettings.cs create mode 100644 PortableCamera-FarClipFix/format.json diff --git a/PortableCamera-FarClipFix/HarmonyPatches.cs b/PortableCamera-FarClipFix/HarmonyPatches.cs new file mode 100644 index 0000000..a234fea --- /dev/null +++ b/PortableCamera-FarClipFix/HarmonyPatches.cs @@ -0,0 +1,33 @@ +using ABI_RC.Systems.Camera; +using HarmonyLib; +using NAK.Melons.PortableCameraAdditions.VisualMods; +using UnityEngine; + +namespace NAK.Melons.PortableCameraAdditions.HarmonyPatches; + +[HarmonyPatch] +internal class HarmonyPatches +{ + [HarmonyPostfix] + [HarmonyPatch(typeof(PortableCamera), "Start")] + private static void Postfix_PortableCamera_Start(ref PortableCamera __instance) + { + //run mod.Setup() instead of registering full mod with icon + AdditionalSettings mainMod = new AdditionalSettings(); + mainMod.Setup(__instance); + } + + [HarmonyPostfix] + [HarmonyPatch(typeof(PortableCamera), "OnWorldLoaded")] + private static void Postfix_PortableCamera_OnWorldLoaded(Camera worldCamera) + { + AdditionalSettings.Instance?.OnWorldLoaded(worldCamera); + } + + [HarmonyPostfix] + [HarmonyPatch(typeof(PortableCamera), "UpdateOptionsDisplay")] + private static void Postfix_PortableCamera_UpdateOptionsDisplay(ref bool ____showExpertSettings) + { + AdditionalSettings.Instance?.OnUpdateOptionsDisplay(____showExpertSettings); + } +} \ No newline at end of file diff --git a/PortableCamera-FarClipFix/Main.cs b/PortableCamera-FarClipFix/Main.cs new file mode 100644 index 0000000..de0a400 --- /dev/null +++ b/PortableCamera-FarClipFix/Main.cs @@ -0,0 +1,11 @@ +using MelonLoader; + +namespace NAK.Melons.PortableCameraAdditions; + +public class PortableCameraAdditions : MelonMod +{ + public override void OnInitializeMelon() + { + //boobs + } +} \ No newline at end of file diff --git a/PortableCamera-FarClipFix/PortableCameraAdditions.csproj b/PortableCamera-FarClipFix/PortableCameraAdditions.csproj new file mode 100644 index 0000000..5ac0e23 --- /dev/null +++ b/PortableCamera-FarClipFix/PortableCameraAdditions.csproj @@ -0,0 +1,64 @@ + + + + + net472 + 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 + + + ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\Mods\BTKUILib.dll + + + ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll + + + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\MelonLoader\MelonLoader.dll + + + ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Unity.Postprocessing.Runtime.dll + + + ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Unity.TextMeshPro.dll + + + ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll + + + ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AssetBundleModule.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 + + + ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.PhysicsModule.dll + + + ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.UI.dll + + + + + + + + + diff --git a/PortableCamera-FarClipFix/PortableCameraAdditions.sln b/PortableCamera-FarClipFix/PortableCameraAdditions.sln new file mode 100644 index 0000000..84887ac --- /dev/null +++ b/PortableCamera-FarClipFix/PortableCameraAdditions.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}") = "PortableCameraAdditions", "PortableCameraAdditions.csproj", "{3FFA9B93-18BA-4785-862A-DBDD95BE96A3}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3FFA9B93-18BA-4785-862A-DBDD95BE96A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3FFA9B93-18BA-4785-862A-DBDD95BE96A3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3FFA9B93-18BA-4785-862A-DBDD95BE96A3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3FFA9B93-18BA-4785-862A-DBDD95BE96A3}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {99545B29-77BE-44B4-8DC3-99133AB16810} + EndGlobalSection +EndGlobal diff --git a/PortableCamera-FarClipFix/Properties/AssemblyInfo.cs b/PortableCamera-FarClipFix/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..5566156 --- /dev/null +++ b/PortableCamera-FarClipFix/Properties/AssemblyInfo.cs @@ -0,0 +1,30 @@ +using MelonLoader; +using NAK.Melons.PortableCameraAdditions.Properties; +using System.Reflection; + + +[assembly: AssemblyVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyTitle(nameof(NAK.Melons.PortableCameraAdditions))] +[assembly: AssemblyCompany(AssemblyInfoParams.Author)] +[assembly: AssemblyProduct(nameof(NAK.Melons.PortableCameraAdditions))] + +[assembly: MelonInfo( + typeof(NAK.Melons.PortableCameraAdditions.PortableCameraAdditions), + nameof(NAK.Melons.PortableCameraAdditions), + AssemblyInfoParams.Version, + AssemblyInfoParams.Author, + downloadLink: "https://github.com/NotAKidOnSteam/PortableCameraAdditions" +)] + +[assembly: MelonGame("Alpha Blend Interactive", "ChilloutVR")] +[assembly: MelonPlatform(MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] +[assembly: MelonPlatformDomain(MelonPlatformDomainAttribute.CompatibleDomains.MONO)] + +namespace NAK.Melons.PortableCameraAdditions.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/PortableCamera-FarClipFix/VisualMods/AdditionalSettings.cs b/PortableCamera-FarClipFix/VisualMods/AdditionalSettings.cs new file mode 100644 index 0000000..ca351c1 --- /dev/null +++ b/PortableCamera-FarClipFix/VisualMods/AdditionalSettings.cs @@ -0,0 +1,222 @@ +using ABI_RC.Systems.Camera; +using UnityEngine; + +namespace NAK.Melons.PortableCameraAdditions.VisualMods; + +public class AdditionalSettings +{ + public static AdditionalSettings Instance; + + public Camera referenceCamera; + public bool orthographicMode; + + //Should I move these to MelonPrefs? + public bool CopyWorldNearClip; + public bool CopyWorldFarClip; + + private PortableCameraSetting setting_NearClip; + private PortableCameraSetting setting_FarClip; + + private PortableCameraSetting setting_OrthographicSize; + private PortableCameraSetting setting_OrthographicNearClip; + private PortableCameraSetting setting_OrthographicFarClip; + + public void Setup(PortableCamera __instance) + { + Instance = this; + + __instance.@interface.AddAndGetHeader(null, typeof(AdditionalSettings), "Additional Settings"); + + //Basic Settings + + PortableCameraSetting setting_CopyWorldNearClip = __instance.@interface.AddAndGetSetting(PortableCameraSettingType.Bool); + setting_CopyWorldNearClip.BoolChanged = new Action(value => UpdateCameraSettingBool("CopyNearClip", value)); + setting_CopyWorldNearClip.SettingName = "CopyNearClip"; + setting_CopyWorldNearClip.DisplayName = "Copy World Near Clip"; + setting_CopyWorldNearClip.OriginType = typeof(AdditionalSettings); + setting_CopyWorldNearClip.DefaultValue = true; + setting_CopyWorldNearClip.Load(); + + PortableCameraSetting setting_CopyWorldFarClip = __instance.@interface.AddAndGetSetting(PortableCameraSettingType.Bool); + setting_CopyWorldFarClip.BoolChanged = new Action(value => UpdateCameraSettingBool("CopyFarClip", value)); + setting_CopyWorldFarClip.SettingName = "CopyFarClip"; + setting_CopyWorldFarClip.DisplayName = "Copy World Far Clip"; + setting_CopyWorldFarClip.OriginType = typeof(AdditionalSettings); + setting_CopyWorldFarClip.DefaultValue = true; + setting_CopyWorldFarClip.Load(); + + //Expert Settings + + PortableCameraSetting setting_Orthographic = __instance.@interface.AddAndGetSetting(PortableCameraSettingType.Bool); + setting_Orthographic.BoolChanged = new Action(value => UpdateCameraSettingBool("Orthographic", value)); + setting_Orthographic.SettingName = "Orthographic"; + setting_Orthographic.DisplayName = "Orthographic"; + setting_Orthographic.isExpertSetting = true; + setting_Orthographic.OriginType = typeof(AdditionalSettings); + setting_Orthographic.DefaultValue = false; + setting_Orthographic.Load(); + + //Normal Clipping Settings + + setting_NearClip = __instance.@interface.AddAndGetSetting(PortableCameraSettingType.Float); + setting_NearClip.FloatChanged = new Action(value => UpdateCameraSettingFloat("NearClip", value)); + setting_NearClip.SettingName = "NearClip"; + setting_NearClip.DisplayName = "Near Clip Plane"; + setting_NearClip.isExpertSetting = true; + setting_NearClip.OriginType = typeof(AdditionalSettings); + setting_NearClip.DefaultValue = 0.01f; + setting_NearClip.MinValue = 0.001f; + setting_NearClip.MaxValue = 5000f; + setting_NearClip.Load(); + + setting_FarClip = __instance.@interface.AddAndGetSetting(PortableCameraSettingType.Float); + setting_FarClip.FloatChanged = new Action(value => UpdateCameraSettingFloat("FarClip", value)); + setting_FarClip.SettingName = "FarClip"; + setting_FarClip.DisplayName = "Far Clip Plane"; + setting_FarClip.isExpertSetting = true; + setting_FarClip.OriginType = typeof(AdditionalSettings); + setting_FarClip.DefaultValue = 1000f; + setting_FarClip.MinValue = 0.002f; + setting_FarClip.MaxValue = 5000f; + setting_FarClip.Load(); + + //Orthographic Settings + + setting_OrthographicSize = __instance.@interface.AddAndGetSetting(PortableCameraSettingType.Float); + setting_OrthographicSize.FloatChanged = new Action(value => UpdateCameraSettingFloat("OrthographicSize", value)); + setting_OrthographicSize.SettingName = "OrthographicSize"; + setting_OrthographicSize.DisplayName = "Orthographic Size"; + setting_OrthographicSize.isExpertSetting = true; + setting_OrthographicSize.OriginType = typeof(AdditionalSettings); + setting_OrthographicSize.DefaultValue = 5f; + setting_OrthographicSize.MinValue = 0.01f; + setting_OrthographicSize.MaxValue = 150f; + setting_OrthographicSize.Load(); + + setting_OrthographicNearClip = __instance.@interface.AddAndGetSetting(PortableCameraSettingType.Float); + setting_OrthographicNearClip.FloatChanged = new Action(value => UpdateCameraSettingFloat("OrthographicNearClip", value)); + setting_OrthographicNearClip.SettingName = "OrthographicNearClip"; + setting_OrthographicNearClip.DisplayName = "Orthographic Near"; + setting_OrthographicNearClip.isExpertSetting = true; + setting_OrthographicNearClip.OriginType = typeof(AdditionalSettings); + setting_OrthographicNearClip.DefaultValue = 0.001f; + setting_OrthographicNearClip.MinValue = -5000f; + setting_OrthographicNearClip.MaxValue = 5000f; + setting_OrthographicNearClip.Load(); + + setting_OrthographicFarClip = __instance.@interface.AddAndGetSetting(PortableCameraSettingType.Float); + setting_OrthographicFarClip.FloatChanged = new Action(value => UpdateCameraSettingFloat("OrthographicFarClip", value)); + setting_OrthographicFarClip.SettingName = "OrthographicFarClip"; + setting_OrthographicFarClip.DisplayName = "Orthographic Far"; + setting_OrthographicFarClip.isExpertSetting = true; + setting_OrthographicFarClip.OriginType = typeof(AdditionalSettings); + setting_OrthographicFarClip.DefaultValue = 1000f; + setting_OrthographicFarClip.MinValue = -5000f; + setting_OrthographicFarClip.MaxValue = 5000f; + setting_OrthographicFarClip.Load(); + + OnUpdateOptionsDisplay(); + } + + public void OnWorldLoaded(Camera playerCamera) + { + orthographicMode = false; + referenceCamera = playerCamera; + if (referenceCamera != null) + { + if (CopyWorldNearClip) + setting_NearClip.Set(referenceCamera.nearClipPlane); + if (CopyWorldFarClip) + setting_FarClip.Set(referenceCamera.farClipPlane); + } + } + + public void OnUpdateOptionsDisplay(bool expertMode = true) + { + if (!expertMode) + { + return; + } + setting_NearClip.settingsObject.SetActive(!orthographicMode); + setting_FarClip.settingsObject.SetActive(!orthographicMode); + setting_OrthographicSize.settingsObject.SetActive(orthographicMode); + setting_OrthographicNearClip.settingsObject.SetActive(orthographicMode); + setting_OrthographicFarClip.settingsObject.SetActive(orthographicMode); + } + + public void UpdateOrthographicMode() + { + if (PortableCamera.Instance != null) + { + PortableCamera.Instance.cameraComponent.orthographic = orthographicMode; + } + if (orthographicMode) + { + UpdateCameraSettingFloat("OrthographicNearClip", setting_OrthographicNearClip.Slider.value); + UpdateCameraSettingFloat("OrthographicFarClip", setting_OrthographicFarClip.Slider.value); + } + else + { + UpdateCameraSettingFloat("NearClip", setting_NearClip.Slider.value); + UpdateCameraSettingFloat("FarClip", setting_FarClip.Slider.value); + } + OnUpdateOptionsDisplay(); + } + + public void UpdateCameraSettingBool(string setting, bool value) + { + if (referenceCamera != null) + { + switch (setting) + { + //Camera Settings + case "Orthographic": + orthographicMode = value; + UpdateOrthographicMode(); + break; + //Internal Settings + case "CopyNearClip": + CopyWorldNearClip = value; + if (CopyWorldNearClip) + setting_NearClip.Set(referenceCamera.nearClipPlane); + break; + case "CopyFarClip": + CopyWorldFarClip = value; + if (CopyWorldFarClip) + setting_FarClip.Set(referenceCamera.farClipPlane); + break; + } + } + } + + public void UpdateCameraSettingFloat(string setting, float value) + { + if (PortableCamera.Instance != null) + { + switch (setting) + { + //Camera Settings + case "NearClip": + if (!orthographicMode) + PortableCamera.Instance.cameraComponent.nearClipPlane = value; + break; + case "FarClip": + if (!orthographicMode) + PortableCamera.Instance.cameraComponent.farClipPlane = value; + break; + //Orthographic Mode + case "OrthographicSize": + PortableCamera.Instance.cameraComponent.orthographicSize = value; + break; + case "OrthographicNearClip": + if (orthographicMode) + PortableCamera.Instance.cameraComponent.nearClipPlane = value; + break; + case "OrthographicFarClip": + if (orthographicMode) + PortableCamera.Instance.cameraComponent.farClipPlane = value; + break; + } + } + } +} diff --git a/PortableCamera-FarClipFix/format.json b/PortableCamera-FarClipFix/format.json new file mode 100644 index 0000000..c3115d3 --- /dev/null +++ b/PortableCamera-FarClipFix/format.json @@ -0,0 +1,24 @@ +{ + "_id": 95, + "name": "PortableCameraAdditions", + "modversion": "3.0.0", + "gameversion": "2022r170", + "loaderversion": "0.5.7", + "modtype": "Mod", + "author": "NotAKidoS", + "description": "Corrects MM and QM position when avatar is being scaled.\n\nDesktop menus will now always follow camera while open.", + "searchtags": [ + "menu", + "scale", + "avatarscale", + "slider" + ], + "requirements": [ + "None" + "None" + ], + "downloadlink": "https://github.com/NotAKidOnSteam/PortableCameraAdditions/releases/download/v3.0.0/PortableCameraAdditions.dll", + "sourcelink": "https://github.com/NotAKidOnSteam/PortableCameraAdditions/", + "changelog": "Removed collision scaling feature as it is now native.\nAdjusted QM scaling for VR.\nAdded menu correction for Desktop so you can use menus while moving.\nImmediate viewpoint correction for Desktop during scaling.", + "embedcolor": "804221" +} \ No newline at end of file From 0b7d6898e0a85190ea607d71ca78c6ff1fcd8d1f Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Fri, 20 Jan 2023 02:42:30 -0600 Subject: [PATCH 3/7] Update README.md --- README.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/README.md b/README.md index b3579e6..d8427c0 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,29 @@ # PortableCameraAdditions added few more settings to camera + +![image](https://user-images.githubusercontent.com/37721153/213652852-63ef50da-f6b2-4d69-a28d-0414e3d51792.png) + +--- + +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 + +> I am not affiliated with ABI in any official capacity, these mods are not endorsed or outright permitted by ABI and are subject to scrutiny. + +> Neither I nor these mods are in any way affiliated with Alpha Blend Interactive and/or ChilloutVR. Using these modifications might cause issues with the performance, security or stability of the game. Use at your own risk. + +> Any modifications that are not approved can get your ABI account terminated and such this modification is following the "modding guidelines" at the best it could be. +> They reserve the right to punish users using my mod. +> If you are scared of using modifications in your game do not install mods. + +> I do not affiliate ABI and the mod is not supported by ABI. + +> Me and this modification are in no affiliation with ABI and not supported by ABI. + +> This mod is not affiliated with Alpha Blend Interactive. The mod comes with no warranty. Use at your own risk, as I am not responsible for any misuse. + +> I'm not affiliated with Alpha Blend Interactive and this mod is not officially supported by the game. + +> When releasing mods to the public, it is required to state, that the mod authors and modification are in no affiliation with ABI and not supported by ABI. :trollface: + +> i ran out of places to steal disclaimers from From 3b8e6b3c0041421f96c82a421aebd65805295899 Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Fri, 20 Jan 2023 02:51:42 -0600 Subject: [PATCH 4/7] rename folder --- PortableCamera-FarClipFix/format.json | 24 ------------------ .../HarmonyPatches.cs | 0 .../Main.cs | 0 .../PortableCameraAdditions.csproj | 0 .../PortableCameraAdditions.sln | 0 .../Properties/AssemblyInfo.cs | 0 .../VisualMods/AdditionalSettings.cs | 0 PortableCameraAdditions/format.json | 25 +++++++++++++++++++ 8 files changed, 25 insertions(+), 24 deletions(-) delete mode 100644 PortableCamera-FarClipFix/format.json rename {PortableCamera-FarClipFix => PortableCameraAdditions}/HarmonyPatches.cs (100%) rename {PortableCamera-FarClipFix => PortableCameraAdditions}/Main.cs (100%) rename {PortableCamera-FarClipFix => PortableCameraAdditions}/PortableCameraAdditions.csproj (100%) rename {PortableCamera-FarClipFix => PortableCameraAdditions}/PortableCameraAdditions.sln (100%) rename {PortableCamera-FarClipFix => PortableCameraAdditions}/Properties/AssemblyInfo.cs (100%) rename {PortableCamera-FarClipFix => PortableCameraAdditions}/VisualMods/AdditionalSettings.cs (100%) create mode 100644 PortableCameraAdditions/format.json diff --git a/PortableCamera-FarClipFix/format.json b/PortableCamera-FarClipFix/format.json deleted file mode 100644 index c3115d3..0000000 --- a/PortableCamera-FarClipFix/format.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "_id": 95, - "name": "PortableCameraAdditions", - "modversion": "3.0.0", - "gameversion": "2022r170", - "loaderversion": "0.5.7", - "modtype": "Mod", - "author": "NotAKidoS", - "description": "Corrects MM and QM position when avatar is being scaled.\n\nDesktop menus will now always follow camera while open.", - "searchtags": [ - "menu", - "scale", - "avatarscale", - "slider" - ], - "requirements": [ - "None" - "None" - ], - "downloadlink": "https://github.com/NotAKidOnSteam/PortableCameraAdditions/releases/download/v3.0.0/PortableCameraAdditions.dll", - "sourcelink": "https://github.com/NotAKidOnSteam/PortableCameraAdditions/", - "changelog": "Removed collision scaling feature as it is now native.\nAdjusted QM scaling for VR.\nAdded menu correction for Desktop so you can use menus while moving.\nImmediate viewpoint correction for Desktop during scaling.", - "embedcolor": "804221" -} \ No newline at end of file diff --git a/PortableCamera-FarClipFix/HarmonyPatches.cs b/PortableCameraAdditions/HarmonyPatches.cs similarity index 100% rename from PortableCamera-FarClipFix/HarmonyPatches.cs rename to PortableCameraAdditions/HarmonyPatches.cs diff --git a/PortableCamera-FarClipFix/Main.cs b/PortableCameraAdditions/Main.cs similarity index 100% rename from PortableCamera-FarClipFix/Main.cs rename to PortableCameraAdditions/Main.cs diff --git a/PortableCamera-FarClipFix/PortableCameraAdditions.csproj b/PortableCameraAdditions/PortableCameraAdditions.csproj similarity index 100% rename from PortableCamera-FarClipFix/PortableCameraAdditions.csproj rename to PortableCameraAdditions/PortableCameraAdditions.csproj diff --git a/PortableCamera-FarClipFix/PortableCameraAdditions.sln b/PortableCameraAdditions/PortableCameraAdditions.sln similarity index 100% rename from PortableCamera-FarClipFix/PortableCameraAdditions.sln rename to PortableCameraAdditions/PortableCameraAdditions.sln diff --git a/PortableCamera-FarClipFix/Properties/AssemblyInfo.cs b/PortableCameraAdditions/Properties/AssemblyInfo.cs similarity index 100% rename from PortableCamera-FarClipFix/Properties/AssemblyInfo.cs rename to PortableCameraAdditions/Properties/AssemblyInfo.cs diff --git a/PortableCamera-FarClipFix/VisualMods/AdditionalSettings.cs b/PortableCameraAdditions/VisualMods/AdditionalSettings.cs similarity index 100% rename from PortableCamera-FarClipFix/VisualMods/AdditionalSettings.cs rename to PortableCameraAdditions/VisualMods/AdditionalSettings.cs diff --git a/PortableCameraAdditions/format.json b/PortableCameraAdditions/format.json new file mode 100644 index 0000000..68fbfb4 --- /dev/null +++ b/PortableCameraAdditions/format.json @@ -0,0 +1,25 @@ +{ + "_id": -1, + "name": "PortableCameraAdditions", + "modversion": "1.0.0", + "gameversion": "2022r170", + "loaderversion": "0.5.7", + "modtype": "Mod", + "author": "NotAKidoS", + "description": "Adds a few basic settings to the Portable Camera.\n\nExpert settings for Near Clip & Far Clip.\nExpert settings for Orthographic & Orthographic Size.\nBy default, Near Clip & Far Clip are copied on world load.", + "searchtags": [ + "camera", + "settings", + "clipping", + "clip", + "near", + "far" + ], + "requirements": [ + "None" + ], + "downloadlink": "https://github.com/NotAKidOnSteam/PortableCameraAdditions/releases/download/v1.0.0/PortableCameraAdditions.dll", + "sourcelink": "https://github.com/NotAKidOnSteam/PortableCameraAdditions/", + "changelog": "Initial Release", + "embedcolor": "9b59b6" +} \ No newline at end of file From 03bf585041dc8e93cec122d20cc6e44f9e51686e Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Thu, 9 Feb 2023 23:01:01 -0600 Subject: [PATCH 5/7] Update README.md --- README.md | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index d8427c0..896c412 100644 --- a/README.md +++ b/README.md @@ -8,22 +8,8 @@ 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 -> I am not affiliated with ABI in any official capacity, these mods are not endorsed or outright permitted by ABI and are subject to scrutiny. +> This mod is an independent creation and is not affiliated with, supported by or approved by Alpha Blend Interactive. -> Neither I nor these mods are in any way affiliated with Alpha Blend Interactive and/or ChilloutVR. Using these modifications might cause issues with the performance, security or stability of the game. Use at your own risk. +> 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. -> Any modifications that are not approved can get your ABI account terminated and such this modification is following the "modding guidelines" at the best it could be. -> They reserve the right to punish users using my mod. -> If you are scared of using modifications in your game do not install mods. - -> I do not affiliate ABI and the mod is not supported by ABI. - -> Me and this modification are in no affiliation with ABI and not supported by ABI. - -> This mod is not affiliated with Alpha Blend Interactive. The mod comes with no warranty. Use at your own risk, as I am not responsible for any misuse. - -> I'm not affiliated with Alpha Blend Interactive and this mod is not officially supported by the game. - -> When releasing mods to the public, it is required to state, that the mod authors and modification are in no affiliation with ABI and not supported by ABI. :trollface: - -> i ran out of places to steal disclaimers from +> To the best of my knowledge, I have adhered to the Modding Guidelines established by Alpha Blend Interactive. From 9dc1e00a6c151036d2f97fa82d767c3fe5efd34b Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Tue, 11 Apr 2023 14:50:11 -0500 Subject: [PATCH 6/7] a --- PortableCameraAdditions/PortableCameraAdditions.csproj | 6 ++++++ PortableCameraAdditions/Properties/AssemblyInfo.cs | 2 +- PortableCameraAdditions/VisualMods/AdditionalSettings.cs | 8 ++++++-- PortableCameraAdditions/format.json | 8 ++++---- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/PortableCameraAdditions/PortableCameraAdditions.csproj b/PortableCameraAdditions/PortableCameraAdditions.csproj index 5ac0e23..1468022 100644 --- a/PortableCameraAdditions/PortableCameraAdditions.csproj +++ b/PortableCameraAdditions/PortableCameraAdditions.csproj @@ -21,6 +21,9 @@ C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll + + ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll + ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\Mods\BTKUILib.dll @@ -45,6 +48,9 @@ C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll + + ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.ImageConversionModule.dll + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.InputLegacyModule.dll diff --git a/PortableCameraAdditions/Properties/AssemblyInfo.cs b/PortableCameraAdditions/Properties/AssemblyInfo.cs index 5566156..0e4bce9 100644 --- a/PortableCameraAdditions/Properties/AssemblyInfo.cs +++ b/PortableCameraAdditions/Properties/AssemblyInfo.cs @@ -25,6 +25,6 @@ using System.Reflection; namespace NAK.Melons.PortableCameraAdditions.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 diff --git a/PortableCameraAdditions/VisualMods/AdditionalSettings.cs b/PortableCameraAdditions/VisualMods/AdditionalSettings.cs index ca351c1..cdfb38e 100644 --- a/PortableCameraAdditions/VisualMods/AdditionalSettings.cs +++ b/PortableCameraAdditions/VisualMods/AdditionalSettings.cs @@ -11,8 +11,8 @@ public class AdditionalSettings public bool orthographicMode; //Should I move these to MelonPrefs? - public bool CopyWorldNearClip; - public bool CopyWorldFarClip; + public bool CopyWorldNearClip = true; + public bool CopyWorldFarClip = true; private PortableCameraSetting setting_NearClip; private PortableCameraSetting setting_FarClip; @@ -125,9 +125,13 @@ public class AdditionalSettings if (referenceCamera != null) { if (CopyWorldNearClip) + { setting_NearClip.Set(referenceCamera.nearClipPlane); + } if (CopyWorldFarClip) + { setting_FarClip.Set(referenceCamera.farClipPlane); + } } } diff --git a/PortableCameraAdditions/format.json b/PortableCameraAdditions/format.json index 68fbfb4..7a10181 100644 --- a/PortableCameraAdditions/format.json +++ b/PortableCameraAdditions/format.json @@ -1,7 +1,7 @@ { - "_id": -1, + "_id": 123, "name": "PortableCameraAdditions", - "modversion": "1.0.0", + "modversion": "1.0.1", "gameversion": "2022r170", "loaderversion": "0.5.7", "modtype": "Mod", @@ -18,8 +18,8 @@ "requirements": [ "None" ], - "downloadlink": "https://github.com/NotAKidOnSteam/PortableCameraAdditions/releases/download/v1.0.0/PortableCameraAdditions.dll", + "downloadlink": "https://github.com/NotAKidOnSteam/PortableCameraAdditions/releases/download/v1.0.1/PortableCameraAdditions.dll", "sourcelink": "https://github.com/NotAKidOnSteam/PortableCameraAdditions/", - "changelog": "Initial Release", + "changelog": "Imagine not actually setting stuff on world load.", "embedcolor": "9b59b6" } \ No newline at end of file From 1fcdd63a35d74b7f88d19ef57d43683e31e8b279 Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Tue, 11 Apr 2023 15:08:13 -0500 Subject: [PATCH 7/7] add F11 to fullscreen --- PortableCameraAdditions/HarmonyPatches.cs | 37 +++++++++++++++---- .../PortableCameraAdditions.csproj | 34 +++++++++-------- .../Properties/AssemblyInfo.cs | 2 +- ...ditionalSettings.cs => CameraAdditions.cs} | 22 +++++------ PortableCameraAdditions/format.json | 8 ++-- 5 files changed, 64 insertions(+), 39 deletions(-) rename PortableCameraAdditions/VisualMods/{AdditionalSettings.cs => CameraAdditions.cs} (92%) diff --git a/PortableCameraAdditions/HarmonyPatches.cs b/PortableCameraAdditions/HarmonyPatches.cs index a234fea..7df846f 100644 --- a/PortableCameraAdditions/HarmonyPatches.cs +++ b/PortableCameraAdditions/HarmonyPatches.cs @@ -1,33 +1,54 @@ using ABI_RC.Systems.Camera; using HarmonyLib; -using NAK.Melons.PortableCameraAdditions.VisualMods; using UnityEngine; namespace NAK.Melons.PortableCameraAdditions.HarmonyPatches; [HarmonyPatch] -internal class HarmonyPatches +internal class PortableCameraPatches { [HarmonyPostfix] - [HarmonyPatch(typeof(PortableCamera), "Start")] + [HarmonyPatch(typeof(PortableCamera), nameof(PortableCamera.Start))] private static void Postfix_PortableCamera_Start(ref PortableCamera __instance) { //run mod.Setup() instead of registering full mod with icon - AdditionalSettings mainMod = new AdditionalSettings(); + VisualMods.CameraAdditions mainMod = new VisualMods.CameraAdditions(); mainMod.Setup(__instance); } [HarmonyPostfix] - [HarmonyPatch(typeof(PortableCamera), "OnWorldLoaded")] + [HarmonyPatch(typeof(PortableCamera), nameof(PortableCamera.OnWorldLoaded))] private static void Postfix_PortableCamera_OnWorldLoaded(Camera worldCamera) { - AdditionalSettings.Instance?.OnWorldLoaded(worldCamera); + VisualMods.CameraAdditions.Instance?.OnWorldLoaded(worldCamera); } [HarmonyPostfix] - [HarmonyPatch(typeof(PortableCamera), "UpdateOptionsDisplay")] + [HarmonyPatch(typeof(PortableCamera), nameof(PortableCamera.UpdateOptionsDisplay))] private static void Postfix_PortableCamera_UpdateOptionsDisplay(ref bool ____showExpertSettings) { - AdditionalSettings.Instance?.OnUpdateOptionsDisplay(____showExpertSettings); + VisualMods.CameraAdditions.Instance?.OnUpdateOptionsDisplay(____showExpertSettings); + } + + [HarmonyPostfix] + [HarmonyPatch(typeof(PortableCamera), nameof(PortableCamera.Update))] + private static void Postfix_PortableCamera_Update(ref PortableCamera __instance) + { + if (Input.GetKeyDown(KeyCode.F11)) + { + bool flag = __instance.mode == MirroringMode.NoMirror; + __instance.mode = (flag) ? MirroringMode.Mirror : MirroringMode.NoMirror; + __instance.mirroringActive.SetActive(flag); + __instance.mirroringCanvas.gameObject.SetActive(flag); + } + } + + [HarmonyPostfix] + [HarmonyPatch(typeof(PortableCamera), nameof(PortableCamera.OnDisable))] + private static void Postfix_PortableCamera_OnDisable(ref PortableCamera __instance) + { + __instance.mode = MirroringMode.NoMirror; + __instance.mirroringActive.SetActive(false); + __instance.mirroringCanvas.gameObject.SetActive(false); } } \ No newline at end of file diff --git a/PortableCameraAdditions/PortableCameraAdditions.csproj b/PortableCameraAdditions/PortableCameraAdditions.csproj index 1468022..eb63fa4 100644 --- a/PortableCameraAdditions/PortableCameraAdditions.csproj +++ b/PortableCameraAdditions/PortableCameraAdditions.csproj @@ -6,6 +6,7 @@ enable latest false + True @@ -16,49 +17,52 @@ - C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\MelonLoader\0Harmony.dll + C:\Users\krist\Documents\GitHub\_ChilloutVR Modding\_ManagedLibs\0Harmony.dll - C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll + C:\Users\krist\Documents\GitHub\_ChilloutVR Modding\_ManagedLibs\Assembly-CSharp.dll - ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll + C:\Users\krist\Documents\GitHub\_ChilloutVR Modding\_ManagedLibs\Assembly-CSharp-firstpass.dll - ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\Mods\BTKUILib.dll + C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\Mods\BTKUILib.dll - ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll + C:\Users\krist\Documents\GitHub\_ChilloutVR Modding\_ManagedLibs\Cohtml.Runtime.dll - C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\MelonLoader\MelonLoader.dll + C:\Users\krist\Documents\GitHub\_ChilloutVR Modding\_ManagedLibs\MelonLoader.dll - ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Unity.Postprocessing.Runtime.dll + C:\Users\krist\Documents\GitHub\_ChilloutVR Modding\_ManagedLibs\Unity.Postprocessing.Runtime.dll - ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Unity.TextMeshPro.dll + C:\Users\krist\Documents\GitHub\_ChilloutVR Modding\_ManagedLibs\Unity.TextMeshPro.dll - ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll + C:\Users\krist\Documents\GitHub\_ChilloutVR Modding\_ManagedLibs\UnityEngine.dll - ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AssetBundleModule.dll + C:\Users\krist\Documents\GitHub\_ChilloutVR Modding\_ManagedLibs\UnityEngine.AssetBundleModule.dll - C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll + C:\Users\krist\Documents\GitHub\_ChilloutVR Modding\_ManagedLibs\UnityEngine.CoreModule.dll - ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.ImageConversionModule.dll + C:\Users\krist\Documents\GitHub\_ChilloutVR Modding\_ManagedLibs\UnityEngine.ImageConversionModule.dll - C:\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.InputLegacyModule.dll + C:\Users\krist\Documents\GitHub\_ChilloutVR Modding\_ManagedLibs\UnityEngine.InputLegacyModule.dll - ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.PhysicsModule.dll + C:\Users\krist\Documents\GitHub\_ChilloutVR Modding\_ManagedLibs\UnityEngine.PhysicsModule.dll - ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.UI.dll + C:\Users\krist\Documents\GitHub\_ChilloutVR Modding\_ManagedLibs\UnityEngine.UI.dll + + + ..\..\..\_ManagedLibs\UnityEngine.UIModule.dll diff --git a/PortableCameraAdditions/Properties/AssemblyInfo.cs b/PortableCameraAdditions/Properties/AssemblyInfo.cs index 0e4bce9..ad9a385 100644 --- a/PortableCameraAdditions/Properties/AssemblyInfo.cs +++ b/PortableCameraAdditions/Properties/AssemblyInfo.cs @@ -25,6 +25,6 @@ using System.Reflection; namespace NAK.Melons.PortableCameraAdditions.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 diff --git a/PortableCameraAdditions/VisualMods/AdditionalSettings.cs b/PortableCameraAdditions/VisualMods/CameraAdditions.cs similarity index 92% rename from PortableCameraAdditions/VisualMods/AdditionalSettings.cs rename to PortableCameraAdditions/VisualMods/CameraAdditions.cs index cdfb38e..d038725 100644 --- a/PortableCameraAdditions/VisualMods/AdditionalSettings.cs +++ b/PortableCameraAdditions/VisualMods/CameraAdditions.cs @@ -3,9 +3,9 @@ using UnityEngine; namespace NAK.Melons.PortableCameraAdditions.VisualMods; -public class AdditionalSettings +public class CameraAdditions { - public static AdditionalSettings Instance; + public static CameraAdditions Instance; public Camera referenceCamera; public bool orthographicMode; @@ -25,7 +25,7 @@ public class AdditionalSettings { Instance = this; - __instance.@interface.AddAndGetHeader(null, typeof(AdditionalSettings), "Additional Settings"); + __instance.@interface.AddAndGetHeader(null, typeof(CameraAdditions), "Additional Settings"); //Basic Settings @@ -33,7 +33,7 @@ public class AdditionalSettings setting_CopyWorldNearClip.BoolChanged = new Action(value => UpdateCameraSettingBool("CopyNearClip", value)); setting_CopyWorldNearClip.SettingName = "CopyNearClip"; setting_CopyWorldNearClip.DisplayName = "Copy World Near Clip"; - setting_CopyWorldNearClip.OriginType = typeof(AdditionalSettings); + setting_CopyWorldNearClip.OriginType = typeof(CameraAdditions); setting_CopyWorldNearClip.DefaultValue = true; setting_CopyWorldNearClip.Load(); @@ -41,7 +41,7 @@ public class AdditionalSettings setting_CopyWorldFarClip.BoolChanged = new Action(value => UpdateCameraSettingBool("CopyFarClip", value)); setting_CopyWorldFarClip.SettingName = "CopyFarClip"; setting_CopyWorldFarClip.DisplayName = "Copy World Far Clip"; - setting_CopyWorldFarClip.OriginType = typeof(AdditionalSettings); + setting_CopyWorldFarClip.OriginType = typeof(CameraAdditions); setting_CopyWorldFarClip.DefaultValue = true; setting_CopyWorldFarClip.Load(); @@ -52,7 +52,7 @@ public class AdditionalSettings setting_Orthographic.SettingName = "Orthographic"; setting_Orthographic.DisplayName = "Orthographic"; setting_Orthographic.isExpertSetting = true; - setting_Orthographic.OriginType = typeof(AdditionalSettings); + setting_Orthographic.OriginType = typeof(CameraAdditions); setting_Orthographic.DefaultValue = false; setting_Orthographic.Load(); @@ -63,7 +63,7 @@ public class AdditionalSettings setting_NearClip.SettingName = "NearClip"; setting_NearClip.DisplayName = "Near Clip Plane"; setting_NearClip.isExpertSetting = true; - setting_NearClip.OriginType = typeof(AdditionalSettings); + setting_NearClip.OriginType = typeof(CameraAdditions); setting_NearClip.DefaultValue = 0.01f; setting_NearClip.MinValue = 0.001f; setting_NearClip.MaxValue = 5000f; @@ -74,7 +74,7 @@ public class AdditionalSettings setting_FarClip.SettingName = "FarClip"; setting_FarClip.DisplayName = "Far Clip Plane"; setting_FarClip.isExpertSetting = true; - setting_FarClip.OriginType = typeof(AdditionalSettings); + setting_FarClip.OriginType = typeof(CameraAdditions); setting_FarClip.DefaultValue = 1000f; setting_FarClip.MinValue = 0.002f; setting_FarClip.MaxValue = 5000f; @@ -87,7 +87,7 @@ public class AdditionalSettings setting_OrthographicSize.SettingName = "OrthographicSize"; setting_OrthographicSize.DisplayName = "Orthographic Size"; setting_OrthographicSize.isExpertSetting = true; - setting_OrthographicSize.OriginType = typeof(AdditionalSettings); + setting_OrthographicSize.OriginType = typeof(CameraAdditions); setting_OrthographicSize.DefaultValue = 5f; setting_OrthographicSize.MinValue = 0.01f; setting_OrthographicSize.MaxValue = 150f; @@ -98,7 +98,7 @@ public class AdditionalSettings setting_OrthographicNearClip.SettingName = "OrthographicNearClip"; setting_OrthographicNearClip.DisplayName = "Orthographic Near"; setting_OrthographicNearClip.isExpertSetting = true; - setting_OrthographicNearClip.OriginType = typeof(AdditionalSettings); + setting_OrthographicNearClip.OriginType = typeof(CameraAdditions); setting_OrthographicNearClip.DefaultValue = 0.001f; setting_OrthographicNearClip.MinValue = -5000f; setting_OrthographicNearClip.MaxValue = 5000f; @@ -109,7 +109,7 @@ public class AdditionalSettings setting_OrthographicFarClip.SettingName = "OrthographicFarClip"; setting_OrthographicFarClip.DisplayName = "Orthographic Far"; setting_OrthographicFarClip.isExpertSetting = true; - setting_OrthographicFarClip.OriginType = typeof(AdditionalSettings); + setting_OrthographicFarClip.OriginType = typeof(CameraAdditions); setting_OrthographicFarClip.DefaultValue = 1000f; setting_OrthographicFarClip.MinValue = -5000f; setting_OrthographicFarClip.MaxValue = 5000f; diff --git a/PortableCameraAdditions/format.json b/PortableCameraAdditions/format.json index 7a10181..f73d7df 100644 --- a/PortableCameraAdditions/format.json +++ b/PortableCameraAdditions/format.json @@ -1,12 +1,12 @@ { "_id": 123, "name": "PortableCameraAdditions", - "modversion": "1.0.1", + "modversion": "1.0.2", "gameversion": "2022r170", "loaderversion": "0.5.7", "modtype": "Mod", "author": "NotAKidoS", - "description": "Adds a few basic settings to the Portable Camera.\n\nExpert settings for Near Clip & Far Clip.\nExpert settings for Orthographic & Orthographic Size.\nBy default, Near Clip & Far Clip are copied on world load.", + "description": "Adds a few basic settings to the Portable Camera.\n\nExpert settings for Near Clip & Far Clip.\nExpert settings for Orthographic & Orthographic Size.\nBy default, Near Clip & Far Clip are copied on world load.\nF11 to fullscreen on Desktop.", "searchtags": [ "camera", "settings", @@ -18,8 +18,8 @@ "requirements": [ "None" ], - "downloadlink": "https://github.com/NotAKidOnSteam/PortableCameraAdditions/releases/download/v1.0.1/PortableCameraAdditions.dll", + "downloadlink": "https://github.com/NotAKidOnSteam/PortableCameraAdditions/releases/download/v1.0.2/PortableCameraAdditions.dll", "sourcelink": "https://github.com/NotAKidOnSteam/PortableCameraAdditions/", - "changelog": "Imagine not actually setting stuff on world load.", + "changelog": "Added F11 bind to fullscreen Portable Camera on Desktop.", "embedcolor": "9b59b6" } \ No newline at end of file