Skip to content
This repository was archived by the owner on Nov 16, 2024. It is now read-only.

Commit 4cd7c30

Browse files
fast-slow-stillfast-slow-still
authored
Setup "AR Session" node for compatibility with MRTK. (#233)
1 parent b9c230f commit 4cd7c30

2 files changed

Lines changed: 100 additions & 34 deletions

File tree

‎Assets/WorldLocking.ASA.Examples/Scenes/PinTest.unity‎

Lines changed: 49 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,56 @@ Transform:
151151
m_LocalScale: {x: 1, y: 1, z: 1}
152152
m_Children:
153153
- {fileID: 1607754546}
154+
- {fileID: 135846989}
154155
m_Father: {fileID: 0}
155156
m_RootOrder: 3
156157
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
158+
--- !u!1 &135846988
159+
GameObject:
160+
m_ObjectHideFlags: 0
161+
m_CorrespondingSourceObject: {fileID: 0}
162+
m_PrefabInstance: {fileID: 0}
163+
m_PrefabAsset: {fileID: 0}
164+
serializedVersion: 6
165+
m_Component:
166+
- component: {fileID: 135846989}
167+
- component: {fileID: 135846990}
168+
m_Layer: 0
169+
m_Name: AR Session
170+
m_TagString: Untagged
171+
m_Icon: {fileID: 0}
172+
m_NavMeshLayer: 0
173+
m_StaticEditorFlags: 0
174+
m_IsActive: 1
175+
--- !u!4 &135846989
176+
Transform:
177+
m_ObjectHideFlags: 0
178+
m_CorrespondingSourceObject: {fileID: 0}
179+
m_PrefabInstance: {fileID: 0}
180+
m_PrefabAsset: {fileID: 0}
181+
m_GameObject: {fileID: 135846988}
182+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
183+
m_LocalPosition: {x: 0, y: 0, z: 0}
184+
m_LocalScale: {x: 1, y: 1, z: 1}
185+
m_Children: []
186+
m_Father: {fileID: 118694855}
187+
m_RootOrder: 1
188+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
189+
--- !u!114 &135846990
190+
MonoBehaviour:
191+
m_ObjectHideFlags: 0
192+
m_CorrespondingSourceObject: {fileID: 0}
193+
m_PrefabInstance: {fileID: 0}
194+
m_PrefabAsset: {fileID: 0}
195+
m_GameObject: {fileID: 135846988}
196+
m_Enabled: 1
197+
m_EditorHideFlags: 0
198+
m_Script: {fileID: 11500000, guid: 3859a92a05d4f5d418cb6ca605290e74, type: 3}
199+
m_Name:
200+
m_EditorClassIdentifier:
201+
m_AttemptUpdate: 1
202+
m_MatchFrameRate: 1
203+
m_TrackingMode: 2
157204
--- !u!1 &270376704
158205
GameObject:
159206
m_ObjectHideFlags: 0
@@ -691,6 +738,7 @@ MonoBehaviour:
691738
AutoSave: 0
692739
linkageSettings:
693740
useExisting: 0
741+
applyAdjustment: 1
694742
AdjustmentFrame: {fileID: 118694855}
695743
CameraParent: {fileID: 1607754546}
696744
anchorSettings:
@@ -701,6 +749,7 @@ MonoBehaviour:
701749
MinNewAnchorDistance: 1
702750
MaxAnchorEdgeLength: 1.2
703751
MaxLocalAnchors: 0
752+
NullSubsystemInEditor: 1
704753
diagnosticsSettings:
705754
settings:
706755
useDefaults: 1
@@ -2249,7 +2298,6 @@ GameObject:
22492298
serializedVersion: 6
22502299
m_Component:
22512300
- component: {fileID: 1607754546}
2252-
- component: {fileID: 1607754549}
22532301
- component: {fileID: 1607754548}
22542302
- component: {fileID: 1607754547}
22552303
m_Layer: 0
@@ -2300,21 +2348,6 @@ MonoBehaviour:
23002348
m_Name:
23012349
m_EditorClassIdentifier:
23022350
m_Camera: {fileID: 0}
2303-
--- !u!114 &1607754549
2304-
MonoBehaviour:
2305-
m_ObjectHideFlags: 0
2306-
m_CorrespondingSourceObject: {fileID: 0}
2307-
m_PrefabInstance: {fileID: 0}
2308-
m_PrefabAsset: {fileID: 0}
2309-
m_GameObject: {fileID: 1607754545}
2310-
m_Enabled: 1
2311-
m_EditorHideFlags: 0
2312-
m_Script: {fileID: 11500000, guid: 3859a92a05d4f5d418cb6ca605290e74, type: 3}
2313-
m_Name:
2314-
m_EditorClassIdentifier:
2315-
m_AttemptUpdate: 1
2316-
m_MatchFrameRate: 1
2317-
m_TrackingMode: 2
23182351
--- !u!1 &2147212412
23192352
GameObject:
23202353
m_ObjectHideFlags: 0

‎Assets/WorldLocking.ASA.Examples/Scenes/PinTestSofa.unity‎

Lines changed: 51 additions & 18 deletions
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: 705507994}
41-
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, 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:
@@ -246,9 +246,56 @@ Transform:
246246
m_LocalScale: {x: 1, y: 1, z: 1}
247247
m_Children:
248248
- {fileID: 1607754546}
249+
- {fileID: 223020110}
249250
m_Father: {fileID: 0}
250251
m_RootOrder: 3
251252
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
253+
--- !u!1 &223020109
254+
GameObject:
255+
m_ObjectHideFlags: 0
256+
m_CorrespondingSourceObject: {fileID: 0}
257+
m_PrefabInstance: {fileID: 0}
258+
m_PrefabAsset: {fileID: 0}
259+
serializedVersion: 6
260+
m_Component:
261+
- component: {fileID: 223020110}
262+
- component: {fileID: 223020111}
263+
m_Layer: 0
264+
m_Name: AR Session
265+
m_TagString: Untagged
266+
m_Icon: {fileID: 0}
267+
m_NavMeshLayer: 0
268+
m_StaticEditorFlags: 0
269+
m_IsActive: 1
270+
--- !u!4 &223020110
271+
Transform:
272+
m_ObjectHideFlags: 0
273+
m_CorrespondingSourceObject: {fileID: 0}
274+
m_PrefabInstance: {fileID: 0}
275+
m_PrefabAsset: {fileID: 0}
276+
m_GameObject: {fileID: 223020109}
277+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
278+
m_LocalPosition: {x: 0, y: 0, z: 0}
279+
m_LocalScale: {x: 1, y: 1, z: 1}
280+
m_Children: []
281+
m_Father: {fileID: 118694855}
282+
m_RootOrder: 1
283+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
284+
--- !u!114 &223020111
285+
MonoBehaviour:
286+
m_ObjectHideFlags: 0
287+
m_CorrespondingSourceObject: {fileID: 0}
288+
m_PrefabInstance: {fileID: 0}
289+
m_PrefabAsset: {fileID: 0}
290+
m_GameObject: {fileID: 223020109}
291+
m_Enabled: 1
292+
m_EditorHideFlags: 0
293+
m_Script: {fileID: 11500000, guid: 3859a92a05d4f5d418cb6ca605290e74, type: 3}
294+
m_Name:
295+
m_EditorClassIdentifier:
296+
m_AttemptUpdate: 1
297+
m_MatchFrameRate: 1
298+
m_TrackingMode: 2
252299
--- !u!1 &245479088
253300
GameObject:
254301
m_ObjectHideFlags: 0
@@ -1071,16 +1118,18 @@ MonoBehaviour:
10711118
AutoSave: 0
10721119
linkageSettings:
10731120
useExisting: 0
1121+
applyAdjustment: 1
10741122
AdjustmentFrame: {fileID: 118694855}
10751123
CameraParent: {fileID: 1607754546}
10761124
anchorSettings:
10771125
useDefaults: 0
10781126
anchorSubsystem: 3
1079-
ARSessionSource: {fileID: 1607754545}
1127+
ARSessionSource: {fileID: 223020109}
10801128
ARSessionOriginSource: {fileID: 1607754545}
10811129
MinNewAnchorDistance: 1
10821130
MaxAnchorEdgeLength: 1.2
10831131
MaxLocalAnchors: 0
1132+
NullSubsystemInEditor: 1
10841133
diagnosticsSettings:
10851134
settings:
10861135
useDefaults: 1
@@ -3200,7 +3249,6 @@ GameObject:
32003249
serializedVersion: 6
32013250
m_Component:
32023251
- component: {fileID: 1607754546}
3203-
- component: {fileID: 1607754549}
32043252
- component: {fileID: 1607754548}
32053253
- component: {fileID: 1607754547}
32063254
m_Layer: 0
@@ -3251,21 +3299,6 @@ MonoBehaviour:
32513299
m_Name:
32523300
m_EditorClassIdentifier:
32533301
m_Camera: {fileID: 0}
3254-
--- !u!114 &1607754549
3255-
MonoBehaviour:
3256-
m_ObjectHideFlags: 0
3257-
m_CorrespondingSourceObject: {fileID: 0}
3258-
m_PrefabInstance: {fileID: 0}
3259-
m_PrefabAsset: {fileID: 0}
3260-
m_GameObject: {fileID: 1607754545}
3261-
m_Enabled: 1
3262-
m_EditorHideFlags: 0
3263-
m_Script: {fileID: 11500000, guid: 3859a92a05d4f5d418cb6ca605290e74, type: 3}
3264-
m_Name:
3265-
m_EditorClassIdentifier:
3266-
m_AttemptUpdate: 1
3267-
m_MatchFrameRate: 1
3268-
m_TrackingMode: 2
32693302
--- !u!1 &1785474983
32703303
GameObject:
32713304
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)