Logitech MK Ink Integration (#768)

* Vertical slider for brush size

* We were setting the brush size from the wrong slider vector component

* Add up/down arrow icons

* Brush size slider fixes

* Correct orientation for slider increment button. Prefab fixes

* FInish off vertical slider UI

* Enable Oculus, update to Meta Core SDK 68.0.2

* Add Logitech MX Ink package

* Use MX Ink Action Set

* Decrease duration of haptic click

* Remove references to touch controllers

* Update main scene

* Use VrStylusHandler to detect a MX Ink device and retrieve inputs

* dotnet-format

* Tray should check for stylus

* Disable restore of package cache

* Delete the step as ymlformat didn't like it being commented out

* Stylus support files copied from prototype

* Add stylus detection component to Quest controller

* Revert "Delete the step as ymlformat didn't like it being commented out"

This reverts commit 09aeb88.

* Revert "Disable restore of package cache"

This reverts commit 4c2bc0c.

* Update meta core sdk to version with our hotfix

* Revert some (hopefully) unintentional changes

* Revert all settings changes so this branch matches main where possible

* Use the correct new method

* Use if OCULUS_SUPPORTED for Logitech code

* Add compiler conditionals around calls to Logitech code

* Automatic changes related to Meta SDK update

* Move Logitech files to Third Party

* Handle either hand and bypass for non-Meta

* More compiler conditionals around calls to Logitech code

* Exclude serialized fields from conditional

* Disable restoring library cache again

* Revert "Disable restoring library cache again"

This reverts commit 596f29d.

* Temp cache fix for forks [CI BUILD]

* [CI BUILD]

* Remove Sartom files as we're handling this a different way now

* Fix detection and model display for stylus

* [CI BUILD]

* Remove unused sartom detector

* [CI BUILD]

* Some uncommitted changes that might actually matter

* Revert some extraneous changes that Unity made by itself

* [CI BUILD]

* Revert "Temp cache fix for forks [CI BUILD]"

This reverts commit babbc65.

* Reapply "Temp cache fix for forks [CI BUILD]"

This reverts commit fd2e1a7.

* See if this fixes issues with wand controls triggering on stylus input

[CI BUILD]

* Tweak label position

* Revert "Reapply "Temp cache fix for forks [CI BUILD]""

This reverts commit 74c40d9.

---------

Co-authored-by: Mario Gutierrez <[email protected]>

Assets/Editor/BuildTiltBrush.cs

@@ -696,7 +696,7 @@ static void CommandLine()
         // Call these once to create the files. Normally (i.e., in a GUI build), they're created with
         // [UnityEditor.InitializeOnLoad], but in case they're missing, like in CI, make sure they're
         // there!
-        OVRProjectConfig defaultOculusProjectConfig = OVRProjectConfig.GetProjectConfig();
+        OVRProjectConfig defaultOculusProjectConfig = OVRProjectConfig.CachedProjectConfig;
         string useless_app_id = Assets.Oculus.VR.Editor.OVRPlatformToolSettings.AppID;
 #endif
 

Assets/Oculus/OculusProjectConfig.asset

@@ -41,5 +41,5 @@ MonoBehaviour:
   systemSplashScreen: {fileID: 0}
   systemSplashScreenType: 0
   _systemLoadingScreenBackground: 0
-  ovrPluginMd5Win64: 33685b25e1b4f2b6c1632069bc88783632496c19eda9b55641c321c119bdf68c
-  ovrPluginMd5Android: b9e59102e373e2d7a97cd1dbe38cac15e89ec54c0a32b98491b3d09d93ccda7d
+  ovrPluginMd5Win64: d72fb658f3d9064293fb2241e5525905551003f900539e0b4fc00777d76dbee1
+  ovrPluginMd5Android: 5ef6da3aad630673da6447f50e1b2d8aba8131f9f19a0720cb301a8c9f89d2b5