version 5.5.0-r.10

ViveSoftware · Nov 29, 2023 · 88b2fde · 88b2fde
1 parent 9c04382
commit 88b2fde
Show file tree

Hide file tree

Showing 115 changed files with 6,429 additions and 1,353 deletions.
diff --git a/com.htc.upm.wave.essence/Editor/EssenceSettingsProvider.cs b/com.htc.upm.wave.essence/Editor/EssenceSettingsProvider.cs
@@ -464,7 +464,17 @@ public override void OnGUI(string searchContext)
 				GUILayout.Space(5f);
 				if (GUILayout.Button("Check packages", GUILayout.ExpandWidth(false)))
 					EssenseSettingsConfigDialog.ShowDialog();
-				GUILayout.Space(5f);
+
+                bool b = EditorPrefs.GetBool("EssenceNotifyUpdatePackageSkip", false);
+                if (GUILayout.Toggle(b, "Do not auto check package update"))
+                {
+                    EditorPrefs.SetBool("EssenceNotifyUpdatePackageSkip", true);
+                }
+                else
+                {
+                    EditorPrefs.SetBool("EssenceNotifyUpdatePackageSkip", false);
+                }
+                GUILayout.Space(5f);
 			}
 			GUILayout.EndVertical();
 
@@ -1305,6 +1315,12 @@ public static void ShowDialog()
 		static void Update()
 		{
 			Debug.Log("Check for Essense Settings Update.");
+			if (EditorPrefs.GetBool("EssenceNotifyUpdatePackageSkip", false))
+			{
+				Debug.Log("Skip Essense Settings Update.  EssenceNotifyUpdatePackageSkip=true");
+				EditorApplication.update -= Update;
+				return;
+			}
 			EssenceSettingsProvider.Init();
 			EssenceSettingsProvider.checkFeaturePackages();
 			var items = GetItems();
@@ -1377,6 +1393,18 @@ public void OnGUI()
 			GUILayout.EndHorizontal();
 
 			GUILayout.BeginHorizontal();
+			{
+				bool b = EditorPrefs.GetBool("EssenceNotifyUpdatePackageSkip", false);
+				if (GUILayout.Toggle(b, "Don't show me again"))
+				{
+					EditorPrefs.SetBool("EssenceNotifyUpdatePackageSkip", true);
+				}
+				else
+				{
+					EditorPrefs.SetBool("EssenceNotifyUpdatePackageSkip", false);
+				}
+			}
+
 			if (notReadyItems > 0)
 			{
 				if (GUILayout.Button("Update All"))

diff --git a/com.htc.upm.wave.essence/Runtime/Scripts/Definitions.cs b/com.htc.upm.wave.essence/Runtime/Scripts/Definitions.cs
@@ -58,6 +58,7 @@ public class XR_Feature
 		// A binary value representing the Thumbstick touch state.
 		public static readonly InputFeatureUsage<bool> secondary2DAxisTouch = CommonUsages.secondary2DAxisTouch;
 
+		public static readonly InputFeatureUsage<bool> triggerTouch = new InputFeatureUsage<bool>("TriggerTouch");
 		// A float value representing the Trigger axis.
 		public static readonly InputFeatureUsage<float> trigger = CommonUsages.trigger;
 		// A float value representing the Grip axis.
@@ -95,6 +96,8 @@ public class XR_BinaryButton
 		public const string gripButtonName = "GripButton";
 		public static readonly InputFeatureUsage<bool> triggerButton = XR_Feature.triggerButton;
 		public const string triggerButtonName = "TriggerButton";
+		public static readonly InputFeatureUsage<bool> triggerTouch = XR_Feature.triggerTouch;
+		public const string triggerTouchName = "TriggerTouch";
 		public static readonly InputFeatureUsage<bool> menuButton = XR_Feature.menuButton;
 		public const string menuButtonName = "MenuButton";
 		public static readonly InputFeatureUsage<bool> primary2DAxisClick = XR_Feature.primary2DAxisClick;