Merged XRITK interactions

Author: cjaverliat

proto/plume/sample/unity/xritk/xr_base_interactable.proto

@@ -16,34 +16,4 @@ message XRBaseInteractableDestroy {
 message XRBaseInteractableUpdate {
     ComponentIdentifier component = 1;
     optional bool enabled = 2;
-}
-
-message XRBaseInteractableHoverEnter {
-    ComponentIdentifier component = 1;
-	ComponentIdentifier interactor = 2;
-}
-
-message XRBaseInteractableHoverExit {
-    ComponentIdentifier component = 1;
-	ComponentIdentifier interactor = 2;
-}
-
-message XRBaseInteractableSelectEnter {
-    ComponentIdentifier component = 1;
-	ComponentIdentifier interactor = 2;
-}
-
-message XRBaseInteractableSelectExit {
-    ComponentIdentifier component = 1;
-	ComponentIdentifier interactor = 2;
-}
-
-message XRBaseInteractableActivateEnter {
-    ComponentIdentifier component = 1;
-	ComponentIdentifier interactor = 2;
-}
-
-message XRBaseInteractableActivateExit {
-    ComponentIdentifier component = 1;
-	ComponentIdentifier interactor = 2;
 }

proto/plume/sample/unity/xritk/xr_base_interactor.proto

@@ -16,24 +16,4 @@ message XRBaseInteractorDestroy {
 message XRBaseInteractorUpdate {
     ComponentIdentifier component = 1;
     optional bool enabled = 2;
-}
-
-message XRBaseInteractorHoverEnter {
-    ComponentIdentifier component = 1;
-	ComponentIdentifier interactable = 2;
-}
-
-message XRBaseInteractorHoverExit {
-    ComponentIdentifier component = 1;
-	ComponentIdentifier interactable = 2;
-}
-
-message XRBaseInteractorSelectEnter {
-    ComponentIdentifier component = 1;
-	ComponentIdentifier interactable = 2;
-}
-
-message XRBaseInteractorSelectExit {
-    ComponentIdentifier component = 1;
-	ComponentIdentifier interactable = 2;
 }

proto/plume/sample/unity/xritk/xritk_interaction.proto

@@ -0,0 +1,22 @@
+syntax = "proto3";
+
+package plume.sample.unity.xritk;
+option csharp_namespace = "PLUME.Sample.Unity.XRITK";
+
+import "plume/sample/unity/identifiers.proto";
+
+enum XRITKInteractionType {
+    XRITK_INTERACTION_TYPE_UNSPECIFIED = 0;
+    XRITK_INTERACTION_TYPE_HOVER_ENTER = 1;
+    XRITK_INTERACTION_TYPE_HOVER_EXIT = 2;
+    XRITK_INTERACTION_TYPE_SELECT_ENTER = 3;
+    XRITK_INTERACTION_TYPE_SELECT_EXIT = 4;
+    XRITK_INTERACTION_TYPE_ACTIVATE_ENTER = 5;
+    XRITK_INTERACTION_TYPE_ACTIVATE_EXIT = 6;
+}
+
+message XRITKInteraction {
+    ComponentIdentifier interactable = 1;
+	ComponentIdentifier interactor = 2;
+    XRITKInteractionType type = 3;
+}