Merge branch 'master' into Upgrade-to-Unity-2019.2

campfireunion · May 27, 2020 · b2eda52 · b2eda52
2 parents ecac912 + e2dfcc9
commit b2eda52
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 4 deletions.
diff --git a/Assets/VRKeys/Scripts/BackspaceKey.cs b/Assets/VRKeys/Scripts/BackspaceKey.cs
@@ -19,9 +19,13 @@ namespace VRKeys {
 	public class BackspaceKey : Key {
 
 		public override void HandleTriggerEnter (Collider other) {
+			PressKey ();
+		}
+
+		public override void PressKey () {
 			keyboard.Backspace ();
 
-			ActivateFor (0.3f);
+			base.PressKey ();
 		}
 
 		public override void UpdateLayout (Layout translation) {

diff --git a/Assets/VRKeys/Scripts/CancelKey.cs b/Assets/VRKeys/Scripts/CancelKey.cs
@@ -19,6 +19,10 @@ namespace VRKeys {
 	public class CancelKey : Key {
 
 		public override void HandleTriggerEnter (Collider other) {
+			PressKey ();
+		}
+
+		public override void PressKey () {
 			keyboard.Cancel ();
 		}
 

diff --git a/Assets/VRKeys/Scripts/ClearKey.cs b/Assets/VRKeys/Scripts/ClearKey.cs
@@ -19,9 +19,13 @@ namespace VRKeys {
 	public class ClearKey : Key {
 
 		public override void HandleTriggerEnter (Collider other) {
+			PressKey ();
+		}
+
+		public override void PressKey () {
 			keyboard.SetText ("");
 
-			ActivateFor (0.3f);
+			base.PressKey ();
 		}
 
 		public override void UpdateLayout (Layout translation) {

diff --git a/Assets/VRKeys/Scripts/EnterKey.cs b/Assets/VRKeys/Scripts/EnterKey.cs
@@ -19,6 +19,10 @@ namespace VRKeys {
 	public class EnterKey : Key {
 
 		public override void HandleTriggerEnter (Collider other) {
+			PressKey ();
+		}
+
+		public override void PressKey () {
 			keyboard.Submit ();
 		}
 

diff --git a/Assets/VRKeys/Scripts/Key.cs b/Assets/VRKeys/Scripts/Key.cs
@@ -106,6 +106,13 @@ public void OnTriggerEnter (Collider other) {
 			}
 		}
 
+		/// <summary>
+		/// Manually trigger a key press.
+		/// </summary>
+		public virtual void PressKey () {
+			ActivateFor (0.3f);
+		}
+
 		private IEnumerator Press (Collider other, Mallet mallet) {
 			isPressing = true;
 

diff --git a/Assets/VRKeys/Scripts/LetterKey.cs b/Assets/VRKeys/Scripts/LetterKey.cs
@@ -40,9 +40,13 @@ public string GetCharacter () {
 		}
 
 		public override void HandleTriggerEnter (Collider other) {
+			PressKey ();
+		}
+
+		public override void PressKey () {
 			keyboard.AddCharacter (GetCharacter ());
 
-			ActivateFor (0.3f);
+			base.PressKey ();
 		}
 	}
 }
diff --git a/Assets/VRKeys/Scripts/ShiftKey.cs b/Assets/VRKeys/Scripts/ShiftKey.cs
@@ -20,6 +20,10 @@ public class ShiftKey : Key {
 		private bool shifted = false;
 
 		public override void HandleTriggerEnter (Collider other) {
+			PressKey ();
+		}
+
+		public override void PressKey () {
 			keyboard.ToggleShift ();
 		}
 

diff --git a/Assets/VRKeys/Scripts/SpaceKey.cs b/Assets/VRKeys/Scripts/SpaceKey.cs
@@ -19,9 +19,13 @@ namespace VRKeys {
 	public class SpaceKey : Key {
 
 		public override void HandleTriggerEnter (Collider other) {
+			PressKey ();
+		}
+
+		public override void PressKey () {
 			keyboard.AddCharacter (" ");
 
-			ActivateFor (0.3f);
+			base.PressKey ();
 		}
 
 		public override void UpdateLayout (Layout translation) {