Hefty rework/extra features/fixes

CharaStudioVR/CharaStudioVR.csproj

@@ -24,7 +24,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>8</LangVersion>
+    <LangVersion>Preview</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>embedded</DebugType>
@@ -36,6 +36,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>8</LangVersion>
     <DebugSymbols>true</DebugSymbols>
+    <LangVersion>Preview</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="0Harmony, Version=2.9.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -66,6 +67,12 @@
       <HintPath>..\packages\ExtensibleSaveFormat.KoikatsuSunshine.16.8.1\lib\net46\KKS_ExtensibleSaveFormat.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="KK_FinalIK">
+      <HintPath>..\..\KK_SensibleH\Libs\KK_FinalIK.dll</HintPath>
+    </Reference>
+    <Reference Include="Obi">
+      <HintPath>..\Libs\Obi.dll</HintPath>
+    </Reference>
     <Reference Include="Sirenix.Serialization, Version=2.1.13.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\IllusionLibs.KoikatsuSunshine.UnityEngine.CoreModule.2019.4.9\lib\net46\Sirenix.Serialization.dll</HintPath>
       <Private>False</Private>
@@ -184,6 +191,11 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Controls\BetterMenuTool.cs" />
+    <Compile Include="Controls\BetterWarpTool.cs" />
+    <Compile Include="Features\VRBoop.cs" />
+    <Compile Include="Fixes\OpenVRHelperTempfixHook.cs" />
+    <Compile Include="Fixes\TopmostToolIcons.cs" />
     <Compile Include="Settings\CharaStudioContext.cs" />
     <Compile Include="Settings\StudioSettings.cs" />
     <Compile Include="StudioStandingMode.cs" />
@@ -204,6 +216,8 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Util\ColorZOrderShader" />
+    <None Include="Fixes\topmostgui.shader" />
+    <None Include="Fixes\topmostguishader" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

Shared/Controls/BetterMenuTool.cs → CharaStudioVR/Controls/BetterMenuTool.cs

@@ -9,23 +9,24 @@
 using VRGIN.Visuals;
 using Object = UnityEngine.Object;
 
-namespace KKS_VR.Controls
+
+namespace KK_VR.Controls
 {
     /// <summary>
     /// MenuTool that supports right clicks by pressing the trackpad
     /// </summary>
     internal class BetterMenuTool : MenuTool
     {
-        public override List<HelpText> GetHelpTexts()
-        {
-            return new List<HelpText>(new[]
-            {
-                ToolUtil.HelpTrackpadCenter(Owner, "Press to Right Click"),
-                ToolUtil.HelpTrackpadUp(Owner, "Slide to Move Cursor"),
-                ToolUtil.HelpTrigger(Owner, "Left Click"),
-                ToolUtil.HelpGrip(Owner, "Take/release screen")
-            }.Where(x => x != null));
-        }
+        //public override List<HelpText> GetHelpTexts()
+        //{
+        //    return new List<HelpText>(new[]
+        //    {
+        //        ToolUtil.HelpTrackpadCenter(Owner, "Press to Right Click"),
+        //        ToolUtil.HelpTrackpadUp(Owner, "Slide to Move Cursor"),
+        //        ToolUtil.HelpTrigger(Owner, "Left Click"),
+        //        ToolUtil.HelpGrip(Owner, "Take/release screen")
+        //    }.Where(x => x != null));
+        //}
 
         #region Override base functionality to add right clicks
 

Shared/Controls/BetterWarpTool.cs → CharaStudioVR/Controls/BetterWarpTool.cs

@@ -5,7 +5,9 @@
 using VRGIN.Controls;
 using VRGIN.Controls.Tools;
 
-namespace KKS_VR.Controls
+
+// MainGame doesn't have warp tool no more.
+namespace KK_VR.Controls
 {
     /// <summary>
     /// WarpTool version that cancels teleporting when user tries grab moving
@@ -32,13 +34,13 @@ protected override void OnUpdate()
             base.OnUpdate();
         }
 
-        public override List<HelpText> GetHelpTexts()
-        {
-            return new List<HelpText>(new[]
-            {
-                ToolUtil.HelpTrackpadCenter(Owner, "Press to teleport"),
-                ToolUtil.HelpGrip(Owner, "Hold to move"),
-            }.Where(x => x != null));
-        }
+        //public override List<HelpText> GetHelpTexts()
+        //{
+        //    return new List<HelpText>(new[]
+        //    {
+        //        ToolUtil.HelpTrackpadCenter(Owner, "Press to teleport"),
+        //        ToolUtil.HelpGrip(Owner, "Hold to move"),
+        //    }.Where(x => x != null));
+        //}
     }
 }

CharaStudioVR/Controls/GripMenuHandler.cs

@@ -1,13 +1,13 @@
 using System.Linq;
-using KKS_VR.Settings;
+using KK_VR.Settings;
 using UnityEngine;
 using Valve.VR;
 using VRGIN.Controls;
 using VRGIN.Core;
 using VRGIN.Native;
 using VRGIN.Visuals;
 
-namespace KKS_VR.Controls
+namespace KK_VR.Controls
 {
     public class GripMenuHandler : ProtectedBehaviour
     {

CharaStudioVR/Controls/GripMoveStudioNEOV2Tool.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using KKS_VR.Settings;
-using KKS_VR.Util;
+using KK_VR.Settings;
+using KK_VR.Util;
 using Studio;
 using UnityEngine;
 using UnityEngine.Rendering;
@@ -15,7 +15,7 @@
 using VRGIN.Helpers;
 using VRGIN.Visuals;
 
-namespace KKS_VR.Controls
+namespace KK_VR.Controls
 {
     internal class GripMoveStudioNEOV2Tool : Tool
     {
@@ -89,7 +89,7 @@ private void CreatePointer()
             }
         }
 
-        protected override void OnDestroy()
+        private void OnDestroy()
         {
             if (marker != null) Destroy(marker);
             if (mirror1 != null) Destroy(mirror1);

CharaStudioVR/Controls/IKTool.cs

@@ -1,12 +1,12 @@
 using System;
 using System.Collections;
-using KKS_VR.Util;
+using KK_VR.Util;
 using Studio;
 using UnityEngine;
 using UnityEngine.Rendering;
 using UnityEngine.SceneManagement;
 
-namespace KKS_VR.Controls
+namespace KK_VR.Controls
 {
     public class IKTool : MonoBehaviour
     {

CharaStudioVR/Controls/ObjMoveHelper.cs

@@ -2,7 +2,7 @@
 using Studio;
 using UnityEngine;
 
-namespace KKS_VR.Controls
+namespace KK_VR.Controls
 {
     internal class ObjMoveHelper
     {

CharaStudioVR/Controls/VRCameraMoveHelper.cs

@@ -5,7 +5,7 @@
 using UnityEngine.UI;
 using VRGIN.Core;
 
-namespace KKS_VR.Controls
+namespace KK_VR.Controls
 {
     public class VRCameraMoveHelper : MonoBehaviour
     {

CharaStudioVR/Controls/VRItemObjMoveHelper.cs

@@ -8,7 +8,7 @@
 using VRGIN.Core;
 using VRGIN.Helpers;
 
-namespace KKS_VR.Controls
+namespace KK_VR.Controls
 {
     public class VRItemObjMoveHelper : MonoBehaviour
     {

CharaStudioVR/Features/VRBoop.cs

@@ -0,0 +1,131 @@
+using System;
+using System.Collections.Generic;
+using HarmonyLib;
+using UnityEngine;
+using UnityEngine.XR;
+using VRGIN.Controls;
+
+// MainGame uses a bit different implementation.
+namespace KK_VR.Features
+{
+    /// <summary>
+    /// Adds colliders to the controllers so you can boop things
+    /// Based on a feature in KK_VREnhancement by thojmr
+    /// https://github.com/thojmr/KK_VREnhancement/blob/5e46bc9a89bf2517c5482bc9df097c7f0274730f/KK_VREnhancement/VRController.Collider.cs
+    /// </summary>
+    public static class VRBoopStudio
+    {
+        internal const string LeftColliderName = "Left_Boop_Collider";
+        internal const string RightColliderName = "Right_Boop_Collider";
+
+        private static DynamicBoneCollider _leftCollider;
+        private static DynamicBoneCollider _rightCollider;
+
+        public static void Initialize(Controller controller, EyeSide controllerSide)
+        {
+            // Hooks in here don't get patched by the whole assembly PatchAll since the class has no HarmonyPatch attribute
+            Harmony.CreateAndPatchAll(typeof(VRBoop), typeof(VRBoop).FullName);
+
+            switch (controllerSide)
+            {
+                case EyeSide.Left:
+                    _leftCollider = GetOrAttachCollider(controller.gameObject, LeftColliderName);
+                    break;
+                case EyeSide.Right:
+                    _rightCollider = GetOrAttachCollider(controller.gameObject, RightColliderName);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(controllerSide), controllerSide, null);
+            }
+        }
+
+        [HarmonyPostfix]
+        [HarmonyWrapSafe]
+        [HarmonyPatch(typeof(DynamicBone), nameof(DynamicBone.SetupParticles))]
+        [HarmonyPatch(typeof(DynamicBone_Ver01), nameof(DynamicBone_Ver01.SetupParticles))]
+        [HarmonyPatch(typeof(DynamicBone_Ver02), nameof(DynamicBone_Ver02.SetupParticles))]
+        private static void OnDynamicBoneInit(MonoBehaviour __instance)
+        {
+            AttachControllerColliders(__instance);
+        }
+
+        [HarmonyPrefix]
+        [HarmonyWrapSafe]
+        [HarmonyPatch(typeof(ChaControl), nameof(ChaControl.LoadCharaFbxDataAsync))]
+        // [HarmonyPatch(typeof(ChaControl), nameof(ChaControl.LoadCharaFbxDataNoAsync))] // unnecessary, the collider array is reset before the SetupParticles hook
+        private static void OnClothesChanged(ref Action<GameObject> actObj)
+        {
+            // This action is called with the loaded object after the colliders on it are set up
+            // This needs to be done despite the SetupParticles hook because LoadCharaFbxData resets the collider list
+            actObj += newObj =>
+            {
+                if (newObj == null) return;
+                foreach (var newBone in newObj.GetComponentsInChildren<DynamicBone>())
+                {
+                    var colliders = newBone.m_Colliders;
+                    if (colliders != null)
+                        AttachControllerColliders(colliders);
+                }
+            };
+        }
+
+        private static void AttachControllerColliders(MonoBehaviour dynamicBone)
+        {
+            var colliderList = GetColliderList(dynamicBone);
+            if (colliderList == null) return;
+            AttachControllerColliders(colliderList);
+        }
+
+        private static void AttachControllerColliders(List<DynamicBoneCollider> colliderList)
+        {
+            if (colliderList == null) throw new ArgumentNullException(nameof(colliderList));
+
+            if (_leftCollider && !colliderList.Contains(_leftCollider))
+                colliderList.Add(_leftCollider);
+            if (_rightCollider && !colliderList.Contains(_rightCollider))
+                colliderList.Add(_rightCollider);
+        }
+
+        private static List<DynamicBoneCollider> GetColliderList(MonoBehaviour dynamicBone)
+        {
+            return dynamicBone switch
+            {
+                DynamicBone d => d.m_Colliders,
+                DynamicBone_Ver01 d => d.m_Colliders,
+                DynamicBone_Ver02 d => d.Colliders,
+                null => throw new ArgumentNullException(nameof(dynamicBone)),
+                _ => throw new ArgumentException(@"Not a DynamicBone - " + dynamicBone.GetType(), nameof(dynamicBone)),
+            };
+        }
+
+        private static DynamicBoneCollider GetOrAttachCollider(GameObject controllerGameObject, string colliderName)
+        {
+            if (controllerGameObject == null) throw new ArgumentNullException(nameof(controllerGameObject));
+            if (colliderName == null) throw new ArgumentNullException(nameof(colliderName));
+
+            //Check for existing DB collider that may have been attached earlier
+            var existingCollider = controllerGameObject.GetComponentInChildren<DynamicBoneCollider>();
+            if (existingCollider == null)
+            {
+                //Add a DB collider to the controller
+                return AddDbCollider(controllerGameObject, colliderName);
+            }
+
+            return existingCollider;
+        }
+
+        private static DynamicBoneCollider AddDbCollider(GameObject controllerGameObject, string colliderName,
+            float colliderRadius = 0.05f, float collierHeight = 0f, Vector3 colliderCenter = new Vector3(), DynamicBoneCollider.Direction colliderDirection = default)
+        {
+            //Build the dynamic bone collider
+            var colliderObject = new GameObject(colliderName);
+            var collider = colliderObject.AddComponent<DynamicBoneCollider>();
+            collider.m_Radius = colliderRadius;
+            collider.m_Height = collierHeight;
+            collider.m_Center = colliderCenter;
+            collider.m_Direction = colliderDirection;
+            colliderObject.transform.SetParent(controllerGameObject.transform, false);
+            return collider;
+        }
+    }
+}

CharaStudioVR/Fixes/LoadFixHook.cs

@@ -1,11 +1,11 @@
 using System;
 using BepInEx.Logging;
 using HarmonyLib;
-using KKS_VR.Interpreters;
+using KK_VR.Interpreters;
 using Studio;
 using VRGIN.Core;
 
-namespace KKS_VR.Fixes
+namespace KK_VR.Fixes
 {
     public static class LoadFixHook
     {

Shared/Fixes/OpenVRHelperTempfixHook.cs → CharaStudioVR/Fixes/OpenVRHelperTempfixHook.cs

@@ -2,7 +2,8 @@
 using HarmonyLib;
 using Unity.XR.OpenVR;
 
-namespace KKS_VR.Fixes
+// Will break haptic feedback in KKS if enabled.
+namespace KK_VR.Fixes
 {
     /// <summary>
     /// No idea what exactly it does but it doesn't seem to hurt anything. Originally a part of KKS_CharaStudioVR