Skip to content

Commit f06c2f3

Browse files
Nihav-JainNihav-Jain
committed
Release v1.1.0.
1 parent 9ace12b commit f06c2f3

Some content is hidden

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

46 files changed

+3812
-8937
lines changed

‎Assets/MagicLeap/Examples/Prefabs/WebViewTab.prefab

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ GameObject:
165165
- component: {fileID: 6225308158734966436}
166166
- component: {fileID: 6225308158734966441}
167167
- component: {fileID: 6254472371151350477}
168+
- component: {fileID: 4702737396664565252}
168169
m_Layer: 5
169170
m_Name: WebViewTab
170171
m_TagString: Untagged
@@ -223,11 +224,11 @@ MonoBehaviour:
223224
m_SelectOnRight: {fileID: 0}
224225
m_Transition: 1
225226
m_Colors:
226-
m_NormalColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
227+
m_NormalColor: {r: 0.627451, g: 0.627451, b: 0.627451, a: 1}
227228
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
228229
m_PressedColor: {r: 1, g: 1, b: 1, a: 1}
229230
m_SelectedColor: {r: 1, g: 1, b: 1, a: 1}
230-
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
231+
m_DisabledColor: {r: 0.627451, g: 0.627451, b: 0.627451, a: 0.5019608}
231232
m_ColorMultiplier: 1
232233
m_FadeDuration: 0.1
233234
m_SpriteState:
@@ -262,6 +263,26 @@ MonoBehaviour:
262263
m_Script: {fileID: 11500000, guid: 13388f86992e140eeb691304f00d764b, type: 3}
263264
m_Name:
264265
m_EditorClassIdentifier:
266+
--- !u!114 &4702737396664565252
267+
MonoBehaviour:
268+
m_ObjectHideFlags: 0
269+
m_CorrespondingSourceObject: {fileID: 0}
270+
m_PrefabInstance: {fileID: 0}
271+
m_PrefabAsset: {fileID: 0}
272+
m_GameObject: {fileID: 6225308158734966443}
273+
m_Enabled: 1
274+
m_EditorHideFlags: 0
275+
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
276+
m_Name:
277+
m_EditorClassIdentifier:
278+
m_IgnoreLayout: 0
279+
m_MinWidth: -1
280+
m_MinHeight: -1
281+
m_PreferredWidth: 100
282+
m_PreferredHeight: -1
283+
m_FlexibleWidth: -1
284+
m_FlexibleHeight: -1
285+
m_LayoutPriority: 1
265286
--- !u!1 &8146894308033682861
266287
GameObject:
267288
m_ObjectHideFlags: 0

‎Assets/MagicLeap/Examples/Scenes/Anchors.unity

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ NavMeshSettings:
104104
serializedVersion: 2
105105
m_ObjectHideFlags: 0
106106
m_BuildSettings:
107-
serializedVersion: 2
107+
serializedVersion: 3
108108
agentTypeID: 0
109109
agentRadius: 0.5
110110
agentHeight: 2
@@ -117,7 +117,7 @@ NavMeshSettings:
117117
cellSize: 0.16666667
118118
manualTileSize: 0
119119
tileSize: 256
120-
accuratePlacement: 0
120+
buildHeightMesh: 0
121121
maxJobWorkers: 0
122122
preserveTilesOutsideBounds: 0
123123
debug:
@@ -195,6 +195,7 @@ PrefabInstance:
195195
m_ObjectHideFlags: 0
196196
serializedVersion: 2
197197
m_Modification:
198+
serializedVersion: 3
198199
m_TransformParent: {fileID: 1731829235}
199200
m_Modifications:
200201
- target: {fileID: 3890507614167242288, guid: c8ccbf4791d65cf42a2e0fae5b3a697f,
@@ -258,6 +259,9 @@ PrefabInstance:
258259
value: UIEventSystem
259260
objectReference: {fileID: 0}
260261
m_RemovedComponents: []
262+
m_RemovedGameObjects: []
263+
m_AddedGameObjects: []
264+
m_AddedComponents: []
261265
m_SourcePrefab: {fileID: 100100000, guid: c8ccbf4791d65cf42a2e0fae5b3a697f, type: 3}
262266
--- !u!4 &275724062 stripped
263267
Transform:
@@ -270,8 +274,14 @@ PrefabInstance:
270274
m_ObjectHideFlags: 0
271275
serializedVersion: 2
272276
m_Modification:
277+
serializedVersion: 3
273278
m_TransformParent: {fileID: 15799660}
274279
m_Modifications:
280+
- target: {fileID: 2062985119602007160, guid: fe799b2d0a84dfe43b001b56276fd2fb,
281+
type: 3}
282+
propertyPath: stereoConvergencePoint
283+
value:
284+
objectReference: {fileID: 587049731}
275285
- target: {fileID: 5589497132288526106, guid: fe799b2d0a84dfe43b001b56276fd2fb,
276286
type: 3}
277287
propertyPath: m_Model
@@ -349,6 +359,13 @@ PrefabInstance:
349359
value: 1
350360
objectReference: {fileID: 0}
351361
m_RemovedComponents: []
362+
m_RemovedGameObjects: []
363+
m_AddedGameObjects: []
364+
m_AddedComponents:
365+
- targetCorrespondingSourceObject: {fileID: 5589497132288526109, guid: fe799b2d0a84dfe43b001b56276fd2fb,
366+
type: 3}
367+
insertIndex: -1
368+
addedObject: {fileID: 562945411}
352369
m_SourcePrefab: {fileID: 100100000, guid: fe799b2d0a84dfe43b001b56276fd2fb, type: 3}
353370
--- !u!20 &562945408 stripped
354371
Camera:
@@ -385,6 +402,7 @@ PrefabInstance:
385402
m_ObjectHideFlags: 0
386403
serializedVersion: 2
387404
m_Modification:
405+
serializedVersion: 3
388406
m_TransformParent: {fileID: 1731829235}
389407
m_Modifications:
390408
- target: {fileID: 478054213944560442, guid: 6906f74934047d24e9a47bbdd1afb57a,
@@ -407,6 +425,26 @@ PrefabInstance:
407425
propertyPath: m_AnchoredPosition.y
408426
value: 0
409427
objectReference: {fileID: 0}
428+
- target: {fileID: 567421404185543197, guid: 6906f74934047d24e9a47bbdd1afb57a,
429+
type: 3}
430+
propertyPath: m_AnchorMax.y
431+
value: 0
432+
objectReference: {fileID: 0}
433+
- target: {fileID: 567421404185543197, guid: 6906f74934047d24e9a47bbdd1afb57a,
434+
type: 3}
435+
propertyPath: m_AnchorMin.y
436+
value: 0
437+
objectReference: {fileID: 0}
438+
- target: {fileID: 567421404185543197, guid: 6906f74934047d24e9a47bbdd1afb57a,
439+
type: 3}
440+
propertyPath: m_AnchoredPosition.x
441+
value: 0
442+
objectReference: {fileID: 0}
443+
- target: {fileID: 567421404185543197, guid: 6906f74934047d24e9a47bbdd1afb57a,
444+
type: 3}
445+
propertyPath: m_AnchoredPosition.y
446+
value: 0
447+
objectReference: {fileID: 0}
410448
- target: {fileID: 1359980009267695964, guid: 6906f74934047d24e9a47bbdd1afb57a,
411449
type: 3}
412450
propertyPath: m_AnchorMax.x
@@ -748,6 +786,9 @@ PrefabInstance:
748786
value: 0
749787
objectReference: {fileID: 0}
750788
m_RemovedComponents: []
789+
m_RemovedGameObjects: []
790+
m_AddedGameObjects: []
791+
m_AddedComponents: []
751792
m_SourcePrefab: {fileID: 100100000, guid: 6906f74934047d24e9a47bbdd1afb57a, type: 3}
752793
--- !u!224 &587049731 stripped
753794
RectTransform:
@@ -760,6 +801,7 @@ PrefabInstance:
760801
m_ObjectHideFlags: 0
761802
serializedVersion: 2
762803
m_Modification:
804+
serializedVersion: 3
763805
m_TransformParent: {fileID: 15799660}
764806
m_Modifications:
765807
- target: {fileID: 4626202463359686884, guid: e1a80671308dfe144b81247f195039ff,
@@ -833,6 +875,9 @@ PrefabInstance:
833875
value: Reticle
834876
objectReference: {fileID: 0}
835877
m_RemovedComponents: []
878+
m_RemovedGameObjects: []
879+
m_AddedGameObjects: []
880+
m_AddedComponents: []
836881
m_SourcePrefab: {fileID: 100100000, guid: e1a80671308dfe144b81247f195039ff, type: 3}
837882
--- !u!4 &785917712 stripped
838883
Transform:
@@ -1056,14 +1101,17 @@ MonoBehaviour:
10561101
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
10571102
m_Name:
10581103
m_EditorClassIdentifier:
1059-
m_Version: 1
1104+
m_Version: 2
10601105
m_UsePipelineSettings: 1
10611106
m_AdditionalLightsShadowResolutionTier: 2
10621107
m_LightLayerMask: 1
1108+
m_RenderingLayers: 1
10631109
m_CustomShadowLayers: 0
10641110
m_ShadowLayerMask: 1
1111+
m_ShadowRenderingLayers: 1
10651112
m_LightCookieSize: {x: 1, y: 1}
10661113
m_LightCookieOffset: {x: 0, y: 0}
1114+
m_SoftShadowQuality: 1
10671115
--- !u!1 &1731829234
10681116
GameObject:
10691117
m_ObjectHideFlags: 0

‎Assets/MagicLeap/Examples/Scenes/Anchors.unity.meta

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

‎Assets/MagicLeap/Examples/Scenes/AudioCapture.unity

Lines changed: 6 additions & 2 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: 0}
41-
m_IndirectSpecularColor: {r: 0.18029505, g: 0.22572652, b: 0.30692935, a: 1}
41+
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -131,6 +131,11 @@ PrefabInstance:
131131
serializedVersion: 3
132132
m_TransformParent: {fileID: 1281534856}
133133
m_Modifications:
134+
- target: {fileID: 2062985119602007160, guid: fe799b2d0a84dfe43b001b56276fd2fb,
135+
type: 3}
136+
propertyPath: stereoConvergencePoint
137+
value:
138+
objectReference: {fileID: 1082752320}
134139
- target: {fileID: 5589497133593145648, guid: fe799b2d0a84dfe43b001b56276fd2fb,
135140
type: 3}
136141
propertyPath: m_RootOrder
@@ -1281,7 +1286,6 @@ MonoBehaviour:
12811286
m_Name:
12821287
m_EditorClassIdentifier:
12831288
_placeFromCamera: {fileID: 1111165185}
1284-
_inputAudioSource: {fileID: 1689414906}
12851289
_playbackAudioSource: {fileID: 1111165186}
12861290
_statusLabel: {fileID: 1082752321}
12871291
_pitch: 1.5

‎Assets/MagicLeap/Examples/Scenes/CVCamera.unity

Lines changed: 29 additions & 2 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: 0}
41-
m_IndirectSpecularColor: {r: 0.18029505, g: 0.22572653, b: 0.30692935, a: 1}
41+
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -217,6 +217,26 @@ PrefabInstance:
217217
propertyPath: m_AnchoredPosition.y
218218
value: 0
219219
objectReference: {fileID: 0}
220+
- target: {fileID: 567421404185543197, guid: 6906f74934047d24e9a47bbdd1afb57a,
221+
type: 3}
222+
propertyPath: m_AnchorMax.y
223+
value: 0
224+
objectReference: {fileID: 0}
225+
- target: {fileID: 567421404185543197, guid: 6906f74934047d24e9a47bbdd1afb57a,
226+
type: 3}
227+
propertyPath: m_AnchorMin.y
228+
value: 0
229+
objectReference: {fileID: 0}
230+
- target: {fileID: 567421404185543197, guid: 6906f74934047d24e9a47bbdd1afb57a,
231+
type: 3}
232+
propertyPath: m_AnchoredPosition.x
233+
value: 0
234+
objectReference: {fileID: 0}
235+
- target: {fileID: 567421404185543197, guid: 6906f74934047d24e9a47bbdd1afb57a,
236+
type: 3}
237+
propertyPath: m_AnchoredPosition.y
238+
value: 0
239+
objectReference: {fileID: 0}
220240
- target: {fileID: 5355557165450182212, guid: 6906f74934047d24e9a47bbdd1afb57a,
221241
type: 3}
222242
propertyPath: m_SizeDelta.y
@@ -1214,6 +1234,11 @@ PrefabInstance:
12141234
serializedVersion: 3
12151235
m_TransformParent: {fileID: 117533642}
12161236
m_Modifications:
1237+
- target: {fileID: 2062985119602007160, guid: fe799b2d0a84dfe43b001b56276fd2fb,
1238+
type: 3}
1239+
propertyPath: stereoConvergencePoint
1240+
value:
1241+
objectReference: {fileID: 1154384880}
12171242
- target: {fileID: 5589497133593145648, guid: fe799b2d0a84dfe43b001b56276fd2fb,
12181243
type: 3}
12191244
propertyPath: m_RootOrder
@@ -1404,12 +1429,14 @@ MonoBehaviour:
14041429
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
14051430
m_Name:
14061431
m_EditorClassIdentifier:
1407-
m_Version: 1
1432+
m_Version: 2
14081433
m_UsePipelineSettings: 1
14091434
m_AdditionalLightsShadowResolutionTier: 2
14101435
m_LightLayerMask: 1
1436+
m_RenderingLayers: 1
14111437
m_CustomShadowLayers: 0
14121438
m_ShadowLayerMask: 1
1439+
m_ShadowRenderingLayers: 1
14131440
m_LightCookieSize: {x: 1, y: 1}
14141441
m_LightCookieOffset: {x: 0, y: 0}
14151442
m_SoftShadowQuality: 1

0 commit comments

Comments
 (0)