Merge pull request #61 from Unity-Technologies/staging-1.0.0-pre.3

Update examples for 1.0.0-pre.3

Merge pull request #61 from Unity-Technologies/staging-1.0.0-pre.3
Update examples for 1.0.0-pre.3
4461c5c1 · Chris Massie · GitHub · 32f6f474 · 3a875125 · 32f6f474
Unverified Commit 4461c5c1 authored Mar 20, 2021 by Chris Massie Committed by GitHub Mar 20, 2021
59 changed files
--- a/AR/Assets/Materials/PlacedCubeMaterial.mat
+++ b/AR/Assets/Materials/PlacedCubeMaterial.mat
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: PlacedCubeMaterial
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 0.93725497, g: 0, b: 0.28235295, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
--- a/AR/Assets/Materials/PlacedCubeMaterial.mat.meta
+++ b/AR/Assets/Materials/PlacedCubeMaterial.mat.meta
-fileFormatVersion: 2
-guid: 9b5d75722d424804fa0c0efaa228c3db
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/AR/Assets/Plugins.meta
+++ b/AR/Assets/Plugins.meta
+fileFormatVersion: 2
+guid: 2c2d8930e8acdea4a9667f2753d940bb
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/AR/Assets/Plugins/Android.meta
+++ b/AR/Assets/Plugins/Android.meta
+fileFormatVersion: 2
+guid: 99fa6b5c7fb4a0a468f9ba51fd10eed7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/AR/Assets/Plugins/Android/launcherTemplate.gradle
+++ b/AR/Assets/Plugins/Android/launcherTemplate.gradle
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        // Must be Android Gradle Plugin 3.6.0 or later. For a list of
+        // compatible Gradle versions refer to:
+        // https://developer.android.com/studio/releases/gradle-plugin
+        classpath 'com.android.tools.build:gradle:3.6.0'
+    }
+}
+
+allprojects {
+   repositories {
+      google()
+      jcenter()
+      flatDir {
+        dirs 'libs'
+      }
+   }
+}
+
+apply plugin: 'com.android.application'
+
+dependencies {
+    implementation project(':unityLibrary')
+    }
+
+android {
+    compileSdkVersion **APIVERSION**
+    buildToolsVersion '**BUILDTOOLS**'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        minSdkVersion **MINSDKVERSION**
+        targetSdkVersion **TARGETSDKVERSION**
+        applicationId '**APPLICATIONID**'
+        ndk {
+            abiFilters **ABIFILTERS**
+        }
+        versionCode **VERSIONCODE**
+        versionName '**VERSIONNAME**'
+    }
+
+    aaptOptions {
+        noCompress = ['.unity3d', '.ress', '.resource', '.obb'**STREAMING_ASSETS**]
+        ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
+    }**SIGN**
+
+    lintOptions {
+        abortOnError false
+    }
+
+    buildTypes {
+        debug {
+            minifyEnabled **MINIFY_DEBUG**
+            useProguard **PROGUARD_DEBUG**
+            proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG**
+            jniDebuggable true
+        }
+        release {
+            minifyEnabled **MINIFY_RELEASE**
+            useProguard **PROGUARD_RELEASE**
+            proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG**
+        }
+    }**PACKAGING_OPTIONS****SPLITS**
+**BUILT_APK_LOCATION**
+    bundle {
+        language {
+            enableSplit = false
+        }
+        density {
+            enableSplit = false
+        }
+        abi {
+            enableSplit = true
+        }
+    }
+}**SPLITS_VERSION_CODE****LAUNCHER_SOURCE_BUILD_SETUP**
--- a/AR/Assets/Plugins/Android/launcherTemplate.gradle.meta
+++ b/AR/Assets/Plugins/Android/launcherTemplate.gradle.meta
+fileFormatVersion: 2
+guid: 69a8a1fcf7b3c4440b69ccd53066cfbf
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/AR/Assets/Plugins/Android/mainTemplate.gradle
+++ b/AR/Assets/Plugins/Android/mainTemplate.gradle
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        // Must be Android Gradle Plugin 3.6.0 or later. For a list of
+        // compatible Gradle versions refer to:
+        // https://developer.android.com/studio/releases/gradle-plugin
+        classpath 'com.android.tools.build:gradle:3.6.0'
+    }
+}
+
+allprojects {
+   repositories {
+      google()
+      jcenter()
+      flatDir {
+        dirs 'libs'
+      }
+   }
+}
+
+apply plugin: 'com.android.library'
+**APPLY_PLUGINS**
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+**DEPS**}
+
+android {
+    compileSdkVersion **APIVERSION**
+    buildToolsVersion '**BUILDTOOLS**'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        minSdkVersion **MINSDKVERSION**
+        targetSdkVersion **TARGETSDKVERSION**
+        ndk {
+            abiFilters **ABIFILTERS**
+        }
+        versionCode **VERSIONCODE**
+        versionName '**VERSIONNAME**'
+        consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD**
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    aaptOptions {
+        ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
+    }**PACKAGING_OPTIONS**
+}**REPOSITORIES****SOURCE_BUILD_SETUP**
+**EXTERNAL_SOURCES**
--- a/AR/Assets/Plugins/Android/mainTemplate.gradle.meta
+++ b/AR/Assets/Plugins/Android/mainTemplate.gradle.meta
+fileFormatVersion: 2
+guid: 7cf2b31bf39b34642ad712669611a0c4
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/AR/Assets/Prefabs/ManipulatorCube.prefab
+++ b/AR/Assets/Prefabs/ManipulatorCube.prefab
--- a/AR/Assets/Prefabs/ManipulatorCube.prefab.meta
+++ b/AR/Assets/Prefabs/ManipulatorCube.prefab.meta
 fileFormatVersion: 2
-guid: ded51c8ee147a48818b28707c73de793
+guid: 1032d234f81c3401eb238fd7764ebe86
 PrefabImporter:
  externalObjects: {}
  userData: 

--- a/AR/Assets/Prefabs/ManipulatorCylinder.prefab
+++ b/AR/Assets/Prefabs/ManipulatorCylinder.prefab
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7821375136172877827
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7821375136172877824}
+  - component: {fileID: 7821375136172877831}
+  - component: {fileID: 7821375136172877830}
+  - component: {fileID: 7821375136172877825}
+  m_Layer: 0
+  m_Name: Cylinder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7821375136172877824
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7821375136172877827}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.3, z: 0}
+  m_LocalScale: {x: 0.15, y: 0.15, z: 0.15}
+  m_Children:
+  - {fileID: 7821375136186690587}
+  m_Father: {fileID: 3600497696271026209}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &7821375136172877831
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7821375136172877827}
+  m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &7821375136172877830
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7821375136172877827}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!136 &7821375136172877825
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7821375136172877827}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.5000001
+  m_Height: 2
+  m_Direction: 1
+  m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
+--- !u!1 &7821375136186690586
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7821375136186690587}
+  - component: {fileID: 7821375136186690590}
+  - component: {fileID: 7821375136186690585}
+  - component: {fileID: 7821375136186690584}
+  m_Layer: 0
+  m_Name: SelectionVisualization
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &7821375136186690587
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7821375136186690586}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.1, z: 0}
+  m_LocalScale: {x: 1, y: 2.3949, z: 1}
+  m_Children: []
+  m_Father: {fileID: 7821375136172877824}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &7821375136186690590
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7821375136186690586}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &7821375136186690585
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7821375136186690586}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: f77b8a8d8cced4e5a9bc146b258b3b59, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!65 &7821375136186690584
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7821375136186690586}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1001 &8781917451476529767
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3095951834356975009, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_SelectionVisualization
+      value: 
+      objectReference: {fileID: 7821375136186690586}
+    - target: {fileID: 5199452982878878274, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_Name
+      value: ManipulatorObject Cylinder
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 9296dbbe1ee8b42de9d68fa46c829069, type: 3}
+--- !u!4 &3600497696271026209 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+    type: 3}
+  m_PrefabInstance: {fileID: 8781917451476529767}
+  m_PrefabAsset: {fileID: 0}
--- a/AR/Assets/Prefabs/ManipulatorCylinder.prefab.meta
+++ b/AR/Assets/Prefabs/ManipulatorCylinder.prefab.meta
+fileFormatVersion: 2
+guid: 0f773861a61b24882bac84cb061dd03d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/AR/Assets/Prefabs/ManipulatorObject.prefab
+++ b/AR/Assets/Prefabs/ManipulatorObject.prefab
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5199452982878878274
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5199452982878878278}
+  - component: {fileID: 3095951834356975009}
+  - component: {fileID: 6087440508830133792}
+  - component: {fileID: 6953106647699504611}
+  - component: {fileID: 4361325392947418016}
+  m_Layer: 0
+  m_Name: ManipulatorObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5199452982878878278
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5199452982878878274}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3095951834356975009
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5199452982878878274}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c670bfa55d621474ea22ff77c1820163, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_InteractionManager: {fileID: 0}
+  m_Colliders: []
+  m_InteractionLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CustomReticle: {fileID: 0}
+  m_FirstHoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_LastHoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_HoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_HoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_SelectEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_SelectExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Activated:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Deactivated:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnFirstHoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnLastHoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnHoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnHoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnSelectEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnSelectExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnSelectCanceled:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnActivate:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnDeactivate:
+    m_PersistentCalls:
+      m_Calls: []
+  m_ARSessionOrigin: {fileID: 0}
+  m_SelectionVisualization: {fileID: 0}
+--- !u!114 &6087440508830133792
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5199452982878878274}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ddf6f41d7b58d4144a887c52ce97c699, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_InteractionManager: {fileID: 0}
+  m_Colliders: []
+  m_InteractionLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CustomReticle: {fileID: 0}
+  m_FirstHoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_LastHoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_HoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_HoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_SelectEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_SelectExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Activated:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Deactivated:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnFirstHoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnLastHoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnHoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnHoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnSelectEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnSelectExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnSelectCanceled:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnActivate:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnDeactivate:
+    m_PersistentCalls:
+      m_Calls: []
+  m_ARSessionOrigin: {fileID: 0}
+  m_ObjectGestureTranslationMode: 0
+  m_MaxTranslationDistance: 10
+  m_FallbackLayerMask:
+    serializedVersion: 2
+    m_Bits: 512
+--- !u!114 &6953106647699504611
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5199452982878878274}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3bd997ad0c1d2434f95bde472c2f2232, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_InteractionManager: {fileID: 0}
+  m_Colliders: []
+  m_InteractionLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CustomReticle: {fileID: 0}
+  m_FirstHoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_LastHoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_HoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_HoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_SelectEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_SelectExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Activated:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Deactivated:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnFirstHoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnLastHoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnHoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnHoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnSelectEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnSelectExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnSelectCanceled:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnActivate:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnDeactivate:
+    m_PersistentCalls:
+      m_Calls: []
+  m_ARSessionOrigin: {fileID: 0}
+  m_MinScale: 0.75
+  m_MaxScale: 1.75
+  m_ElasticRatioLimit: 0
+  m_Sensitivity: 0.75
+  m_Elasticity: 0.15
+--- !u!114 &4361325392947418016
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5199452982878878274}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c6266a2729abc4d18a676c7c2bd1c0ca, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_InteractionManager: {fileID: 0}
+  m_Colliders: []
+  m_InteractionLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CustomReticle: {fileID: 0}
+  m_FirstHoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_LastHoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_HoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_HoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_SelectEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_SelectExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Activated:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Deactivated:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnFirstHoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnLastHoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnHoverEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnHoverExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnSelectEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnSelectExited:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnSelectCanceled:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnActivate:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnDeactivate:
+    m_PersistentCalls:
+      m_Calls: []
+  m_ARSessionOrigin: {fileID: 0}
+  m_RotationRateDegreesDrag: 100
+  m_RotationRateDegreesTwist: 2.5
--- a/AR/Assets/Prefabs/ManipulatorObject.prefab.meta
+++ b/AR/Assets/Prefabs/ManipulatorObject.prefab.meta
+fileFormatVersion: 2
+guid: 9296dbbe1ee8b42de9d68fa46c829069
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/AR/Assets/Prefabs/ManipulatorSphere.prefab
+++ b/AR/Assets/Prefabs/ManipulatorSphere.prefab
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5234984596277944974
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5234984596277944961}
+  - component: {fileID: 5234984596277944962}
+  - component: {fileID: 5234984596277944963}
+  - component: {fileID: 5234984596277944960}
+  m_Layer: 0
+  m_Name: Sphere
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5234984596277944961
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5234984596277944974}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.15, z: 0}
+  m_LocalScale: {x: 0.15, y: 0.15, z: 0.15}
+  m_Children:
+  - {fileID: 5234984597027294078}
+  m_Father: {fileID: 8018260922091144507}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &5234984596277944962
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5234984596277944974}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &5234984596277944963
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5234984596277944974}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!135 &5234984596277944960
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5234984596277944974}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &5234984597027294079
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5234984597027294078}
+  - component: {fileID: 5234984597027294067}
+  - component: {fileID: 5234984597027294064}
+  - component: {fileID: 5234984597027294065}
+  m_Layer: 0
+  m_Name: SelectionVisualization
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &5234984597027294078
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5234984597027294079}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.1, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5234984596277944961}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &5234984597027294067
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5234984597027294079}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &5234984597027294064
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5234984597027294079}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: f77b8a8d8cced4e5a9bc146b258b3b59, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!65 &5234984597027294065
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5234984597027294079}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1001 &2841418575711092605
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3095951834356975009, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_SelectionVisualization
+      value: 
+      objectReference: {fileID: 5234984597027294079}
+    - target: {fileID: 5199452982878878274, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_Name
+      value: ManipulatorObject
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 9296dbbe1ee8b42de9d68fa46c829069, type: 3}
+--- !u!4 &8018260922091144507 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5199452982878878278, guid: 9296dbbe1ee8b42de9d68fa46c829069,
+    type: 3}
+  m_PrefabInstance: {fileID: 2841418575711092605}
+  m_PrefabAsset: {fileID: 0}
--- a/AR/Assets/Prefabs/ManipulatorSphere.prefab.meta
+++ b/AR/Assets/Prefabs/ManipulatorSphere.prefab.meta
+fileFormatVersion: 2
+guid: 5f9392db3f31d438a907146213947f66
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/AR/Assets/Scenes/ARInteraction.unity
+++ b/AR/Assets/Scenes/ARInteraction.unity
@@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -341,6 +341,7 @@ MonoBehaviour:
  m_OnSelectExited:
    m_PersistentCalls:
      m_Calls: []
+  m_ARSessionOrigin: {fileID: 1335839534}
 --- !u!1 &427002218
 GameObject:
  m_ObjectHideFlags: 0
@@ -499,8 +500,12 @@ MonoBehaviour:
  m_OnDeactivate:
    m_PersistentCalls:
      m_Calls: []
-  m_PlacementPrefab: {fileID: 4085108242453859580, guid: ded51c8ee147a48818b28707c73de793,
+  m_ARSessionOrigin: {fileID: 1335839534}
+  m_PlacementPrefab: {fileID: 5295117067104532748, guid: 1032d234f81c3401eb238fd7764ebe86,
    type: 3}
+  m_FallbackLayerMask:
+    serializedVersion: 2
+    m_Bits: 512
  m_ObjectPlaced:
    m_PersistentCalls:
      m_Calls: []

--- a/AR/Assets/Scenes/ARInteraction_MultipleObjects.unity
+++ b/AR/Assets/Scenes/ARInteraction_MultipleObjects.unity
--- a/AR/Assets/Scenes/ARInteraction_MultipleObjects.unity.meta
+++ b/AR/Assets/Scenes/ARInteraction_MultipleObjects.unity.meta
+fileFormatVersion: 2
+guid: 858d023a14f3c428ea45b63078452410
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/AR/Assets/Scripts/PlaceOnPlane.cs
+++ b/AR/Assets/Scripts/PlaceOnPlane.cs
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.XR.ARFoundation;
-using UnityEngine.XR.ARSubsystems;
-
-/// <summary>
-/// Listens for touch events and performs an AR raycast from the screen touch point.
-/// AR raycasts will only hit detected trackables like feature points and planes.
-/// 
-/// If a raycast hits a trackable, the <see cref="placedPrefab"/> is instantiated
-/// and moved to the hit position.
-/// </summary>
-[RequireComponent(typeof(ARRaycastManager))]
-public class PlaceOnPlane : MonoBehaviour
-{
-    [SerializeField]
-    [Tooltip("Instantiates this prefab on a plane at the touch location.")]
-    GameObject m_PlacedPrefab;
-
-    /// <summary>
-    /// The prefab to instantiate on touch.
-    /// </summary>
-    public GameObject placedPrefab
-    {
-        get { return m_PlacedPrefab; }
-        set { m_PlacedPrefab = value; }
-    }
-    
-    /// <summary>
-    /// The object instantiated as a result of a successful raycast intersection with a plane.
-    /// </summary>
-    public GameObject spawnedObject { get; private set; }
-
-    void Awake()
-    {
-        m_RaycastManager = GetComponent<ARRaycastManager>();
-    }
-
-    void Update()
-    {
-        if (Input.touchCount == 0)
-            return;
-
-        var touch = Input.GetTouch(0);
-
-        if (m_RaycastManager.Raycast(touch.position, s_Hits, TrackableType.PlaneWithinPolygon))
-        {
-            // Raycast hits are sorted by distance, so the first one
-            // will be the closest hit.
-            var hitPose = s_Hits[0].pose;
-
-            if (spawnedObject == null)
-            {
-                spawnedObject = Instantiate(m_PlacedPrefab, hitPose.position, hitPose.rotation);
-            }
-            else
-            {
-                spawnedObject.transform.position = hitPose.position;
-            }
-        }
-    }
-
-    static List<ARRaycastHit> s_Hits = new List<ARRaycastHit>();
-
-    ARRaycastManager m_RaycastManager;
-}
--- a/AR/Assets/Scripts/PlaceOnPlane.cs.meta
+++ b/AR/Assets/Scripts/PlaceOnPlane.cs.meta
-fileFormatVersion: 2
-guid: 7d5359d5f13250e4485741ed685a32be
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/AR/Assets/Scripts/SwitchPlacementPrefab.cs
+++ b/AR/Assets/Scripts/SwitchPlacementPrefab.cs
-using UnityEngine;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
 using UnityEngine.XR.Interaction.Toolkit.AR;

+[RequireComponent(typeof(ARPlacementInteractable))]
 public class SwitchPlacementPrefab : MonoBehaviour
 {
-    public GameObject m_ChairPrefab;
-    public GameObject m_TablePrefab;
-    public GameObject m_KitchenChairPrefab;
-    public GameObject m_KitchenTable1Prefab;
-    public GameObject m_KitchenTable2Prefab;
-    public GameObject m_TVTablePrefab;
-    public ARPlacementInteractable m_PlacementInteractable;
-
-    public void SwapToChair()
+    [Tooltip("The list of objects that you can place.")]
+    [SerializeField]
+    List<GameObject> m_ObjectsToPlace;
+    public List<GameObject> objectsToPlace
    {
-        if (m_PlacementInteractable == null)
-            return;
-
-        m_PlacementInteractable.placementPrefab = m_ChairPrefab;
+        get => m_ObjectsToPlace;
+        set => m_ObjectsToPlace = value;
    }

-    public void SwapToTable()
+    [Tooltip("The drop down menu populated by the list of placeable objects.")]
+    [SerializeField]
+    Dropdown m_Dropdown;
+    public Dropdown dropdown
    {
-        if (m_PlacementInteractable == null)
-            return;
-
-        m_PlacementInteractable.placementPrefab = m_TablePrefab;
+        get => m_Dropdown;
+        set => m_Dropdown = value;
    }
-    
-    public void SwapToKitchenChair()
-    {
-        if (m_PlacementInteractable == null)
-            return;

-        m_PlacementInteractable.placementPrefab = m_KitchenChairPrefab;
-    }
-    
-    public void SwapToKitchenTable1()
-    {
-        if (m_PlacementInteractable == null)
-            return;
+    ARPlacementInteractable m_PlacementInteractable;

-        m_PlacementInteractable.placementPrefab = m_KitchenTable1Prefab;
-    }
-    
-    public void SwapToKitchenTable2()
+    protected void Awake()
    {
-        if (m_PlacementInteractable == null)
-            return;
-
-        m_PlacementInteractable.placementPrefab = m_KitchenTable2Prefab;
+        m_PlacementInteractable = GetComponent<ARPlacementInteractable>();
+        m_Dropdown.ClearOptions();
+        foreach (var item in m_ObjectsToPlace)
+        {
+            var data = new Dropdown.OptionData();
+            data.text = item.name;
+            m_Dropdown.options.Add(data);
+        }
+
+        SwapPlacementObject();
    }
-    
-    public void SwapToTVTable()
-    {
-        if (m_PlacementInteractable == null)
-            return;

-        m_PlacementInteractable.placementPrefab = m_TVTablePrefab;
+    public void SwapPlacementObject()
+    {
+        m_PlacementInteractable.placementPrefab = m_ObjectsToPlace[m_Dropdown.value];
    }
 }
--- a/AR/Packages/manifest.json
+++ b/AR/Packages/manifest.json
@@ -2,22 +2,22 @@
  "dependencies": {
    "com.unity.2d.sprite": "1.0.0",
    "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.ads": "3.5.2",
+    "com.unity.ads": "3.6.1",
    "com.unity.analytics": "3.3.5",
    "com.unity.ext.nunit": "1.0.6",
    "com.unity.ide.rider": "1.1.4",
    "com.unity.ide.visualstudio": "1.0.11",
    "com.unity.ide.vscode": "1.2.3",
-    "com.unity.inputsystem": "1.0.1",
-    "com.unity.purchasing": "2.2.1",
-    "com.unity.test-framework": "1.1.20",
-    "com.unity.textmeshpro": "2.1.3",
+    "com.unity.inputsystem": "1.0.2",
+    "com.unity.purchasing": "2.2.2",
+    "com.unity.test-framework": "1.1.24",
+    "com.unity.textmeshpro": "2.1.4",
    "com.unity.timeline": "1.2.18",
    "com.unity.ugui": "1.0.0",
-    "com.unity.xr.arcore": "2.1.14",
-    "com.unity.xr.arfoundation": "2.1.14",
-    "com.unity.xr.arkit": "2.1.14",
-    "com.unity.xr.interaction.toolkit": "1.0.0-pre.2",
+    "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.3",
    "com.unity.xr.management": "3.2.17",
    "com.unity.modules.ai": "1.0.0",
    "com.unity.modules.androidjni": "1.0.0",

--- a/AR/Packages/packages-lock.json
+++ b/AR/Packages/packages-lock.json
@@ -13,7 +13,7 @@
      "dependencies": {}
    },
    "com.unity.ads": {
-      "version": "3.5.2",
+      "version": "3.6.1",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -61,14 +61,14 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.inputsystem": {
-      "version": "1.0.1",
+      "version": "1.0.2",
      "depth": 0,
      "source": "registry",
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
    "com.unity.purchasing": {
-      "version": "2.2.1",
+      "version": "2.2.2",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -84,7 +84,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.test-framework": {
-      "version": "1.1.20",
+      "version": "1.1.24",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -95,7 +95,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.textmeshpro": {
-      "version": "2.1.3",
+      "version": "2.1.4",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -125,37 +125,37 @@
      }
    },
    "com.unity.xr.arcore": {
-      "version": "2.1.14",
+      "version": "2.1.16",
      "depth": 0,
      "source": "registry",
      "dependencies": {
-        "com.unity.xr.arsubsystems": "2.1.14",
-        "com.unity.xr.management": "3.2.17"
+        "com.unity.xr.arsubsystems": "2.1.16",
+        "com.unity.xr.management": "4.0.1"
      },
      "url": "https://packages.unity.com"
    },
    "com.unity.xr.arfoundation": {
-      "version": "2.1.14",
+      "version": "2.1.16",
      "depth": 0,
      "source": "registry",
      "dependencies": {
        "com.unity.xr.legacyinputhelpers": "2.1.7",
-        "com.unity.xr.arsubsystems": "2.1.14"
+        "com.unity.xr.arsubsystems": "2.1.16"
      },
      "url": "https://packages.unity.com"
    },
    "com.unity.xr.arkit": {
-      "version": "2.1.14",
+      "version": "2.1.16",
      "depth": 0,
      "source": "registry",
      "dependencies": {
-        "com.unity.xr.arsubsystems": "2.1.14",
-        "com.unity.xr.management": "3.2.17"
+        "com.unity.xr.arsubsystems": "2.1.16",
+        "com.unity.xr.management": "4.0.1"
      },
      "url": "https://packages.unity.com"
    },
    "com.unity.xr.arsubsystems": {
-      "version": "2.1.14",
+      "version": "2.1.16",
      "depth": 1,
      "source": "registry",
      "dependencies": {
@@ -164,11 +164,11 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.xr.interaction.toolkit": {
-      "version": "1.0.0-pre.2",
+      "version": "1.0.0-pre.3",
      "depth": 0,
      "source": "registry",
      "dependencies": {
-        "com.unity.inputsystem": "1.0.1",
+        "com.unity.inputsystem": "1.0.2",
        "com.unity.ugui": "1.0.0",
        "com.unity.xr.legacyinputhelpers": "2.1.7"
      },
@@ -185,11 +185,14 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.xr.management": {
-      "version": "3.2.17",
-      "depth": 0,
+      "version": "4.0.1",
+      "depth": 1,
      "source": "registry",
      "dependencies": {
-        "com.unity.xr.legacyinputhelpers": "2.1.2",
+        "com.unity.modules.subsystems": "1.0.0",
+        "com.unity.modules.vr": "1.0.0",
+        "com.unity.modules.xr": "1.0.0",
+        "com.unity.xr.legacyinputhelpers": "2.1.7",
        "com.unity.subsystemregistration": "1.0.6"
      },
      "url": "https://packages.unity.com"

--- a/AR/ProjectSettings/PackageManagerSettings.asset
+++ b/AR/ProjectSettings/PackageManagerSettings.asset
@@ -9,7 +9,7 @@ MonoBehaviour:
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 13960, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
  m_Name: 
  m_EditorClassIdentifier: 
  m_ScopedRegistriesSettingsExpanded: 1

--- a/AR/ProjectSettings/ProjectSettings.asset
+++ b/AR/ProjectSettings/ProjectSettings.asset
@@ -645,9 +645,9 @@ PlayerSettings:
  webGLThreadsSupport: 0
  webGLWasmStreaming: 0
  scriptingDefineSymbols:
-    1: UNITY_POST_PROCESSING_STACK_V2
-    4: UNITY_POST_PROCESSING_STACK_V2
-    7: UNITY_POST_PROCESSING_STACK_V2
+    1: UNITY_POST_PROCESSING_STACK_V2;ENABLE_INPUT_SYSTEM_TESTFRAMEWORK_TESTS
+    4: UNITY_POST_PROCESSING_STACK_V2;ENABLE_INPUT_SYSTEM_TESTFRAMEWORK_TESTS
+    7: UNITY_POST_PROCESSING_STACK_V2;ENABLE_INPUT_SYSTEM_TESTFRAMEWORK_TESTS
    13: UNITY_POST_PROCESSING_STACK_V2
    14: ENABLE_INPUT_SYSTEM_TESTFRAMEWORK_TESTS
    17: UNITY_POST_PROCESSING_STACK_V2
@@ -752,5 +752,5 @@ PlayerSettings:
  organizationId: 
  cloudEnabled: 0
  enableNativePlatformBackendsForNewInputSystem: 1
-  disableOldInputManagerSupport: 0
+  disableOldInputManagerSupport: 1
  legacyClampBlendShapeWeights: 1
--- a/AR/ProjectSettings/ProjectVersion.txt
+++ b/AR/ProjectSettings/ProjectVersion.txt
-m_EditorVersion: 2019.4.17f1
-m_EditorVersionWithRevision: 2019.4.17f1 (667c8606c536)
+m_EditorVersion: 2019.4.22f1
+m_EditorVersionWithRevision: 2019.4.22f1 (9fdda2fe27ad)
--- a/README.md
+++ b/README.md
@@ -43,10 +43,10 @@ We are not accepting pull requests at this time.
    1. In the **Projects** tab, click **Add**
    1. Browse to the AR or VR folder within your downloaded copy of this repository and click **Select Folder**
    1. Click the project which should now be added to the list to open the project
-1. Open the Scene at `Assets\Scenes\WorldInteractionDemo` by double clicking it in the Project window
-1. Configure the project for XR
+1. For the VR project, open the Scene at `Assets\Scenes\WorldInteractionDemo` by double clicking it in the Project window. For the AR project, open the Scene at `Assets\Scenes\ARInteraction`.
+1. Configure the VR project for XR devices
    1. From Unity’s main menu, go to **Edit &gt; Project Settings &gt; XR Plug-in Management**, and select the platform(s) you plan to deploy to
-1. To run the sample on a headset, go to **File &gt; Build Settings** and build the app. If you have a PC VR headset, you can also preview the app by connecting your device and clicking **Play (►)**
+1. To run the VR sample on a headset, go to **File &gt; Build Settings** and build the app. If you have a PC VR headset, you can also preview the app by connecting your device and clicking **Play (►)**

 If using VR, make sure the Game view has focus (required for XR input currently) by clicking it with your mouse. A **Lock Input to Game View** option is available in the [Input Debugger](https://docs.unity3d.com/Packages/com.unity.inputsystem@1.0/manual/Debugging.html#input-debugger) window (**Window &gt; Analysis &gt; Input Debugger**). Enabling this option forces input to continue processing even when the Game view does not have focus.

@@ -84,10 +84,35 @@ The `LocomotionConfigurationMenu` script is used to present locomotion control s

 The Default Input Actions sample included with the XR Interaction Toolkit package is installed in this example project, which contains an Input Actions Asset with different locomotion control schemes. When used with the Locomotion Scheme Manager as configured in the Scene, this allows the player to swap between different input styles for locomotion, such as changing between snap-turning left and right, and smooth turning.

+#### Android/Oculus
+
+A modified Android manifest file is used to enable the Oculus system keyboard when an input field receives focus, an example of which is in the `WorldInteractionDemo` Scene. This was done by editing the generating `AndroidManifest.xml` file created by first opening **Edit > Project Settings > Player**, clicking the Android settings tab, and then under the Build header clicking to enable **Custom Main Manifest**. The following line was added to the `manifest` element:
+```xml
+<uses-feature android:name="oculus.software.overlay_keyboard" android:required="false"/>
+```
+
 ### AR

 This example project contains a Scene located in `Assets\Scenes`. The AR example project currently supports only mobile AR platforms. See the [ARKit documentation](https://docs.unity3d.com/Packages/com.unity.xr.arkit@2.1/manual/index.html) or the [ARCore documentation](https://docs.unity3d.com/Packages/com.unity.xr.arcore@2.1/manual/index.html) for more details on how to set up the project to deploy to either platform.

 |**Scene**|**Description**|
 |---|---|
-|`Scenes\ARInteraction`|<p>This scene shows how to set up a Gesture Interactor and a Placement Interactable for a mobile AR experience.</p><p>Place a cube onto a detected plane, and use gestures to move, scale and rotate the placed object. This demonstrates the functionality of `ARTranslationInteractable`, `ARRotationInteractable`, and `ARScaleInteractable` respectively. The scene also demonstrates how to use `ARScaleInteractable` to create selection visual effects such as the cube being highlighted when selected.</p>|
+|`Scenes\ARInteraction`|<p>This scene shows how to set up a Gesture Interactor and a Placement Interactable for a mobile AR experience.</p><p>Place a cube onto a detected plane, and use gestures to move, rotate, and scale the placed object. This demonstrates the functionality of `ARTranslationInteractable`, `ARRotationInteractable`, and `ARScaleInteractable` respectively. The scene also demonstrates how to use `ARSelectionInteractable` to create selection visual effects such as the cube being highlighted when selected.</p>|
+|`Scenes\ARInteraction_MultipleObjects`|<p>This scene is similiar to `ARInteraction` but it includes a sample script called `SwitchPlacementPrefab` which demonstrates how to place multiple different types of `GameObjects`.</p><p>Known Limitations: Taps on the dropdown UI when over a tracked plane will also place an object.</p>|
+
+### Android
+
+If you are deploying to Android, you must change a few build settings in order to build the app.
+
+#### Unity 2019.4
+
+1. Open a web browser and go to https://gradle.org/releases/
+2. Download **Gradle v5.6.4** (binary-only is fine) and unzip it into a location of your choosing.
+3. Go to **Edit > Preferences > External Tools**, then under the Android header uncheck **Gradle Installed with Unity**, then set the Gradle location to the location where you unzipped the download.
+
+Build files have already been modified in the AR example project to support building to Android 11. See [Build for Android 11](https://developers.google.com/ar/develop/unity/android-11-build#unity_20193_and_20194) for steps needed to build using Unity 2019.4 for a new project.
+
+#### Unity 2020.1 or newer
+
+1. Go to **Edit > Project Settings > Player** and click the Android settings tab.
+2. Click to expand **Publishing Settings**, then under the Build header uncheck **Custom Main Gradle Template** and **Custom Launcher Gradle Template**. Those modified build files are only necessary when using Unity 2019.4.
--- a/VR/Assets/Plugins.meta
+++ b/VR/Assets/Plugins.meta
+fileFormatVersion: 2
+guid: 7d12c3cf37ff6a94db5f5c84bd12dcc4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/VR/Assets/Plugins/Android.meta
+++ b/VR/Assets/Plugins/Android.meta
+fileFormatVersion: 2
+guid: a2dd7bb453dae5340b7c03d8bff3d4ce
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/VR/Assets/Plugins/Android/AndroidManifest.xml
+++ b/VR/Assets/Plugins/Android/AndroidManifest.xml
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.unity3d.player"
+    xmlns:tools="http://schemas.android.com/tools">
+    <application>
+        <activity android:name="com.unity3d.player.UnityPlayerActivity"
+                  android:theme="@style/UnityThemeSelector">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
+        </activity>
+    </application>
+    <uses-feature android:name="oculus.software.overlay_keyboard" android:required="false"/>
+</manifest>
--- a/VR/Assets/Plugins/Android/AndroidManifest.xml.meta
+++ b/VR/Assets/Plugins/Android/AndroidManifest.xml.meta
+fileFormatVersion: 2
+guid: 791d784025176ac4ba3e0be9576c0f0f
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/VR/Assets/Prefabs/DeprecatedXRRigDemo.prefab
+++ b/VR/Assets/Prefabs/DeprecatedXRRigDemo.prefab
@@ -51,7 +51,7 @@ MonoBehaviour:
  m_EnableInputActions: 1
  m_ModelPrefab: {fileID: 1306640934352848695, guid: 902b196ba17fa284bae10bdc5878a72d,
    type: 3}
-  m_ModelTransform: {fileID: 0}
+  m_ModelTransform: {fileID: 1717954561063364409}
  m_AnimateModel: 0
  m_ModelSelectTransition: 
  m_ModelDeSelectTransition: 
@@ -264,7 +264,7 @@ MonoBehaviour:
  m_EnableInputActions: 1
  m_ModelPrefab: {fileID: 1306640934352848695, guid: 902b196ba17fa284bae10bdc5878a72d,
    type: 3}
-  m_ModelTransform: {fileID: 0}
+  m_ModelTransform: {fileID: 1717954560623744797}
  m_AnimateModel: 0
  m_ModelSelectTransition: 
  m_ModelDeSelectTransition: 
@@ -353,10 +353,12 @@ MonoBehaviour:
  m_HapticHoverCancelIntensity: 0
  m_HapticHoverCancelDuration: 0
  m_LineType: 0
+  m_BlendVisualLinePoints: 1
  m_MaxRaycastDistance: 10
  m_ReferenceFrame: {fileID: 0}
  m_Velocity: 12
  m_Acceleration: 9.8
+  m_AdditionalGroundHeight: 0.1
  m_AdditionalFlightTime: 0.5
  m_EndPointDistance: 30
  m_EndPointHeight: -10
@@ -369,6 +371,7 @@ MonoBehaviour:
    serializedVersion: 2
    m_Bits: 2147483681
  m_RaycastTriggerInteraction: 1
+  m_HitClosestOnly: 0
  m_KeepSelectedTargetValid: 1
  m_HoverToSelect: 0
  m_HoverTimeToSelect: 0.5
@@ -377,6 +380,7 @@ MonoBehaviour:
  m_UseForceGrab: 0
  m_RotateSpeed: 180
  m_TranslateSpeed: 1
+  m_AnchorRotateReferenceFrame: {fileID: 0}
 --- !u!120 &1717954560873690065
 LineRenderer:
  m_ObjectHideFlags: 0
@@ -640,7 +644,7 @@ MonoBehaviour:
  m_EnableInputActions: 1
  m_ModelPrefab: {fileID: 1306640934352848695, guid: 902b196ba17fa284bae10bdc5878a72d,
    type: 3}
-  m_ModelTransform: {fileID: 0}
+  m_ModelTransform: {fileID: 1717954561962503726}
  m_AnimateModel: 0
  m_ModelSelectTransition: 
  m_ModelDeSelectTransition: 
@@ -729,10 +733,12 @@ MonoBehaviour:
  m_HapticHoverCancelIntensity: 0
  m_HapticHoverCancelDuration: 0
  m_LineType: 1
+  m_BlendVisualLinePoints: 1
  m_MaxRaycastDistance: 30
  m_ReferenceFrame: {fileID: 0}
  m_Velocity: 10
  m_Acceleration: 9.8
+  m_AdditionalGroundHeight: 0.1
  m_AdditionalFlightTime: 0.5
  m_EndPointDistance: 30
  m_EndPointHeight: -10
@@ -745,6 +751,7 @@ MonoBehaviour:
    serializedVersion: 2
    m_Bits: 2147483681
  m_RaycastTriggerInteraction: 1
+  m_HitClosestOnly: 0
  m_KeepSelectedTargetValid: 0
  m_HoverToSelect: 0
  m_HoverTimeToSelect: 0.5
@@ -753,6 +760,7 @@ MonoBehaviour:
  m_UseForceGrab: 0
  m_RotateSpeed: 2
  m_TranslateSpeed: 0.1
+  m_AnchorRotateReferenceFrame: {fileID: 0}
 --- !u!120 &1717954560958943214
 LineRenderer:
  m_ObjectHideFlags: 0
@@ -1043,7 +1051,7 @@ MonoBehaviour:
  m_EnableInputActions: 1
  m_ModelPrefab: {fileID: 1306640934352848695, guid: 902b196ba17fa284bae10bdc5878a72d,
    type: 3}
-  m_ModelTransform: {fileID: 0}
+  m_ModelTransform: {fileID: 1717954560542311230}
  m_AnimateModel: 0
  m_ModelSelectTransition: 
  m_ModelDeSelectTransition: 
@@ -1132,10 +1140,12 @@ MonoBehaviour:
  m_HapticHoverCancelIntensity: 0
  m_HapticHoverCancelDuration: 0
  m_LineType: 1
+  m_BlendVisualLinePoints: 1
  m_MaxRaycastDistance: 10
  m_ReferenceFrame: {fileID: 0}
  m_Velocity: 10
  m_Acceleration: 9.8
+  m_AdditionalGroundHeight: 0.1
  m_AdditionalFlightTime: 0.5
  m_EndPointDistance: 30
  m_EndPointHeight: -10
@@ -1148,6 +1158,7 @@ MonoBehaviour:
    serializedVersion: 2
    m_Bits: 2147483681
  m_RaycastTriggerInteraction: 1
+  m_HitClosestOnly: 0
  m_KeepSelectedTargetValid: 0
  m_HoverToSelect: 0
  m_HoverTimeToSelect: 0.5
@@ -1156,6 +1167,7 @@ MonoBehaviour:
  m_UseForceGrab: 0
  m_RotateSpeed: 2
  m_TranslateSpeed: 0.1
+  m_AnchorRotateReferenceFrame: {fileID: 0}
 --- !u!120 &1717954561233508942
 LineRenderer:
  m_ObjectHideFlags: 0

--- a/VR/Assets/Prefabs/XRRigDemo.prefab
+++ b/VR/Assets/Prefabs/XRRigDemo.prefab
@@ -82,7 +82,7 @@ MonoBehaviour:
  m_EnableInputActions: 1
  m_ModelPrefab: {fileID: 1306640934352848695, guid: 902b196ba17fa284bae10bdc5878a72d,
    type: 3}
-  m_ModelTransform: {fileID: 0}
+  m_ModelTransform: {fileID: 316239220}
  m_AnimateModel: 0
  m_ModelSelectTransition: 
  m_ModelDeSelectTransition: 
@@ -258,10 +258,12 @@ MonoBehaviour:
  m_HapticHoverCancelIntensity: 0
  m_HapticHoverCancelDuration: 0
  m_LineType: 0
+  m_BlendVisualLinePoints: 1
  m_MaxRaycastDistance: 10
  m_ReferenceFrame: {fileID: 0}
  m_Velocity: 12
  m_Acceleration: 9.8
+  m_AdditionalGroundHeight: 0.1
  m_AdditionalFlightTime: 0.5
  m_EndPointDistance: 30
  m_EndPointHeight: -10
@@ -274,6 +276,7 @@ MonoBehaviour:
    serializedVersion: 2
    m_Bits: 2147483681
  m_RaycastTriggerInteraction: 1
+  m_HitClosestOnly: 0
  m_KeepSelectedTargetValid: 1
  m_HoverToSelect: 0
  m_HoverTimeToSelect: 0.5
@@ -282,6 +285,7 @@ MonoBehaviour:
  m_UseForceGrab: 0
  m_RotateSpeed: 180
  m_TranslateSpeed: 1
+  m_AnchorRotateReferenceFrame: {fileID: 0}
 --- !u!120 &202364690
 LineRenderer:
  m_ObjectHideFlags: 0
@@ -575,7 +579,7 @@ MonoBehaviour:
  m_EnableInputActions: 0
  m_ModelPrefab: {fileID: 1306640934352848695, guid: 902b196ba17fa284bae10bdc5878a72d,
    type: 3}
-  m_ModelTransform: {fileID: 0}
+  m_ModelTransform: {fileID: 153326091}
  m_AnimateModel: 0
  m_ModelSelectTransition: 
  m_ModelDeSelectTransition: 
@@ -751,10 +755,12 @@ MonoBehaviour:
  m_HapticHoverCancelIntensity: 0
  m_HapticHoverCancelDuration: 0
  m_LineType: 1
+  m_BlendVisualLinePoints: 1
  m_MaxRaycastDistance: 10
  m_ReferenceFrame: {fileID: 0}
  m_Velocity: 10
  m_Acceleration: 9.8
+  m_AdditionalGroundHeight: 0.1
  m_AdditionalFlightTime: 0.5
  m_EndPointDistance: 30
  m_EndPointHeight: -10
@@ -767,6 +773,7 @@ MonoBehaviour:
    serializedVersion: 2
    m_Bits: 2147483681
  m_RaycastTriggerInteraction: 1
+  m_HitClosestOnly: 0
  m_KeepSelectedTargetValid: 0
  m_HoverToSelect: 0
  m_HoverTimeToSelect: 0.5
@@ -775,6 +782,7 @@ MonoBehaviour:
  m_UseForceGrab: 0
  m_RotateSpeed: 2
  m_TranslateSpeed: 0.1
+  m_AnchorRotateReferenceFrame: {fileID: 0}
 --- !u!120 &341080495
 LineRenderer:
  m_ObjectHideFlags: 0
@@ -1224,7 +1232,7 @@ MonoBehaviour:
  m_EnableInputActions: 0
  m_ModelPrefab: {fileID: 1306640934352848695, guid: 902b196ba17fa284bae10bdc5878a72d,
    type: 3}
-  m_ModelTransform: {fileID: 0}
+  m_ModelTransform: {fileID: 1499812065}
  m_AnimateModel: 0
  m_ModelSelectTransition: 
  m_ModelDeSelectTransition: 
@@ -1400,10 +1408,12 @@ MonoBehaviour:
  m_HapticHoverCancelIntensity: 0
  m_HapticHoverCancelDuration: 0
  m_LineType: 1
+  m_BlendVisualLinePoints: 1
  m_MaxRaycastDistance: 30
  m_ReferenceFrame: {fileID: 0}
  m_Velocity: 10
  m_Acceleration: 9.8
+  m_AdditionalGroundHeight: 0.1
  m_AdditionalFlightTime: 0.5
  m_EndPointDistance: 30
  m_EndPointHeight: -10
@@ -1416,6 +1426,7 @@ MonoBehaviour:
    serializedVersion: 2
    m_Bits: 2147483681
  m_RaycastTriggerInteraction: 1
+  m_HitClosestOnly: 0
  m_KeepSelectedTargetValid: 0
  m_HoverToSelect: 0
  m_HoverTimeToSelect: 0.5
@@ -1424,6 +1435,7 @@ MonoBehaviour:
  m_UseForceGrab: 0
  m_RotateSpeed: 2
  m_TranslateSpeed: 0.1
+  m_AnchorRotateReferenceFrame: {fileID: 0}
 --- !u!120 &1319746311
 LineRenderer:
  m_ObjectHideFlags: 0
@@ -1713,7 +1725,7 @@ MonoBehaviour:
  m_EnableInputActions: 1
  m_ModelPrefab: {fileID: 1306640934352848695, guid: 902b196ba17fa284bae10bdc5878a72d,
    type: 3}
-  m_ModelTransform: {fileID: 0}
+  m_ModelTransform: {fileID: 1980187690}
  m_AnimateModel: 0
  m_ModelSelectTransition: 
  m_ModelDeSelectTransition: 

--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2.meta
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2.meta
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions.meta
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions.meta
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/.sample.json
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/.sample.json
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Continuous Move.preset
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Continuous Move.preset
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Continuous Move.preset.meta
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Continuous Move.preset.meta
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Continuous Turn.preset
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Continuous Turn.preset
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Continuous Turn.preset.meta
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Continuous Turn.preset.meta
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Input Actions.inputactions
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Input Actions.inputactions
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Input Actions.inputactions.meta
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Input Actions.inputactions.meta
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Left Controller.preset
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Left Controller.preset
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Left Controller.preset.meta
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Left Controller.preset.meta
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Right Controller.preset
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Right Controller.preset
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Right Controller.preset.meta
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Right Controller.preset.meta
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Snap Turn.preset
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Snap Turn.preset
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Snap Turn.preset.meta
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/Default Input Actions/XRI Default Snap Turn.preset.meta
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/XR Device Simulator.meta
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/XR Device Simulator.meta
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/XR Device Simulator/.sample.json
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/XR Device Simulator/.sample.json
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/XR Device Simulator/XR Device Simulator Controls.inputactions
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/XR Device Simulator/XR Device Simulator Controls.inputactions
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/XR Device Simulator/XR Device Simulator Controls.inputactions.meta
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/XR Device Simulator/XR Device Simulator Controls.inputactions.meta
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/XR Device Simulator/XR Device Simulator.prefab
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/XR Device Simulator/XR Device Simulator.prefab
--- a/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/XR Device Simulator/XR Device Simulator.prefab.meta
+++ b/VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.2/XR Device Simulator/XR Device Simulator.prefab.meta
--- a/VR/Packages/manifest.json
+++ b/VR/Packages/manifest.json
@@ -2,20 +2,21 @@
  "dependencies": {
    "com.unity.2d.sprite": "1.0.0",
    "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.ads": "3.5.2",
+    "com.unity.ads": "3.6.1",
    "com.unity.analytics": "3.3.5",
-    "com.unity.ext.nunit": "1.0.5",
+    "com.unity.ext.nunit": "1.0.6",
    "com.unity.ide.rider": "1.1.4",
    "com.unity.ide.vscode": "1.2.3",
-    "com.unity.inputsystem": "1.0.1",
+    "com.unity.inputsystem": "1.0.2",
    "com.unity.render-pipelines.universal": "7.3.1",
-    "com.unity.test-framework": "1.1.20",
-    "com.unity.textmeshpro": "2.1.3",
+    "com.unity.test-framework": "1.1.24",
+    "com.unity.textmeshpro": "2.1.4",
    "com.unity.ugui": "1.0.0",
-    "com.unity.xr.interaction.toolkit": "1.0.0-pre.2",
+    "com.unity.xr.arsubsystems": "2.1.16",
+    "com.unity.xr.interaction.toolkit": "1.0.0-pre.3",
    "com.unity.xr.management": "3.2.17",
-    "com.unity.xr.oculus": "1.6.1",
-    "com.unity.xr.windowsmr": "2.4.1",
+    "com.unity.xr.oculus": "1.8.1",
+    "com.unity.xr.windowsmr": "2.6.1",
    "com.unity.modules.ai": "1.0.0",
    "com.unity.modules.androidjni": "1.0.0",
    "com.unity.modules.animation": "1.0.0",

--- a/VR/Packages/packages-lock.json
+++ b/VR/Packages/packages-lock.json
@@ -13,7 +13,7 @@
      "dependencies": {}
    },
    "com.unity.ads": {
-      "version": "3.5.2",
+      "version": "3.6.1",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -32,7 +32,7 @@
    },
    "com.unity.ext.nunit": {
      "version": "1.0.6",
-      "depth": 1,
+      "depth": 0,
      "source": "registry",
      "dependencies": {},
      "url": "https://packages.unity.com"
@@ -54,7 +54,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.inputsystem": {
-      "version": "1.0.1",
+      "version": "1.0.2",
      "depth": 0,
      "source": "registry",
      "dependencies": {},
@@ -96,7 +96,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.test-framework": {
-      "version": "1.1.20",
+      "version": "1.1.24",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -107,7 +107,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.textmeshpro": {
-      "version": "2.1.3",
+      "version": "2.1.4",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -125,8 +125,8 @@
      }
    },
    "com.unity.xr.arsubsystems": {
-      "version": "2.1.2",
-      "depth": 1,
+      "version": "2.1.16",
+      "depth": 0,
      "source": "registry",
      "dependencies": {
        "com.unity.subsystemregistration": "1.0.6"
@@ -134,11 +134,11 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.xr.interaction.toolkit": {
-      "version": "1.0.0-pre.2",
+      "version": "1.0.0-pre.3",
      "depth": 0,
      "source": "registry",
      "dependencies": {
-        "com.unity.inputsystem": "1.0.1",
+        "com.unity.inputsystem": "1.0.2",
        "com.unity.ugui": "1.0.0",
        "com.unity.xr.legacyinputhelpers": "2.1.7"
      },
@@ -164,33 +164,39 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.xr.management": {
-      "version": "3.2.17",
-      "depth": 0,
+      "version": "4.0.1",
+      "depth": 1,
      "source": "registry",
      "dependencies": {
-        "com.unity.xr.legacyinputhelpers": "2.1.2",
+        "com.unity.modules.subsystems": "1.0.0",
+        "com.unity.modules.vr": "1.0.0",
+        "com.unity.modules.xr": "1.0.0",
+        "com.unity.xr.legacyinputhelpers": "2.1.7",
        "com.unity.subsystemregistration": "1.0.6"
      },
      "url": "https://packages.unity.com"
    },
    "com.unity.xr.oculus": {
-      "version": "1.6.1",
+      "version": "1.8.1",
      "depth": 0,
      "source": "registry",
      "dependencies": {
-        "com.unity.xr.management": "3.2.16",
+        "com.unity.xr.management": "4.0.1",
        "com.unity.ugui": "1.0.0"
      },
      "url": "https://packages.unity.com"
    },
    "com.unity.xr.windowsmr": {
-      "version": "2.4.1",
+      "version": "2.6.1",
      "depth": 0,
      "source": "registry",
      "dependencies": {
-        "com.unity.xr.management": "3.2.15",
+        "com.unity.modules.subsystems": "1.0.0",
+        "com.unity.modules.vr": "1.0.0",
+        "com.unity.modules.xr": "1.0.0",
+        "com.unity.xr.management": "4.0.1",
        "com.unity.xr.interactionsubsystems": "1.0.1",
-        "com.unity.xr.arsubsystems": "2.1.2"
+        "com.unity.xr.arsubsystems": "2.1.3"
      },
      "url": "https://packages.unity.com"
    },

--- a/VR/ProjectSettings/PackageManagerSettings.asset
+++ b/VR/ProjectSettings/PackageManagerSettings.asset
@@ -9,7 +9,7 @@ MonoBehaviour:
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 13960, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
  m_Name: 
  m_EditorClassIdentifier: 
  m_ScopedRegistriesSettingsExpanded: 1

--- a/VR/ProjectSettings/ProjectVersion.txt
+++ b/VR/ProjectSettings/ProjectVersion.txt
-m_EditorVersion: 2019.4.17f1
-m_EditorVersionWithRevision: 2019.4.17f1 (667c8606c536)
+m_EditorVersion: 2019.4.22f1
+m_EditorVersionWithRevision: 2019.4.22f1 (9fdda2fe27ad)