Merge pull request #30 from legoandmars/note-layer

2.2.0 update

CustomNotes/CustomNotes.csproj

@@ -32,6 +32,11 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="0Harmony, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <Private>False</Private>
+      <HintPath>$(BeatSaberDir)\Libs\0Harmony.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
     <Reference Include="BeatmapCore">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BeatmapCore.dll</HintPath>
       <Private>False</Private>
@@ -78,6 +83,10 @@
       <HintPath>$(BeatSaberDir)\Plugins\SiraUtil.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="SongCore, Version=3.0.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>$(BeatSaberDir)\Plugins\SongCore.dll</HintPath>
+    </Reference>
     <Reference Include="Unity.TextMeshPro">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Unity.TextMeshPro.dll</HintPath>
       <Private>False</Private>
@@ -102,6 +111,10 @@
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.UI.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="UnityEngine.UIModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.UIModule.dll</HintPath>
+    </Reference>
     <Reference Include="Zenject, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <Private>False</Private>
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Zenject.dll</HintPath>
@@ -114,19 +127,25 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="HarmonyPatches\CustomNotesPatches.cs" />
+    <Compile Include="HarmonyPatches\Patches\CameraPlusPatch.cs" />
     <Compile Include="Installers\CustomNotesCoreInstaller.cs" />
     <Compile Include="Installers\CustomNotesGameInstaller.cs" />
     <Compile Include="Installers\CustomNotesMenuInstaller.cs" />
     <Compile Include="Managers\CustomBombController.cs" />
     <Compile Include="Managers\CustomNoteController.cs" />
+    <Compile Include="Managers\CustomNotesViewManager.cs" />
+    <Compile Include="Managers\GameCameraManager.cs" />
     <Compile Include="Managers\MenuButtonManager.cs" />
     <Compile Include="Managers\CustomNoteManager.cs" />
     <Compile Include="Overrides\CustomNoteColorNoteVisuals.cs" />
     <Compile Include="Providers\CustomBombNoteProvider.cs" />
     <Compile Include="Providers\CustomGameNoteProvider.cs" />
     <Compile Include="Settings\UI\NoteDetailsViewController.cs" />
+    <Compile Include="Settings\UI\NoteModifierViewController.cs" />
     <Compile Include="Settings\UI\NotePreviewViewController.cs" />
     <Compile Include="Settings\UI\NotesFlowCoordinator.cs" />
+    <Compile Include="Utilities\LayerUtils.cs" />
     <Compile Include="Utilities\MaterialSwapper.cs" />
     <Compile Include="Data\CustomNote.cs" />
     <Compile Include="Data\NoteExtensions\DisableNoteColorOnGameobject.cs" />
@@ -151,6 +170,12 @@
     <EmbeddedResource Include="Settings\UI\Views\noteList.bsml" />
     <EmbeddedResource Include="Settings\UI\Views\notePreview.bsml" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Settings\UI\Watermark\" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Settings\UI\Views\noteModifier.bsml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>copy "$(TargetPath)" "$(BeatSaberDir)\Plugins"</PostBuildEvent>

CustomNotes/HarmonyPatches/CustomNotesPatches.cs

@@ -0,0 +1,39 @@
+using HarmonyLib;
+using System.Reflection;
+
+namespace CustomNotes.HarmonyPatches
+{
+    /// <summary>
+    /// Apply and remove all of our Harmony patches through this class
+    /// </summary>
+    public class CustomNotesPatches
+    {
+        private static Harmony instance;
+
+        public static bool IsPatched { get; private set; }
+        public const string InstanceId = "com.legoandmars.beatsaber.customnotes";
+
+        internal static void ApplyHarmonyPatches()
+        {
+            if (!IsPatched)
+            {
+                if (instance == null)
+                {
+                    instance = new Harmony(InstanceId);
+                }
+
+                instance.PatchAll(Assembly.GetExecutingAssembly());
+                IsPatched = true;
+            }
+        }
+
+        internal static void RemoveHarmonyPatches()
+        {
+            if (instance != null && IsPatched)
+            {
+                instance.UnpatchAll(InstanceId);
+                IsPatched = false;
+            }
+        }
+    }
+}

CustomNotes/HarmonyPatches/Patches/CameraPlusPatch.cs

@@ -0,0 +1,27 @@
+using CustomNotes.Utilities;
+using HarmonyLib;
+using IPA.Loader;
+using System;
+using System.Reflection;
+using UnityEngine;
+
+namespace CustomNotes.HarmonyPatches
+{
+    [HarmonyPatch]
+    internal class CameraPlusPatch
+    {
+        private static MethodBase TargetMethod()
+        {
+            PluginMetadata cameraPlus = PluginManager.GetPluginFromId("CameraPlus");
+            // Patch should only trigger if CameraPlus is installed and a pre-layerfix version
+            if (cameraPlus != null && cameraPlus.Assembly.GetName().Version <= new Version("4.7.2")) { 
+                return cameraPlus.Assembly.GetType("CameraPlus.CameraPlusBehaviour").GetMethod("SetCullingMask", BindingFlags.Instance | BindingFlags.NonPublic);
+            } else return null;
+        }
+
+        private static void Postfix(ref Camera ____cam)
+        {
+            LayerUtils.SetCamera(____cam, LayerUtils.CameraView.ThirdPerson);
+        }
+    }
+}

CustomNotes/Installers/CustomNotesCoreInstaller.cs

@@ -3,6 +3,7 @@
 using CustomNotes.Managers;
 using CustomNotes.Providers;
 using CustomNotes.Settings.Utilities;
+using CustomNotes.Utilities;
 
 namespace CustomNotes.Installers
 {
@@ -13,6 +14,7 @@ internal class CustomNotesCoreInstaller : Installer<PluginConfig, CustomNotesCor
         public CustomNotesCoreInstaller(PluginConfig pluginConfig)
         {
             _pluginConfig = pluginConfig;
+            LayerUtils.pluginConfig = pluginConfig;
         }
 
         public override void InstallBindings()

CustomNotes/Installers/CustomNotesGameInstaller.cs

@@ -16,6 +16,7 @@ public override void InstallBindings()
         {
             if (_noteAssetLoader.SelectedNote != 0)
             {
+                Container.BindInterfacesAndSelfTo<GameCameraManager>().AsSingle();
                 Container.Bind<IInitializable>().To<CustomNoteManager>().AsSingle();
             }
         }

CustomNotes/Installers/CustomNotesMenuInstaller.cs

@@ -15,9 +15,11 @@ public override void InstallBindings()
             Container.Bind<NotePreviewViewController>().FromNewComponentAsViewController().AsSingle();
             Container.Bind<NoteDetailsViewController>().FromNewComponentAsViewController().AsSingle();
             Container.Bind<NoteListViewController>().FromNewComponentAsViewController().AsSingle();
+            Container.BindInterfacesAndSelfTo<NoteModifierViewController>().AsSingle();
             Container.BindFlowCoordinator<NotesFlowCoordinator>();
 
             Container.BindInterfacesTo<MenuButtonManager>().AsSingle();
+            Container.BindInterfacesTo<CustomNotesViewManager>().AsSingle();
         }
     }
 }

CustomNotes/Managers/CustomBombController.cs

@@ -2,6 +2,7 @@
 using UnityEngine;
 using CustomNotes.Data;
 using CustomNotes.Settings.Utilities;
+using CustomNotes.Utilities;
 using SiraUtil.Objects;
 
 namespace CustomNotes.Managers
@@ -15,26 +16,56 @@ internal class CustomBombController : MonoBehaviour
         private BombNoteController _bombNoteController;
 
         protected Transform bombMesh;
+        protected GameObject fakeFirstPersonBombMesh;
 
         protected GameObject activeNote;
         protected SiraPrefabContainer container;
         protected SiraPrefabContainer.Pool bombPool;
 
         [Inject]
-        internal void Init(PluginConfig pluginConfig, NoteAssetLoader noteAssetLoader, [Inject(Id = "cn.bomb")] SiraPrefabContainer.Pool bombContainerPool)
+        internal void Init(PluginConfig pluginConfig, NoteAssetLoader noteAssetLoader, [InjectOptional(Id = "cn.bomb")] SiraPrefabContainer.Pool bombContainerPool)
         {
             _pluginConfig = pluginConfig;
 
             _customNote = noteAssetLoader.CustomNoteObjects[noteAssetLoader.SelectedNote];
+            bombPool = bombContainerPool;
+
             _bombNoteController = GetComponent<BombNoteController>();
             _noteMovement = GetComponent<NoteMovement>();
-            _bombNoteController.didInitEvent += Controller_Init;
-            _noteMovement.noteDidFinishJumpEvent += DidFinish;
+
+            if(bombPool != null)
+            {
+                _bombNoteController.didInitEvent += Controller_Init;
+                _noteMovement.noteDidFinishJumpEvent += DidFinish;
+            }
+
             bombMesh = gameObject.transform.Find("Mesh");
-            bombPool = bombContainerPool;
+
 
             MeshRenderer bm = GetComponentInChildren<MeshRenderer>();
-            bm.enabled = false;
+
+            if ((_pluginConfig.HMDOnly || LayerUtils.HMDOverride))
+            {
+                if(bombPool == null)
+                {
+                    // create fake bombs for Custom Notes without Custom Bombs
+                    fakeFirstPersonBombMesh = UnityEngine.Object.Instantiate(bombMesh.gameObject);
+                    fakeFirstPersonBombMesh.name = "FakeFirstPersonBomb";
+                    fakeFirstPersonBombMesh.transform.parent = bombMesh;
+
+                    fakeFirstPersonBombMesh.transform.localScale = Vector3.one;
+                    fakeFirstPersonBombMesh.transform.localPosition = Vector3.zero;
+                    fakeFirstPersonBombMesh.transform.rotation = Quaternion.identity;
+                    fakeFirstPersonBombMesh.layer = (int)LayerUtils.NoteLayer.FirstPerson;
+                }
+
+            }
+            else if (bombPool != null)
+            {
+                bm.enabled = false;
+            }
+
+
         }
 
         private void DidFinish()
@@ -63,6 +94,14 @@ private void SpawnThenParent(SiraPrefabContainer.Pool bombModelPool)
             container = bombModelPool.Spawn();
             activeNote = container.Prefab;
             bombPool = bombModelPool;
+            if (_pluginConfig.HMDOnly == true || LayerUtils.HMDOverride == true)
+            {
+                LayerUtils.SetLayer(activeNote, LayerUtils.NoteLayer.FirstPerson);
+            }
+            else
+            {
+                LayerUtils.SetLayer(activeNote, LayerUtils.NoteLayer.Note);
+            }
             ParentNote(activeNote);
         }
 
@@ -72,6 +111,7 @@ protected void OnDestroy()
             {
                 _bombNoteController.didInitEvent-= Controller_Init;
             }
+            Destroy(fakeFirstPersonBombMesh);
         }
     }
 }

CustomNotes/Managers/CustomNoteController.cs

@@ -57,7 +57,15 @@ internal void Init(PluginConfig pluginConfig,
             noteCube = _gameNoteController.gameObject.transform.Find("NoteCube");
 
             MeshRenderer noteMesh = GetComponentInChildren<MeshRenderer>();
-            noteMesh.forceRenderingOff = true;
+            if (_pluginConfig.HMDOnly == false && LayerUtils.HMDOverride == false)
+            {
+                // only disable if custom notes display on both hmd and display
+                noteMesh.forceRenderingOff = true;
+            }
+            else
+            {
+                noteMesh.gameObject.layer = (int) LayerUtils.NoteLayer.ThirdPerson;
+            }
         }
 
         private void DidFinish(NoteController nc)
@@ -105,6 +113,14 @@ private void SpawnThenParent(SiraPrefabContainer.Pool noteModelPool)
             container = noteModelPool.Spawn();
             activeNote = container.Prefab;
             activePool = noteModelPool;
+            if (_pluginConfig.HMDOnly == true || LayerUtils.HMDOverride == true)
+            {
+                LayerUtils.SetLayer(activeNote, LayerUtils.NoteLayer.FirstPerson);
+            }
+            else
+            {
+                LayerUtils.SetLayer(activeNote, LayerUtils.NoteLayer.Note);
+            }
             ParentNote(activeNote);
         }
 
@@ -121,13 +137,35 @@ private void Visuals_DidInit(ColorNoteVisuals visuals, NoteController noteContro
         {
             SetActiveThenColor(activeNote, visuals.noteColor);
             // Hide certain parts of the default note which is not required
-            if (_customNote.Descriptor.DisableBaseNoteArrows)
+            if(_pluginConfig.HMDOnly == false && LayerUtils.HMDOverride == false)
             {
-                _customNoteColorNoteVisuals.TurnOffVisuals();
+                _customNoteColorNoteVisuals.SetBaseGameVisualsLayer((int) LayerUtils.NoteLayer.Note);
+                if (_customNote.Descriptor.DisableBaseNoteArrows)
+                {
+                    _customNoteColorNoteVisuals.TurnOffVisuals();
+                }
+                else if (_pluginConfig.NoteSize != 1)
+                {
+                    _customNoteColorNoteVisuals.ScaleVisuals(_pluginConfig.NoteSize);
+                }
             }
-            else if(_pluginConfig.NoteSize != 1)
+            else
             {
-                _customNoteColorNoteVisuals.ScaleVisuals(_pluginConfig.NoteSize);
+                // HMDOnly code
+                _customNoteColorNoteVisuals.SetBaseGameVisualsLayer((int) LayerUtils.NoteLayer.ThirdPerson);
+                if (!_customNote.Descriptor.DisableBaseNoteArrows)
+                {
+                    if (_pluginConfig.NoteSize != 1)
+                    {
+                        // arrows should be enabled in both views, with fake arrows rescaled
+                        _customNoteColorNoteVisuals.CreateAndScaleFakeVisuals((int)LayerUtils.NoteLayer.FirstPerson, _pluginConfig.NoteSize);
+                    }
+                    else
+                    {
+                        // arrows should be enabled in both views
+                        _customNoteColorNoteVisuals.CreateFakeVisuals((int)LayerUtils.NoteLayer.FirstPerson);
+                    }
+                }
             }
         }
 

CustomNotes/Managers/CustomNoteManager.cs

@@ -2,6 +2,10 @@
 using CustomNotes.Data;
 using SiraUtil.Services;
 using CustomNotes.Utilities;
+using System;
+using CustomNotes.Settings.Utilities;
+using IPA.Loader;
+using System.Linq;
 
 namespace CustomNotes.Managers
 {
@@ -10,25 +14,28 @@ internal class CustomNoteManager : IInitializable
         private readonly Submission _submission;
         private readonly NoteAssetLoader _noteAssetLoader;
         private readonly GameplayCoreSceneSetupData _gameplayCoreSceneSetupData;
+        private readonly PluginConfig _pluginConfig;
+        private readonly IDifficultyBeatmap _level;
 
-        internal CustomNoteManager([InjectOptional] Submission submission, NoteAssetLoader noteAssetLoader, GameplayCoreSceneSetupData gameplayCoreSceneSetupData)
+        internal CustomNoteManager([InjectOptional] Submission submission, NoteAssetLoader noteAssetLoader, GameplayCoreSceneSetupData gameplayCoreSceneSetupData, PluginConfig pluginConfig, IDifficultyBeatmap level)
         {
             _submission = submission;
             _noteAssetLoader = noteAssetLoader;
             _gameplayCoreSceneSetupData = gameplayCoreSceneSetupData;
+            _pluginConfig = pluginConfig;
+            _level = level;
         }
-
         public void Initialize()
         {
             if (_noteAssetLoader.SelectedNote != 0)
             {
                 CustomNote activeNote = _noteAssetLoader.CustomNoteObjects[_noteAssetLoader.SelectedNote];
 
-
                 if (activeNote.NoteBomb != null)
                 {
                     MaterialSwapper.ReplaceMaterialsForGameObject(activeNote.NoteBomb);
                 }
+
                 if (_gameplayCoreSceneSetupData.gameplayModifiers.ghostNotes)
                 {
                     _submission?.DisableScoreSubmission("Custom Notes", "Ghost Notes");
@@ -37,6 +44,10 @@ public void Initialize()
                 {
                     _submission?.DisableScoreSubmission("Custom Notes", "Disappearing Arrows");
                 }
+                if (Utils.IsNoodleMap(_level))
+                {
+                    _submission?.DisableScoreSubmission("Custom Notes", "Noodle Extensions");
+                }
             }
         }
     }