Innoactive · Gusinuhe · Mar 10, 2021 · Mar 3, 2021
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,8 @@ ExportedObj/
 *.booproj
 *.svd
 
+# Creator generated files
+*[XR_Setup_Simulator]*
 
 # Unity3D generated meta files
 *.pidb.meta

diff --git a/Editor/Innoactive.CreatorEditor.XRInteraction.asmdef b/Editor/Innoactive.CreatorEditor.XRInteraction.asmdef
@@ -20,20 +20,10 @@
         "XR_INTERACTION_TOOLKIT"
     ],
     "versionDefines": [
-        {
-            "name": "com.unity.xr.interaction.toolkit",
-            "expression": "",
-            "define": "XR_INTERACTION_TOOLKIT"
-        },
-        {
-            "name": "com.unity.xr.interaction.toolkit",
-            "expression": "0.10.0-preview",
-            "define": "XRIT_0_10_OR_NEWER"
-        },
         {
             "name": "com.unity.xr.interaction.toolkit",
             "expression": "1.0.0-pre.2",
-            "define": "XRIT_1_0_OR_NEWER"
+            "define": "XR_INTERACTION_TOOLKIT"
         }
     ],
     "noEngineReferences": false

diff --git a/Editor/Interaction/DirectInteractorEditor.cs b/Editor/Interaction/DirectInteractorEditor.cs
@@ -94,7 +94,6 @@ private void OnEnable()
             precisionGrab = serializedObject.FindProperty("precisionGrab");
             hideControllerOnSelect = serializedObject.FindProperty("m_HideControllerOnSelect");
 
-#if XRIT_0_10_OR_NEWER
             playAudioClipOnSelectEntered = serializedObject.FindProperty("m_PlayAudioClipOnSelectEntered");
             audioClipForOnSelectEntered = serializedObject.FindProperty("m_AudioClipForOnSelectEntered");
             playAudioClipOnSelectExited = serializedObject.FindProperty("m_PlayAudioClipOnSelectExited");
@@ -121,32 +120,6 @@ private void OnEnable()
             onSelectExit = serializedObject.FindProperty("m_OnSelectExited");
             onHoverEnter = serializedObject.FindProperty("m_OnHoverEntered");
             onHoverExit = serializedObject.FindProperty("m_OnHoverExited");
-#else
-            playAudioClipOnSelectEntered = serializedObject.FindProperty("m_PlayAudioClipOnSelectEnter");
-            audioClipForOnSelectEntered = serializedObject.FindProperty("m_AudioClipForOnSelectEnter");
-            playAudioClipOnSelectExited = serializedObject.FindProperty("m_PlayAudioClipOnSelectExit");
-            audioClipForOnSelectExited = serializedObject.FindProperty("m_AudioClipForOnSelectExit");
-            playAudioClipOnHoverEntered = serializedObject.FindProperty("m_PlayAudioClipOnHoverEnter");
-            audioClipForOnHoverEntered = serializedObject.FindProperty("m_AudioClipForOnHoverEnter");
-            playAudioClipOnHoverExited = serializedObject.FindProperty("m_PlayAudioClipOnHoverExit");
-            audioClipForOnHoverExited = serializedObject.FindProperty("m_AudioClipForOnHoverExit");
-            playHapticsOnSelectEntered = serializedObject.FindProperty("m_PlayHapticsOnSelectEnter");
-            hapticSelectEnterIntensity = serializedObject.FindProperty("m_HapticSelectEnterIntensity");
-            hapticSelectEnterDuration = serializedObject.FindProperty("m_HapticSelectEnterDuration");
-            playHapticsOnHoverEntered = serializedObject.FindProperty("m_PlayHapticsOnHoverEnter");
-            hapticHoverEnterIntensity = serializedObject.FindProperty("m_HapticHoverEnterIntensity");
-            hapticHoverEnterDuration = serializedObject.FindProperty("m_HapticHoverEnterDuration");
-            playHapticsOnSelectExited = serializedObject.FindProperty("m_PlayHapticsOnSelectExit");
-            hapticSelectExitIntensity = serializedObject.FindProperty("m_HapticSelectExitIntensity");
-            hapticSelectExitDuration = serializedObject.FindProperty("m_HapticSelectExitDuration");
-            playHapticsOnHoverExited = serializedObject.FindProperty("m_PlayHapticsOnHoverExit");
-            hapticHoverExitIntensity = serializedObject.FindProperty("m_HapticHoverExitIntensity");
-            hapticHoverExitDuration = serializedObject.FindProperty("m_HapticHoverExitDuration");
-            onSelectEnter = serializedObject.FindProperty("m_OnSelectEnter");
-            onSelectExit = serializedObject.FindProperty("m_OnSelectExit");
-            onHoverEnter = serializedObject.FindProperty("m_OnHoverEnter");
-            onHoverExit = serializedObject.FindProperty("m_OnHoverExit");
-#endif
         }
 
         public override void OnInspectorGUI()
@@ -161,11 +134,7 @@ public override void OnInspectorGUI()
             {
                 DirectInteractor interactor = (DirectInteractor)targetObject;
 
-#if XRIT_0_10_OR_NEWER
                 if (interactor.GetComponent<XRController>() == null && interactor.GetComponent<ActionBasedController>() == null)
-#else
-                if (interactor.GetComponent<XRController>() == null)
-#endif
                 {
                     EditorGUILayout.HelpBox(Tooltips.MissingRequiredController, MessageType.Warning, true);
                     break;

diff --git a/Editor/Interaction/InteractableObjectEditor.cs b/Editor/Interaction/InteractableObjectEditor.cs
@@ -28,23 +28,16 @@ internal class InteractableObjectEditor : Editor
         private SerializedProperty throwAngularVelocityScaleProperty;
         private SerializedProperty gravityOnDetachProperty;
         private SerializedProperty retainTransformParentProperty;
-
-#if XRIT_1_0_OR_NEWER
         private SerializedProperty customReticle;
-#endif
-
         private SerializedProperty onFirstHoverEntered;
         private SerializedProperty onHoverEntered;
         private SerializedProperty onHoverExited;
         private SerializedProperty onLastHoverExited;
         private SerializedProperty onSelectEntered;
         private SerializedProperty onSelectExited;
-#if XRIT_0_10_OR_NEWER
         private SerializedProperty onSelectCanceled;
-#endif
         private SerializedProperty onActivateProperty;
         private SerializedProperty onDeactivateProperty;
-
         private SerializedProperty interactionManager;
         private SerializedProperty collidersProperty;
         private SerializedProperty interactionLayerMaskProperty;
@@ -82,10 +75,7 @@ private static class Tooltips
             public static readonly GUIContent IsGrabbable = new GUIContent("Is Grabbable", "Determines if this Interactable Object can be grabbed.");
             public static readonly GUIContent IsUsable = new GUIContent("Is Usable", "Determines if this Interactable Object can be used.");
             public static readonly GUIContent HighlightOptions = new GUIContent("Enable Highlighting", "Adds an InteractableHighlighter component to this Interactable.");
-
-#if XRIT_1_0_OR_NEWER
             public static readonly GUIContent CustomReticle = EditorGUIUtility.TrTextContent("Custom Reticle", "The reticle that will appear at the end of the line when it is valid.");
-#endif
         }
 
         private void OnEnable()
@@ -111,30 +101,15 @@ private void OnEnable()
             throwAngularVelocityScaleProperty = serializedObject.FindProperty("m_ThrowAngularVelocityScale");
             retainTransformParentProperty = serializedObject.FindProperty("m_RetainTransformParent");
             interactionManager = serializedObject.FindProperty("m_InteractionManager");
-
-#if XRIT_1_0_OR_NEWER
             gravityOnDetachProperty = serializedObject.FindProperty("m_ForceGravityOnDetach");
             customReticle = serializedObject.FindProperty("m_CustomReticle");
-#else
-            gravityOnDetachProperty = serializedObject.FindProperty("m_GravityOnDetach");
-#endif
-
-#if XRIT_0_10_OR_NEWER
             onFirstHoverEntered = serializedObject.FindProperty("m_OnFirstHoverEntered");
             onHoverEntered = serializedObject.FindProperty("m_OnHoverEntered");
             onHoverExited = serializedObject.FindProperty("m_OnHoverExited");
             onLastHoverExited = serializedObject.FindProperty("m_OnLastHoverExited");
             onSelectEntered = serializedObject.FindProperty("m_OnSelectEntered");
             onSelectExited = serializedObject.FindProperty("m_OnSelectExited");
             onSelectCanceled = serializedObject.FindProperty("m_OnSelectCanceled");
-#else
-            onFirstHoverEntered = serializedObject.FindProperty("m_OnFirstHoverEnter");
-            onHoverEntered = serializedObject.FindProperty("m_OnHoverEnter");
-            onHoverExited = serializedObject.FindProperty("m_OnHoverExit");
-            onLastHoverExited = serializedObject.FindProperty("m_OnLastHoverExit");
-            onSelectEntered = serializedObject.FindProperty("m_OnSelectEnter");
-            onSelectExited = serializedObject.FindProperty("m_OnSelectExit");
-#endif
             onActivateProperty = serializedObject.FindProperty("m_OnActivate");
             onDeactivateProperty = serializedObject.FindProperty("m_OnDeactivate");
             collidersProperty = serializedObject.FindProperty("m_Colliders");
@@ -168,10 +143,7 @@ public override void OnInspectorGUI()
             EditorGUILayout.PropertyField(interactionManager, Tooltips.InteractionManager);
             EditorGUILayout.PropertyField(interactionLayerMaskProperty, Tooltips.InteractionLayerMask);
             EditorGUILayout.PropertyField(collidersProperty, Tooltips.Colliders, true);
-
-#if XRIT_1_0_OR_NEWER
             EditorGUILayout.PropertyField(customReticle, Tooltips.CustomReticle);
-#endif
 
             EditorGUILayout.Space();
 
@@ -241,9 +213,7 @@ public override void OnInspectorGUI()
                 EditorGUILayout.PropertyField(onLastHoverExited);
                 EditorGUILayout.PropertyField(onSelectEntered);
                 EditorGUILayout.PropertyField(onSelectExited);
-#if XRIT_0_10_OR_NEWER
                 EditorGUILayout.PropertyField(onSelectCanceled);
-#endif
                 EditorGUILayout.PropertyField(onActivateProperty);
                 EditorGUILayout.PropertyField(onDeactivateProperty);
             }

diff --git a/Editor/Interaction/RayInteractorEditor.cs b/Editor/Interaction/RayInteractorEditor.cs
@@ -67,17 +67,11 @@ internal class RayInteractorEditor : Editor
         private SerializedProperty onSelectEntered;
         private SerializedProperty onSelectExited;
 
-#if XRIT_0_10_OR_NEWER
         private SerializedProperty keepSelectedTargetValid;
         private SerializedProperty allowAnchorControl;
         private SerializedProperty useForceGrab;
         private SerializedProperty anchorRotateSpeed;
         private SerializedProperty anchorTranslateSpeed;
-#endif
-
-        // private bool showInteractorEvents;
-        // private bool showSoundEvents = false;
-        // private bool showHapticEvents = false;
 
         private static class Tooltips
         {
@@ -169,7 +163,6 @@ private void OnEnable()
             acceleration = serializedObject.FindProperty("m_Acceleration");
             additionalFlightTime = serializedObject.FindProperty("m_AdditionalFlightTime");
 
-#if XRIT_0_10_OR_NEWER
             keepSelectedTargetValid = serializedObject.FindProperty("m_KeepSelectedTargetValid");
             allowAnchorControl = serializedObject.FindProperty("m_AllowAnchorControl");
             useForceGrab = serializedObject.FindProperty("m_UseForceGrab");
@@ -202,34 +195,6 @@ private void OnEnable()
             onHoverExited = serializedObject.FindProperty("m_OnHoverExited");
             onSelectEntered = serializedObject.FindProperty("m_OnSelectEntered");
             onSelectExited = serializedObject.FindProperty("m_OnSelectExited");
-#else
-            playAudioClipOnSelectEntered = serializedObject.FindProperty("m_PlayAudioClipOnSelectEnter");
-            audioClipForOnSelectEntered = serializedObject.FindProperty("m_AudioClipForOnSelectEnter");
-            playAudioClipOnSelectExited = serializedObject.FindProperty("m_PlayAudioClipOnSelectExit");
-            audioClipForOnSelectExited = serializedObject.FindProperty("m_AudioClipForOnSelectExit");
-            playAudioClipOnHoverEntered = serializedObject.FindProperty("m_PlayAudioClipOnHoverEnter");
-            audioClipForOnHoverEntered = serializedObject.FindProperty("m_AudioClipForOnHoverEnter");
-            playAudioClipOnHoverExited = serializedObject.FindProperty("m_PlayAudioClipOnHoverExit");
-            audioClipForOnHoverExited = serializedObject.FindProperty("m_AudioClipForOnHoverExit");
-            playHapticsOnSelectEntered = serializedObject.FindProperty("m_PlayHapticsOnSelectEnter");
-
-            hapticSelectEnterIntensity = serializedObject.FindProperty("m_HapticSelectEnterIntensity");
-            hapticSelectEnterDuration = serializedObject.FindProperty("m_HapticSelectEnterDuration");
-            playHapticsOnHoverEntered = serializedObject.FindProperty("m_PlayHapticsOnHoverEnter");
-            hapticHoverEnterIntensity = serializedObject.FindProperty("m_HapticHoverEnterIntensity");
-            hapticHoverEnterDuration = serializedObject.FindProperty("m_HapticHoverEnterDuration");
-            playHapticsOnSelectExited = serializedObject.FindProperty("m_PlayHapticsOnSelectExit");
-            hapticSelectExitIntensity = serializedObject.FindProperty("m_HapticSelectExitIntensity");
-            hapticSelectExitDuration = serializedObject.FindProperty("m_HapticSelectExitDuration");
-            playHapticsOnHoverExited = serializedObject.FindProperty("m_PlayHapticsOnHoverExit");
-            hapticHoverExitIntensity = serializedObject.FindProperty("m_HapticHoverExitIntensity");
-            hapticHoverExitDuration = serializedObject.FindProperty("m_HapticHoverExitDuration");
-
-            onHoverEntered = serializedObject.FindProperty("m_OnHoverEnter");
-            onHoverExited = serializedObject.FindProperty("m_OnHoverExit");
-            onSelectEntered = serializedObject.FindProperty("m_OnSelectEnter");
-            onSelectExited = serializedObject.FindProperty("m_OnSelectExit");
-#endif
         }
 
         public override void OnInspectorGUI()
@@ -243,11 +208,8 @@ public override void OnInspectorGUI()
             foreach (Object targetObject in serializedObject.targetObjects)
             {
                 RayInteractor interactor = (RayInteractor)targetObject;
-#if XRIT_0_10_OR_NEWER
+                
                 if (interactor.GetComponent<XRController>() == null && interactor.GetComponent<ActionBasedController>() == null)
-#else
-                if (interactor.GetComponent<XRController>() == null)
-#endif
                 {
                     EditorGUILayout.HelpBox(Tooltips.MissingRequiredController, MessageType.Warning, true);
                     break;
@@ -261,7 +223,6 @@ public override void OnInspectorGUI()
 
             EditorGUILayout.PropertyField(enableUIInteraction, Tooltips.EnableUIInteraction);
 
-#if XRIT_0_10_OR_NEWER
             EditorGUILayout.PropertyField(useForceGrab, Tooltips.ForceGrab);
             EditorGUILayout.PropertyField(allowAnchorControl, Tooltips.AllowAnchorControl);
 
@@ -272,7 +233,6 @@ public override void OnInspectorGUI()
                 EditorGUILayout.PropertyField(anchorTranslateSpeed, Tooltips.AnchorTranslateSpeed);
                 EditorGUI.indentLevel--;
             }
-#endif
 
             EditorGUILayout.PropertyField(attachTransform, Tooltips.AttachTransform);
 
@@ -338,9 +298,7 @@ public override void OnInspectorGUI()
                     EditorGUILayout.HelpBox(Tooltips.StartingInteractableWarning, MessageType.Warning, true);
                 }
 
-#if XRIT_0_10_OR_NEWER
                 EditorGUILayout.PropertyField(keepSelectedTargetValid, Tooltips.KeepSelectedTargetValid);
-#endif
                 EditorGUILayout.PropertyField(hideControllerOnSelect, Tooltips.HideControllerOnSelect);
                 EditorGUILayout.PropertyField(hoverToSelect, Tooltips.HoverToSelect);
 

diff --git a/Editor/Interaction/SnapZoneEditor.cs b/Editor/Interaction/SnapZoneEditor.cs
@@ -55,17 +55,10 @@ private void OnEnable()
 
             interactableHoverMeshMaterial = serializedObject.FindProperty("validationMaterial");
 
-#if XRIT_0_10_OR_NEWER
             onHoverEntered = serializedObject.FindProperty("m_OnHoverEntered");
             onHoverExited = serializedObject.FindProperty("m_OnHoverExited");
             onSelectEntered = serializedObject.FindProperty("m_OnSelectEntered");
             onSelectExited = serializedObject.FindProperty("m_OnSelectExited");
-#else
-            onHoverEntered = serializedObject.FindProperty("m_OnHoverEnter");
-            onHoverExited = serializedObject.FindProperty("m_OnHoverExit");
-            onSelectEntered = serializedObject.FindProperty("m_OnSelectEnter");
-            onSelectExited = serializedObject.FindProperty("m_OnSelectExit");
-#endif
         }
 
         public override void OnInspectorGUI()

diff --git a/Editor/PackageDependencies/XRInteractionPackageEnabler.cs b/Editor/PackageDependencies/XRInteractionPackageEnabler.cs
@@ -7,6 +7,9 @@ public class XRInteractionPackageEnabler : Dependency
     {        
         /// <inheritdoc/>
         public override string Package { get; } = "com.unity.xr.interaction.toolkit";
+
+        /// <inheritdoc/>
+        public override string Version { get; internal set; } = "1.0.0-pre.2";
 
         /// <inheritdoc/>
         public override string[] Samples { get; } = { "Default Input Actions", "XR Device Simulator" };

diff --git a/Editor/SceneSetup/XRInteractionSceneSetup.cs b/Editor/SceneSetup/XRInteractionSceneSetup.cs
@@ -20,14 +20,12 @@ public override void Setup()
         {
             DeleteStaticObject("[XR_Setup]");
 
-#if XRIT_1_0_OR_NEWER
             XRSimulatorImporter simulatorImporter = new XRSimulatorImporter();
 
             if (string.IsNullOrEmpty(simulatorImporter.SimulatorRigPath) || AssetDatabase.GetMainAssetTypeAtPath(simulatorImporter.SimulatorRigPath) == null)
             {
                 simulatorImporter.ImportSimulatorRig();
             }
-#endif
         }
 
         private void DeleteStaticObject(string objectName)

diff --git a/Editor/SceneSetup/XRSimulatorImporter.cs b/Editor/SceneSetup/XRSimulatorImporter.cs
@@ -1,5 +1,4 @@
-#if XRIT_1_0_OR_NEWER
-using System.IO;
+using System.IO;
 using System.Linq;
 using UnityEditor;
 using UnityEngine;
@@ -63,4 +62,3 @@ private GameObject LoadPrefab(string prefabName, string searchFolder, out string
         }
     }
 }
-#endif
diff --git a/Editor/SnapZone/SnapZoneSettings.cs b/Editor/SnapZone/SnapZoneSettings.cs
@@ -79,11 +79,7 @@ public class SnapZoneSettings : SettingsObject<SnapZoneSettings>
         /// </summary>
         public void ApplySettingsToSnapZone(SnapZone snapZone)
         {
-#if XRIT_0_10_OR_NEWER
             snapZone.interactionLayerMask = InteractionLayerMask;
-#else
-            snapZone.InteractionLayerMask = InteractionLayerMask;
-#endif
             snapZone.ShownHighlightObjectColor = HighlightColor;
             snapZone.ValidationMaterial = ValidationMaterial;
             snapZone.InvalidMaterial = InvalidMaterial;

diff --git a/Runtime/Innoactive.Creator.XRInteraction.asmdef b/Runtime/Innoactive.Creator.XRInteraction.asmdef
@@ -16,20 +16,10 @@
         "XR_INTERACTION_TOOLKIT"
     ],
     "versionDefines": [
-        {
-            "name": "com.unity.xr.interaction.toolkit",
-            "expression": "",
-            "define": "XR_INTERACTION_TOOLKIT"
-        },
-        {
-            "name": "com.unity.xr.interaction.toolkit",
-            "expression": "0.10.0-preview",
-            "define": "XRIT_0_10_OR_NEWER"
-        },
         {
             "name": "com.unity.xr.interaction.toolkit",
             "expression": "1.0.0-pre.2",
-            "define": "XRIT_1_0_OR_NEWER"
+            "define": "XR_INTERACTION_TOOLKIT"
         }
     ],
     "noEngineReferences": false

diff --git a/Runtime/Interaction/Action-based/ActionBasedControllerManager.cs b/Runtime/Interaction/Action-based/ActionBasedControllerManager.cs
@@ -1,5 +1,4 @@
-#if XRIT_0_10_OR_NEWER
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
@@ -786,5 +785,4 @@ private InputAction GetInputAction(InputActionReference actionReference)
             return actionReference != null ? actionReference.action : null;
         }
     }
-}
-#endif
+}
diff --git a/Runtime/Interaction/Action-based/LocomotionSchemeManager.cs b/Runtime/Interaction/Action-based/LocomotionSchemeManager.cs
@@ -1,5 +1,4 @@
-#if XRIT_0_10_OR_NEWER
-using System;
+using System;
 using System.ComponentModel;
 using System.Collections.Generic;
 using UnityEngine;
@@ -546,4 +545,3 @@ private void ClearBindingMasks()
         }
     }
 }
-#endif