From acd2eeb4d7aa218d93c5a6fe38a8d2f19fc6c1a8 Mon Sep 17 00:00:00 2001 From: Arne Kiesewetter Date: Wed, 18 Oct 2023 01:45:52 +0200 Subject: [PATCH] Add project files. --- .gitattributes | 63 +++ .gitignore | 340 ++++++++++++++ BoundedUIX.sln | 25 + BoundedUIX/AxisTranslationGizmoPatches.cs | 86 ++++ BoundedUIX/BoundedUIX.cs | 65 +++ BoundedUIX/BoundedUIX.csproj | 69 +++ BoundedUIX/DevToolTipPatches.cs | 80 ++++ BoundedUIX/GizmoPatches.cs | 31 ++ BoundedUIX/Helpers.cs | 69 +++ BoundedUIX/OriginalRect.cs | 29 ++ BoundedUIX/PlaneTranslationGizmoPatches.cs | 82 ++++ BoundedUIX/RectTransformPatches.cs | 69 +++ BoundedUIX/ScaleGizmoPatches.cs | 73 +++ BoundedUIX/SlotAddingPatches.cs | 142 ++++++ BoundedUIX/SlotGizmoPatches.cs | 107 +++++ BoundedUIX/TranslationGizmoPatches.cs | 25 + LICENSE | 504 +++++++++++++++++++++ README.md | 15 + 18 files changed, 1874 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 BoundedUIX.sln create mode 100644 BoundedUIX/AxisTranslationGizmoPatches.cs create mode 100644 BoundedUIX/BoundedUIX.cs create mode 100644 BoundedUIX/BoundedUIX.csproj create mode 100644 BoundedUIX/DevToolTipPatches.cs create mode 100644 BoundedUIX/GizmoPatches.cs create mode 100644 BoundedUIX/Helpers.cs create mode 100644 BoundedUIX/OriginalRect.cs create mode 100644 BoundedUIX/PlaneTranslationGizmoPatches.cs create mode 100644 BoundedUIX/RectTransformPatches.cs create mode 100644 BoundedUIX/ScaleGizmoPatches.cs create mode 100644 BoundedUIX/SlotAddingPatches.cs create mode 100644 BoundedUIX/SlotGizmoPatches.cs create mode 100644 BoundedUIX/TranslationGizmoPatches.cs create mode 100644 LICENSE create mode 100644 README.md diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1ff0c42 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,63 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4ce6fdd --- /dev/null +++ b/.gitignore @@ -0,0 +1,340 @@ +## 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/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# 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 + +# 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/ + +# 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 +*.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 + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# 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 +# 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 + +# 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 +*- Backup*.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 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/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# 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/ + +# BeatPulse healthcheck temp database +healthchecksdb \ No newline at end of file diff --git a/BoundedUIX.sln b/BoundedUIX.sln new file mode 100644 index 0000000..f771286 --- /dev/null +++ b/BoundedUIX.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31727.386 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BoundedUIX", "BoundedUIX\BoundedUIX.csproj", "{0322B2EF-7452-479D-BAE2-FCAB75033337}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0322B2EF-7452-479D-BAE2-FCAB75033337}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0322B2EF-7452-479D-BAE2-FCAB75033337}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0322B2EF-7452-479D-BAE2-FCAB75033337}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0322B2EF-7452-479D-BAE2-FCAB75033337}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0322B2EF-7452-479D-BAE2-FCAB75033337} + EndGlobalSection +EndGlobal diff --git a/BoundedUIX/AxisTranslationGizmoPatches.cs b/BoundedUIX/AxisTranslationGizmoPatches.cs new file mode 100644 index 0000000..16c008c --- /dev/null +++ b/BoundedUIX/AxisTranslationGizmoPatches.cs @@ -0,0 +1,86 @@ +using Elements.Core; +using FrooxEngine; +using FrooxEngine.UIX; +using FrooxEngine.Undo; +using HarmonyLib; + +namespace BoundedUIX +{ + [HarmonyPatch(typeof(AxisTranslationGizmo))] + internal static class AxisTranslationGizmoPatches + { + [HarmonyPostfix] + [HarmonyPatch(nameof(AxisTranslationGizmo.OnInteractionBegin))] + private static void OnInteractionBeginPostfix(AxisTranslationGizmo __instance) + { + if (!BoundedUIX.EnableUIXGizmos || !__instance.TargetSlot.Target.TryGetMovableRectTransform(out RectTransform rectTransform)) + return; + + var originalTransform = rectTransform.GetOriginal(); + originalTransform.Update(rectTransform); + + __instance.World.BeginUndoBatch("Undo.TranslateAlongAxis".AsLocaleKey()); + + if (!originalTransform.Local) + { + rectTransform.OffsetMin.CreateUndoPoint(true); + rectTransform.OffsetMax.CreateUndoPoint(true); + } + else + { + rectTransform.AnchorMin.CreateUndoPoint(true); + rectTransform.AnchorMax.CreateUndoPoint(true); + } + + __instance.World.EndUndoBatch(); + } + + [HarmonyPrefix] + [HarmonyPatch(nameof(AxisTranslationGizmo.UpdatePoint))] + private static bool UpdatePointPrefix(AxisTranslationGizmo __instance, float3 localPoint) + { + var targetSlot = __instance.TargetSlot.Target; + if (!BoundedUIX.EnableUIXGizmos || !targetSlot.TryGetMovableRectTransform(out var rectTransform)) + return true; + + var offsetPoint = localPoint - __instance._pointOffset; + var projectedPoint = MathX.Project(offsetPoint, __instance.LocalAxis); + projectedPoint = __instance.Slot.LocalPointToGlobal(projectedPoint); + projectedPoint = __instance.PointSpace.Space.GlobalPointToLocal(projectedPoint); + var originalRect = rectTransform.GetOriginal(); + var translationOffset = (projectedPoint - __instance.PointSpace.Space.GlobalPointToLocal(originalRect.Center)).xy; + + if (__instance.TargetValue.Target != null) + { + __instance.TargetValue.Target.Value = translationOffset.Magnitude; + } + + var pxOffset = rectTransform.Canvas.UnitScale.Value * translationOffset; + if (!originalRect.Local) + { + if (rectTransform.OffsetMin.CanSet()) + rectTransform.OffsetMin.Value += pxOffset; + + if (rectTransform.OffsetMax.CanSet()) + rectTransform.OffsetMax.Value += pxOffset; + } + else + { + var anchorOffset = pxOffset / rectTransform.RectParent.ComputeGlobalComputeRect().size; + + if (rectTransform.AnchorMin.CanSet()) + rectTransform.AnchorMin.Value += anchorOffset; + + if (rectTransform.AnchorMax.CanSet()) + rectTransform.AnchorMax.Value += anchorOffset; + } + + var line = MathX.Reject(localPoint, __instance.LocalAxis); + __instance._line0.Target.PointB.Value = line; + __instance._line1.Target.PointA.Value = line; + __instance._line1.Target.PointB.Value = float3.Zero; + + return false; + } + } +} \ No newline at end of file diff --git a/BoundedUIX/BoundedUIX.cs b/BoundedUIX/BoundedUIX.cs new file mode 100644 index 0000000..98ba7db --- /dev/null +++ b/BoundedUIX/BoundedUIX.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections; +using System.Text; +using HarmonyLib; +using ResoniteModLoader; + +namespace BoundedUIX +{ + public class BoundedUIX : ResoniteMod + { + public static ModConfiguration Config; + + internal const string TargetSlotNamePlaceholder = "{TargetName}"; + + [AutoRegisterConfigKey] + private static readonly ModConfigurationKey childSlotNameKey = new("ChildSlotName", "Default name for child Slots in UIX hierarchies. Use {TargetName} to get the parent's name.", () => "Panel", valueValidator: name => !string.IsNullOrWhiteSpace(name)); + + [AutoRegisterConfigKey] + private static readonly ModConfigurationKey enableUIXGizmosKey = new("EnableUIXGizmos", "Enable modifying Slot Gizmo behavior in UIX hierarchies to move the elements instead.", () => true); + + [AutoRegisterConfigKey] + private static readonly ModConfigurationKey enableUIXSelectionKey = new("EnableUIXSelection", "Enable selecting elements in UIX hierarchies directly with the Developer ToolTip.", () => true); + + [AutoRegisterConfigKey] + private static readonly ModConfigurationKey gizmoOffsetKey = new("GizmoOffset", "Distance to raise the movement gizmos from the surface of the canvas. World scale.", () => 0.02f, valueValidator: v => v >= 0); + + [AutoRegisterConfigKey] + private static readonly ModConfigurationKey ignoreAlreadySelectedKey = new("IgnoreAlreadySelected", "Skip already selected elements in the targeting process. Helps with layered elements.", () => true); + + [AutoRegisterConfigKey] + private static readonly ModConfigurationKey moveTransformToParentKey = new("MoveTransformToParent", "Move RectTransform values up when creating a parent (analog to Slot transforms).", () => true); + + [AutoRegisterConfigKey] + private static readonly ModConfigurationKey parentSlotNameKey = new("ParentSlotName", "Default name for parent Slots in UIX hierarchies. Use {TargetName} to get the child-to-be's name.", () => "{TargetName} Space", valueValidator: name => !string.IsNullOrWhiteSpace(name)); + + [AutoRegisterConfigKey] + private static readonly ModConfigurationKey pivotSlotNameKey = new("PivotSlotName", "Default name for pivot Slots in UIX hierarchies. Use {TargetName} to get the child-to-be's name.", () => "{TargetName} Space", valueValidator: name => !string.IsNullOrWhiteSpace(name)); + + [AutoRegisterConfigKey] + private static readonly ModConfigurationKey prioritizeHierarchyDepthKey = new("PrioritizeHierarchyDepth", "Prioritize the hierarchy depth of a potentially hit RectTransform over the layout order. Can help instead of or in addition to skipping already selected elements.", () => false); + + public static string ChildSlotName => Config.GetValue(childSlotNameKey); + public static bool EnableUIXGizmos => Config.GetValue(enableUIXGizmosKey); + public static bool EnableUIXSelection => Config.GetValue(enableUIXSelectionKey); + public static float GizmoOffset => Config.GetValue(gizmoOffsetKey); + public static bool IgnoreAlreadySelected => Config.GetValue(ignoreAlreadySelectedKey); + public static bool MoveTransformToParent => Config.GetValue(moveTransformToParentKey); + public static string ParentSlotName => Config.GetValue(parentSlotNameKey); + public static string PivotSlotName => Config.GetValue(pivotSlotNameKey); + public static bool PrioritizeHierarchyDepth => Config.GetValue(prioritizeHierarchyDepthKey); + + public override string Author => "Banane9"; + public override string Link => "https://github.com/Banane9/ResoniteBoundedUIX"; + public override string Name => "BoundedUIX"; + public override string Version => "1.0.0"; + + public override void OnEngineInit() + { + var harmony = new Harmony($"{Author}.{Name}"); + Config = GetConfiguration(); + Config.Save(true); + harmony.PatchAll(); + } + } +} \ No newline at end of file diff --git a/BoundedUIX/BoundedUIX.csproj b/BoundedUIX/BoundedUIX.csproj new file mode 100644 index 0000000..bb8a31f --- /dev/null +++ b/BoundedUIX/BoundedUIX.csproj @@ -0,0 +1,69 @@ + + + Debug + AnyCPU + Library + Properties + BoundedUIX + BoundedUIX + net462 + latestMajor + 512 + true + true + {0322B2EF-7452-479D-BAE2-FCAB75033337} + + + $(MSBuildThisFileDirectory)Resonite + C:\Program Files (x86)\Steam\steamapps\common\Resonite + $(HOME)/.steam/steam/steamapps/common/Resonite + D:/Files/Games/Resonite/app + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + true + + + + + C:\Program Files (x86)\Steam\steamapps\common\Resonite\0Harmony.dll + False + + + C:\Program Files (x86)\Steam\steamapps\common\Resonite\Resonite_Data\Managed\Public\FrooxEngine.dll + False + + + C:\Program Files (x86)\Steam\steamapps\common\Resonite\Resonite_Data\Managed\Elements.Core.dll + False + + + C:\Program Files (x86)\Steam\steamapps\common\Resonite\Resonite_Data\Managed\System.ValueTuple.dll + False + + + C:\Program Files (x86)\Steam\steamapps\common\Resonite\Libraries\ResoniteModLoader.dll + False + + + + + + + + + \ No newline at end of file diff --git a/BoundedUIX/DevToolTipPatches.cs b/BoundedUIX/DevToolTipPatches.cs new file mode 100644 index 0000000..f24460b --- /dev/null +++ b/BoundedUIX/DevToolTipPatches.cs @@ -0,0 +1,80 @@ +using Elements.Core; +using FrooxEngine; +using FrooxEngine.UIX; +using HarmonyLib; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Reflection.Emit; + +namespace BoundedUIX +{ + [HarmonyPatch(typeof(DevTool))] + internal static class DevToolTipPatches + { + private static Slot CheckCanvas(RaycastHit hit) + { + var bestSlot = hit.Collider.Slot; + + if (BoundedUIX.EnableUIXSelection && bestSlot.TryGetRectTransform(out var rectTransform) && rectTransform.Canvas.Slot == bestSlot) + { + bestSlot = FindBestRect(bestSlot.GlobalPointToLocal(hit.Point).xy, bestSlot); + + if (bestSlot.GetComponentInParents