Skip to content

Update examples for 2.0.2 #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chris-massie merged 1 commit into from
May 10, 2022
Merged

Update examples for 2.0.2 #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AR/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "2.0.1",
"com.unity.xr.interaction.toolkit": "2.0.2",
"com.unity.xr.management": "3.2.17",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion AR/Packages/packages-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
"url": "https://packages.unity.com"
},
"com.unity.xr.interaction.toolkit": {
"version": "2.0.1",
"version": "2.0.2",
"depth": 0,
"source": "registry",
"dependencies": {
Expand Down
0 ...Samples/XR Interaction Toolkit/2.0.1.meta → ...Samples/XR Interaction Toolkit/2.0.2.meta
View file
Open in desktop
File renamed without changes.
0 ...raction Toolkit/2.0.1/Starter Assets.meta → ...raction Toolkit/2.0.2/Starter Assets.meta
View file
Open in desktop
File renamed without changes.
0 ...Toolkit/2.0.1/Starter Assets/.sample.json → ...Toolkit/2.0.2/Starter Assets/.sample.json
View file
Open in desktop
File renamed without changes.
0 ...Assets/XRI Default Continuous Move.preset → ...Assets/XRI Default Continuous Move.preset
View file
Open in desktop
File renamed without changes.
0 ...s/XRI Default Continuous Move.preset.meta → ...s/XRI Default Continuous Move.preset.meta
View file
Open in desktop
File renamed without changes.
0 ...Assets/XRI Default Continuous Turn.preset → ...Assets/XRI Default Continuous Turn.preset
View file
Open in desktop
File renamed without changes.
0 ...s/XRI Default Continuous Turn.preset.meta → ...s/XRI Default Continuous Turn.preset.meta
View file
Open in desktop
File renamed without changes.
0 ...ts/XRI Default Input Actions.inputactions → ...ts/XRI Default Input Actions.inputactions
View file
Open in desktop
File renamed without changes.
0 ...I Default Input Actions.inputactions.meta → ...I Default Input Actions.inputactions.meta
View file
Open in desktop
File renamed without changes.
0 ...Assets/XRI Default Left Controller.preset → ...Assets/XRI Default Left Controller.preset
View file
Open in desktop
File renamed without changes.
0 ...s/XRI Default Left Controller.preset.meta → ...s/XRI Default Left Controller.preset.meta
View file
Open in desktop
File renamed without changes.
0 ...ssets/XRI Default Right Controller.preset → ...ssets/XRI Default Right Controller.preset
View file
Open in desktop
File renamed without changes.
0 .../XRI Default Right Controller.preset.meta → .../XRI Default Right Controller.preset.meta
View file
Open in desktop
File renamed without changes.
0 ...arter Assets/XRI Default Snap Turn.preset → ...arter Assets/XRI Default Snap Turn.preset
View file
Open in desktop
File renamed without changes.
0 ... Assets/XRI Default Snap Turn.preset.meta → ... Assets/XRI Default Snap Turn.preset.meta
View file
Open in desktop
File renamed without changes.
0 ...on Toolkit/2.0.1/XR Device Simulator.meta → ...on Toolkit/2.0.2/XR Device Simulator.meta
View file
Open in desktop
File renamed without changes.
0 ...it/2.0.1/XR Device Simulator/.sample.json → ...it/2.0.2/XR Device Simulator/.sample.json
View file
Open in desktop
File renamed without changes.
0 ...XR Device Simulator Controls.inputactions → ...XR Device Simulator Controls.inputactions
View file
Open in desktop
File renamed without changes.
0 ...vice Simulator Controls.inputactions.meta → ...vice Simulator Controls.inputactions.meta
View file
Open in desktop
File renamed without changes.
0 ...vice Simulator/XR Device Simulator.prefab → ...vice Simulator/XR Device Simulator.prefab
View file
Open in desktop
File renamed without changes.
0 ...Simulator/XR Device Simulator.prefab.meta → ...Simulator/XR Device Simulator.prefab.meta
View file
Open in desktop
File renamed without changes.
192 changes: 0 additions & 192 deletions VR/Assets/VR Examples/Prefabs/Environment.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,201 +28,9 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8719280543047980471}
- {fileID: 8727182960492647333}
- {fileID: 8727182960492647331}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8727182960492941187
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8727182960492647331}
- component: {fileID: 8727182960496071559}
- component: {fileID: 8727182960494940487}
- component: {fileID: 8727182960499237155}
m_Layer: 0
m_Name: GroundExtents
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967294
m_IsActive: 1
--- !u!4 &8727182960492647331
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8727182960492941187}
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: 8727182960119839637}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8727182960496071559
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8727182960492941187}
m_Mesh: {fileID: 4300000, guid: f57127cfcc32ab9419af130b6a9211fb, type: 3}
--- !u!23 &8727182960494940487
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8727182960492941187}
m_Enabled: 1
m_CastShadows: 0
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: bccdb449802ea144b8709da9bac60356, type: 2}
- {fileID: 2100000, guid: 297e3a11e7d07fc48b4f71056b4f927f, type: 2}
- {fileID: 2100000, guid: 01c04496878436140922b19f5220712b, 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: 0
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!64 &8727182960499237155
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8727182960492941187}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 4300000, guid: f57127cfcc32ab9419af130b6a9211fb, type: 3}
--- !u!1 &8727182960492941189
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8727182960492647333}
- component: {fileID: 8727182960496071557}
- component: {fileID: 8727182960494940485}
- component: {fileID: 8727182960499237159}
m_Layer: 0
m_Name: GroundLines
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967294
m_IsActive: 1
--- !u!4 &8727182960492647333
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8727182960492941189}
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: 8727182960119839637}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8727182960496071557
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8727182960492941189}
m_Mesh: {fileID: 4300002, guid: f57127cfcc32ab9419af130b6a9211fb, type: 3}
--- !u!23 &8727182960494940485
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8727182960492941189}
m_Enabled: 1
m_CastShadows: 0
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: 616853845a4a54949ac851f2f807aa2a, 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: 0
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!64 &8727182960499237159
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8727182960492941189}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 4300002, guid: f57127cfcc32ab9419af130b6a9211fb, type: 3}
--- !u!1001 &4419609211197239181
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
2 changes: 1 addition & 1 deletion VR/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "2.0.1",
"com.unity.xr.interaction.toolkit": "2.0.2",
"com.unity.xr.management": "3.2.17",
"com.unity.xr.oculus": "1.8.1",
"com.unity.xr.windowsmr": "2.6.1",
Expand Down
2 changes: 1 addition & 1 deletion VR/Packages/packages-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
"url": "https://packages.unity.com"
},
"com.unity.xr.interaction.toolkit": {
"version": "2.0.1",
"version": "2.0.2",
"depth": 0,
"source": "registry",
"dependencies": {
Expand Down