Merge pull request #74 from Unity-Technologies/staging-1.0.0-pre.6

Update examples for 1.0.0-pre.6

.gitignore

@@ -17,6 +17,7 @@ Assets/XR-Interaction.meta
 # Autogenerated VS/MD/Consulo solution and project files
 ExportedObj/
 .consulo/
+.vsconfig
 *.csproj
 *.unityproj
 *.sln

AR/Packages/manifest.json

@@ -17,7 +17,7 @@
     "com.unity.xr.arcore": "2.1.16",
     "com.unity.xr.arfoundation": "2.1.16",
     "com.unity.xr.arkit": "2.1.16",
-    "com.unity.xr.interaction.toolkit": "1.0.0-pre.5",
+    "com.unity.xr.interaction.toolkit": "1.0.0-pre.6",
     "com.unity.xr.management": "3.2.17",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

AR/Packages/packages-lock.json

@@ -164,7 +164,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.xr.interaction.toolkit": {
-      "version": "1.0.0-pre.5",
+      "version": "1.0.0-pre.6",
       "depth": 0,
       "source": "registry",
       "dependencies": {

VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.5/Default Input Actions/XRI Default Input Actions.inputactions → VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.6/Default Input Actions/XRI Default Input Actions.inputactions

@@ -337,18 +337,7 @@
                     "name": "",
                     "id": "99cb7ad1-51ec-4611-af68-92a85f2c17d6",
                     "path": "<XRController>{LeftHand}/Primary2DAxis",
-                    "interactions": "Sector(directions=12,sweepBehavior=1)",
-                    "processors": "",
-                    "groups": "Noncontinuous Move",
-                    "action": "Turn",
-                    "isComposite": false,
-                    "isPartOfComposite": false
-                },
-                {
-                    "name": "",
-                    "id": "034c3ced-8f2c-44ce-892e-678ca433265b",
-                    "path": "<XRController>{LeftHand}/Primary2DAxis",
-                    "interactions": "Sector(directions=2,sweepBehavior=2)",
+                    "interactions": "Sector(directions=12,sweepBehavior=1),Sector(directions=2,sweepBehavior=2)",
                     "processors": "",
                     "groups": "Noncontinuous Move",
                     "action": "Turn",
@@ -779,18 +768,7 @@
                     "name": "",
                     "id": "d6c08c3d-3d41-4695-994d-1ac9016a5a9e",
                     "path": "<XRController>{RightHand}/Primary2DAxis",
-                    "interactions": "Sector(directions=12,sweepBehavior=1)",
-                    "processors": "",
-                    "groups": "Generic XR Controller",
-                    "action": "Turn",
-                    "isComposite": false,
-                    "isPartOfComposite": false
-                },
-                {
-                    "name": "",
-                    "id": "70f78baa-0f00-4d32-a2b6-ea9e2090ecc2",
-                    "path": "<XRController>{RightHand}/Primary2DAxis",
-                    "interactions": "Sector(directions=2,sweepBehavior=2)",
+                    "interactions": "Sector(directions=12,sweepBehavior=1),Sector(directions=2,sweepBehavior=2)",
                     "processors": "",
                     "groups": "Generic XR Controller",
                     "action": "Turn",

VR/Packages/manifest.json

@@ -13,7 +13,7 @@
     "com.unity.textmeshpro": "2.1.4",
     "com.unity.ugui": "1.0.0",
     "com.unity.xr.arsubsystems": "2.1.16",
-    "com.unity.xr.interaction.toolkit": "1.0.0-pre.5",
+    "com.unity.xr.interaction.toolkit": "1.0.0-pre.6",
     "com.unity.xr.management": "3.2.17",
     "com.unity.xr.oculus": "1.8.1",
     "com.unity.xr.windowsmr": "2.6.1",

VR/Packages/packages-lock.json

@@ -134,7 +134,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.xr.interaction.toolkit": {
-      "version": "1.0.0-pre.5",
+      "version": "1.0.0-pre.6",
       "depth": 0,
       "source": "registry",
       "dependencies": {