fix(input): hide ui interaction when menu is not open (#76)

.github/FUNDING.yml

@@ -1 +1,2 @@
 liberapay: rip3.141
+github: Xenira

README.adoc

@@ -15,7 +15,7 @@ ifndef::env-github[]
 endif::[]
 :icons: font
 :source-highlighter: highlightjs
-:game-version: 0.2.0h
+:game-version: 0.2.1c
 :repo: Xenira/TechtonicaVR
 
 image:https://img.shields.io/github/v/release/{repo}["GitHub release (with filter)", link="https://github.com/{repo}/releases/latest"]

plugin/src/TechtonicaVR.cs

@@ -18,7 +18,7 @@
 
 namespace TechtonicaVR;
 
-[BepInPlugin("de.xenira.techtonica", MyPluginInfo.PLUGIN_NAME, MyPluginInfo.PLUGIN_VERSION)]
+[BepInPlugin("de.xenira.techtonicavr", MyPluginInfo.PLUGIN_NAME, MyPluginInfo.PLUGIN_VERSION)]
 [BepInProcess("Techtonica.exe")]
 [BepInDependency("Tobey.UnityAudio", BepInDependency.DependencyFlags.SoftDependency)]
 public class TechtonicaVR : BaseUnityPlugin

plugin/src/input/ui/InteractableUi.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using TechtonicaVR.UI;
 using TechtonicaVR.Util;
 using UnityEngine;
 using UnityEngine.UI;
@@ -12,6 +13,7 @@ public abstract class InteractableUi
 	public List<Interactable> interactable = new List<Interactable>();
 	public UiEnterEvent OnEnterEvent;
 	public UiExitEvent OnExitEvent;
+	public Menu menu;
 
 	public Transform transform;
 	protected ScrollRect scrollRect;
@@ -39,6 +41,11 @@ public UiRaycastHit Raycast(Ray ray)
 			return null;
 		}
 
+		if (menu?.isOpen() == false)
+		{
+			return null;
+		}
+
 		if (getUiPlane().Raycast(ray, out var distance))
 		{
 			var point = ray.GetPoint(distance);

plugin/src/patch/main_game/ui/IaCMenuPatch.cs

@@ -1,4 +1,5 @@
 using TechtonicaVR.Input.Ui;
+using TechtonicaVR.UI;
 using TechtonicaVR.Util;
 using UnityEngine;
 
@@ -34,6 +35,7 @@ protected override bool Apply(GameObject gameObject)
 
 		var menu = new InventoryInteractableUI(playerInventory.gameObject);
 		menu.transform = inventoryAnchor.transform;
+		menu.menu = new UIMenuWrapper(iac);
 		menu.OnEnterEvent += () =>
 		{
 			iac.inventoryHasFocus = true;

plugin/src/ui/patch/UiMenuPatch.cs

@@ -83,6 +83,8 @@ public static void OnClosePostfix(UIMenu __instance)
 
 		lastPosition = Vector3.zero;
 		lastCamOrigin = Vector3.zero;
+
+		getWorldAnchor().transform.position = Vector3.zero;
 	}
 
 	[HarmonyPatch(typeof(FHG_Utils), nameof(FHG_Utils.ToggleAlpha))]