Skip to content

Commit 835eb45

Browse files
chris-massiechris-massie
committed
Update examples for 2.0.0
Mirror of b2819a1a005101d80d26e1aa5a9b788cbaf9e3c4
1 parent fe220a7 commit 835eb45

File tree

70 files changed

+1743
-189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1743
-189
lines changed

‎AR/Assets/Prefabs/ManipulatorObject.prefab‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ MonoBehaviour:
5151
m_InteractionLayerMask:
5252
serializedVersion: 2
5353
m_Bits: 4294967295
54+
m_InteractionLayers:
55+
m_Bits: 4294967295
5456
m_CustomReticle: {fileID: 0}
5557
m_FirstHoverEntered:
5658
m_PersistentCalls:
@@ -122,6 +124,8 @@ MonoBehaviour:
122124
m_InteractionLayerMask:
123125
serializedVersion: 2
124126
m_Bits: 4294967295
127+
m_InteractionLayers:
128+
m_Bits: 4294967295
125129
m_CustomReticle: {fileID: 0}
126130
m_FirstHoverEntered:
127131
m_PersistentCalls:
@@ -197,6 +201,8 @@ MonoBehaviour:
197201
m_InteractionLayerMask:
198202
serializedVersion: 2
199203
m_Bits: 4294967295
204+
m_InteractionLayers:
205+
m_Bits: 4294967295
200206
m_CustomReticle: {fileID: 0}
201207
m_FirstHoverEntered:
202208
m_PersistentCalls:
@@ -272,6 +278,8 @@ MonoBehaviour:
272278
m_InteractionLayerMask:
273279
serializedVersion: 2
274280
m_Bits: 4294967295
281+
m_InteractionLayers:
282+
m_Bits: 4294967295
275283
m_CustomReticle: {fileID: 0}
276284
m_FirstHoverEntered:
277285
m_PersistentCalls:

‎AR/Assets/Scenes/ARInteraction.unity‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1}
41+
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -315,6 +315,8 @@ MonoBehaviour:
315315
m_InteractionLayerMask:
316316
serializedVersion: 2
317317
m_Bits: 4294967295
318+
m_InteractionLayers:
319+
m_Bits: 4294967295
318320
m_AttachTransform: {fileID: 0}
319321
m_StartingSelectedInteractable: {fileID: 0}
320322
m_HoverEntered:
@@ -448,6 +450,8 @@ MonoBehaviour:
448450
m_InteractionLayerMask:
449451
serializedVersion: 2
450452
m_Bits: 4294967295
453+
m_InteractionLayers:
454+
m_Bits: 4294967295
451455
m_CustomReticle: {fileID: 0}
452456
m_FirstHoverEntered:
453457
m_PersistentCalls:

‎AR/Assets/Scenes/ARInteraction_MultipleObjects.unity‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -721,6 +721,8 @@ MonoBehaviour:
721721
m_InteractionLayerMask:
722722
serializedVersion: 2
723723
m_Bits: 4294967295
724+
m_InteractionLayers:
725+
m_Bits: 4294967295
724726
m_AttachTransform: {fileID: 0}
725727
m_StartingSelectedInteractable: {fileID: 0}
726728
m_HoverEntered:
@@ -855,6 +857,8 @@ MonoBehaviour:
855857
m_InteractionLayerMask:
856858
serializedVersion: 2
857859
m_Bits: 4294967295
860+
m_InteractionLayers:
861+
m_Bits: 4294967295
858862
m_CustomReticle: {fileID: 0}
859863
m_FirstHoverEntered:
860864
m_PersistentCalls:

‎AR/Assets/XRI.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AR/Assets/XRI/Settings.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AR/Assets/XRI/Settings/Resources.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AR/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 191492db6e452eb468b95433ec162164, type: 3}
13+
m_Name: InteractionLayerSettings
14+
m_EditorClassIdentifier:
15+
m_LayerNames:
16+
- Default
17+
-
18+
-
19+
-
20+
-
21+
-
22+
-
23+
-
24+
-
25+
-
26+
-
27+
-
28+
-
29+
-
30+
-
31+
-
32+
-
33+
-
34+
-
35+
-
36+
-
37+
-
38+
-
39+
-
40+
-
41+
-
42+
-
43+
-
44+
-
45+
-
46+
-
47+
-

‎AR/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AR/Assets/XRI/Settings/XRInteractionEditorSettings.asset‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 2d38fb1463c5c804b8847c20e8873623, type: 3}
13+
m_Name: XRInteractionEditorSettings
14+
m_EditorClassIdentifier:
15+
m_InteractionLayerUpdaterShown: 1
16+
m_ShowOldInteractionLayerMaskInInspector: 0

‎AR/Assets/XRI/Settings/XRInteractionEditorSettings.asset.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)