Skip to content

Commit 9effa13

Browse files
keveleighkeveleigh
authored
Merge pull request #9347 from keveleigh/reserialize
Reserialize MRTK changes from 2.6 cycle
2 parents e587f25 + 8eed913 commit 9effa13

File tree

62 files changed

+515
-324
lines changed

Some content is hidden

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

62 files changed

+515
-324
lines changed

‎Assets/MRTK/Core/Providers/ObjectMeshObserver/Profiles/DefaultObjectMeshObserverProfile.asset‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@ MonoBehaviour:
2626
visibleMaterial: {fileID: 2100000, guid: 47c3d3b0d8143e3489351498fceed55d, type: 2}
2727
occlusionMaterial: {fileID: 2100000, guid: a809c7ea182b699409443d46d5b42435, type: 2}
2828
physicsMaterial: {fileID: 0}
29+
runtimeSpatialMeshPrefab: {fileID: 0}
2930
spatialMeshObject: {fileID: 100000, guid: 2d029f2a1321676428ce89872882c605, type: 3}

‎Assets/MRTK/Examples/Common/Prefabs/HandMenu_Large_AutoWorldLock_On_HandDrop.prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,7 @@ MonoBehaviour:
13331333
moveLerpTime: 0.5
13341334
rotateLerpTime: 0.1
13351335
scaleLerpTime: 0
1336-
maintainScale: 1
1336+
maintainScaleOnInitialization: 1
13371337
smoothing: 1
13381338
lifetime: 0
13391339
orientationType: 1

‎Assets/MRTK/Examples/Common/Prefabs/HandMenu_Large_WorldLock_On_GrabAndPull.prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1778,7 +1778,7 @@ MonoBehaviour:
17781778
moveLerpTime: 0.5
17791779
rotateLerpTime: 0.1
17801780
scaleLerpTime: 0
1781-
maintainScale: 1
1781+
maintainScaleOnInitialization: 1
17821782
smoothing: 1
17831783
lifetime: 0
17841784
orientationType: 1

‎Assets/MRTK/Examples/Common/Prefabs/HandMenu_Medium_HideOnHandDrop.prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ MonoBehaviour:
358358
moveLerpTime: 0.5
359359
rotateLerpTime: 0.1
360360
scaleLerpTime: 0
361-
maintainScale: 1
361+
maintainScaleOnInitialization: 1
362362
smoothing: 1
363363
lifetime: 0
364364
orientationType: 1

‎Assets/MRTK/Examples/Common/Prefabs/HandMenu_Small_HideOnHandDrop.prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ MonoBehaviour:
409409
moveLerpTime: 0.5
410410
rotateLerpTime: 0.1
411411
scaleLerpTime: 0
412-
maintainScale: 1
412+
maintainScaleOnInitialization: 1
413413
smoothing: 1
414414
lifetime: 0
415415
orientationType: 1

‎Assets/MRTK/Examples/Demos/EyeTracking/General/Prefabs/EyeTrackingDemos ManagerComponents.prefab‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ MonoBehaviour:
127127
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
128128
Culture=neutral, PublicKeyToken=null
129129
persistentKeywords: 0
130+
speechConfirmationTooltipPrefab: {fileID: 0}
130131
--- !u!1 &6460956429535544777
131132
GameObject:
132133
m_ObjectHideFlags: 0
@@ -391,6 +392,7 @@ MonoBehaviour:
391392
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
392393
Culture=neutral, PublicKeyToken=null
393394
persistentKeywords: 0
395+
speechConfirmationTooltipPrefab: {fileID: 0}
394396
--- !u!114 &6483018587969041762
395397
MonoBehaviour:
396398
m_ObjectHideFlags: 0

‎Assets/MRTK/Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-00-RootScene.unity‎

Lines changed: 34 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ MonoBehaviour:
240240
m_Script: {fileID: 11500000, guid: bf98dd1206224111a38765365e98e207, type: 3}
241241
m_Name:
242242
m_EditorClassIdentifier:
243+
lockCursorWhenFocusLocked: 1
243244
setCursorInvisibleWhenFocusLocked: 0
244245
maxGazeCollisionDistance: 10
245246
raycastLayerMasks:
@@ -250,7 +251,6 @@ MonoBehaviour:
250251
gazeTransform: {fileID: 0}
251252
minHeadVelocityThreshold: 0.5
252253
maxHeadVelocityThreshold: 2
253-
useEyeTracking: 1
254254
--- !u!114 &256863739
255255
MonoBehaviour:
256256
m_ObjectHideFlags: 0
@@ -5860,6 +5860,7 @@ MonoBehaviour:
58605860
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
58615861
Culture=neutral, PublicKeyToken=null
58625862
persistentKeywords: 0
5863+
speechConfirmationTooltipPrefab: {fileID: 0}
58635864
--- !u!1 &1422416676
58645865
GameObject:
58655866
m_ObjectHideFlags: 0
@@ -6899,29 +6900,23 @@ MonoBehaviour:
68996900
m_Script: {fileID: 11500000, guid: 1410eac1ae94b4d4492a09cc368e152c, type: 3}
69006901
m_Name:
69016902
m_EditorClassIdentifier:
6902-
Enabled: 1
6903-
States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
6904-
InputAction:
6905-
id: 0
6906-
description:
6907-
axisConstraint: 0
6903+
states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
69086904
InputActionId: 0
6909-
IsGlobal: 0
6905+
isGlobal: 0
69106906
Dimensions: 1
6911-
StartDimensionIndex: 0
6907+
dimensionIndex: 0
6908+
startDimensionIndex: 0
69126909
CanSelect: 1
69136910
CanDeselect: 1
69146911
VoiceCommand:
6915-
RequiresFocus: 1
6916-
Profiles:
6912+
voiceRequiresFocus: 1
6913+
profiles:
69176914
- Target: {fileID: 93553565640916291}
69186915
Themes:
69196916
- {fileID: 11400000, guid: d37afabc007bf774d9431b9a7cbe6fba, type: 2}
6920-
HadDefaultTheme: 1
69216917
- Target: {fileID: 93739075429701857}
69226918
Themes:
69236919
- {fileID: 11400000, guid: cbde7890146c3024d928b7afc2e16065, type: 2}
6924-
HadDefaultTheme: 1
69256920
OnClick:
69266921
m_PersistentCalls:
69276922
m_Calls:
@@ -6939,7 +6934,8 @@ MonoBehaviour:
69396934
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
69406935
Culture=neutral, PublicKeyToken=null
69416936
Events: []
6942-
dimensionIndex: 0
6937+
resetOnDestroy: 0
6938+
enabledOnStart: 1
69436939
--- !u!23 &79589820257166891
69446940
MeshRenderer:
69456941
m_ObjectHideFlags: 0
@@ -12329,29 +12325,23 @@ MonoBehaviour:
1232912325
m_Script: {fileID: 11500000, guid: 1410eac1ae94b4d4492a09cc368e152c, type: 3}
1233012326
m_Name:
1233112327
m_EditorClassIdentifier:
12332-
Enabled: 1
12333-
States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
12334-
InputAction:
12335-
id: 0
12336-
description:
12337-
axisConstraint: 0
12328+
states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
1233812329
InputActionId: 0
12339-
IsGlobal: 0
12330+
isGlobal: 0
1234012331
Dimensions: 1
12341-
StartDimensionIndex: 0
12332+
dimensionIndex: 0
12333+
startDimensionIndex: 0
1234212334
CanSelect: 1
1234312335
CanDeselect: 1
1234412336
VoiceCommand:
12345-
RequiresFocus: 1
12346-
Profiles:
12337+
voiceRequiresFocus: 1
12338+
profiles:
1234712339
- Target: {fileID: 24050898187404380}
1234812340
Themes:
1234912341
- {fileID: 11400000, guid: d37afabc007bf774d9431b9a7cbe6fba, type: 2}
12350-
HadDefaultTheme: 1
1235112342
- Target: {fileID: 23691605350130174}
1235212343
Themes:
1235312344
- {fileID: 11400000, guid: cbde7890146c3024d928b7afc2e16065, type: 2}
12354-
HadDefaultTheme: 1
1235512345
OnClick:
1235612346
m_PersistentCalls:
1235712347
m_Calls:
@@ -12369,7 +12359,8 @@ MonoBehaviour:
1236912359
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
1237012360
Culture=neutral, PublicKeyToken=null
1237112361
Events: []
12372-
dimensionIndex: 0
12362+
resetOnDestroy: 0
12363+
enabledOnStart: 1
1237312364
--- !u!224 &167848600843529939
1237412365
RectTransform:
1237512366
m_ObjectHideFlags: 0
@@ -13355,29 +13346,23 @@ MonoBehaviour:
1335513346
m_Script: {fileID: 11500000, guid: 1410eac1ae94b4d4492a09cc368e152c, type: 3}
1335613347
m_Name:
1335713348
m_EditorClassIdentifier:
13358-
Enabled: 1
13359-
States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
13360-
InputAction:
13361-
id: 0
13362-
description:
13363-
axisConstraint: 0
13349+
states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
1336413350
InputActionId: 0
13365-
IsGlobal: 0
13351+
isGlobal: 0
1336613352
Dimensions: 1
13367-
StartDimensionIndex: 0
13353+
dimensionIndex: 0
13354+
startDimensionIndex: 0
1336813355
CanSelect: 1
1336913356
CanDeselect: 1
1337013357
VoiceCommand:
13371-
RequiresFocus: 1
13372-
Profiles:
13358+
voiceRequiresFocus: 1
13359+
profiles:
1337313360
- Target: {fileID: 2283218539602596063}
1337413361
Themes:
1337513362
- {fileID: 11400000, guid: d37afabc007bf774d9431b9a7cbe6fba, type: 2}
13376-
HadDefaultTheme: 1
1337713363
- Target: {fileID: 2282980192016774525}
1337813364
Themes:
1337913365
- {fileID: 11400000, guid: cbde7890146c3024d928b7afc2e16065, type: 2}
13380-
HadDefaultTheme: 1
1338113366
OnClick:
1338213367
m_PersistentCalls:
1338313368
m_Calls:
@@ -13395,7 +13380,8 @@ MonoBehaviour:
1339513380
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
1339613381
Culture=neutral, PublicKeyToken=null
1339713382
Events: []
13398-
dimensionIndex: 0
13383+
resetOnDestroy: 0
13384+
enabledOnStart: 1
1339913385
--- !u!114 &2179402448215161167
1340013386
MonoBehaviour:
1340113387
m_ObjectHideFlags: 0
@@ -27126,29 +27112,23 @@ MonoBehaviour:
2712627112
m_Script: {fileID: 11500000, guid: 1410eac1ae94b4d4492a09cc368e152c, type: 3}
2712727113
m_Name:
2712827114
m_EditorClassIdentifier:
27129-
Enabled: 1
27130-
States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
27131-
InputAction:
27132-
id: 0
27133-
description:
27134-
axisConstraint: 0
27115+
states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
2713527116
InputActionId: 0
27136-
IsGlobal: 0
27117+
isGlobal: 0
2713727118
Dimensions: 1
27138-
StartDimensionIndex: 0
27119+
dimensionIndex: 0
27120+
startDimensionIndex: 0
2713927121
CanSelect: 1
2714027122
CanDeselect: 1
2714127123
VoiceCommand:
27142-
RequiresFocus: 1
27143-
Profiles:
27124+
voiceRequiresFocus: 1
27125+
profiles:
2714427126
- Target: {fileID: 8415750213202434200}
2714527127
Themes:
2714627128
- {fileID: 11400000, guid: d37afabc007bf774d9431b9a7cbe6fba, type: 2}
27147-
HadDefaultTheme: 1
2714827129
- Target: {fileID: 8415989049410043194}
2714927130
Themes:
2715027131
- {fileID: 11400000, guid: cbde7890146c3024d928b7afc2e16065, type: 2}
27151-
HadDefaultTheme: 1
2715227132
OnClick:
2715327133
m_PersistentCalls:
2715427134
m_Calls:
@@ -27166,7 +27146,8 @@ MonoBehaviour:
2716627146
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
2716727147
Culture=neutral, PublicKeyToken=null
2716827148
Events: []
27169-
dimensionIndex: 0
27149+
resetOnDestroy: 0
27150+
enabledOnStart: 1
2717027151
--- !u!114 &8456517558004822280
2717127152
MonoBehaviour:
2717227153
m_ObjectHideFlags: 0

‎Assets/MRTK/Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-02-TargetSelection.unity‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,8 @@ MonoBehaviour:
557557
moveLerpTime: 0.001
558558
rotateLerpTime: 0.001
559559
scaleLerpTime: 0.001
560+
enableConstraints: 1
561+
constraintsManager: {fileID: 0}
560562
elasticsManager: {fileID: 0}
561563
onManipulationStarted:
562564
m_PersistentCalls:

‎Assets/MRTK/Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-03-Navigation.unity‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2399,6 +2399,8 @@ MonoBehaviour:
23992399
moveLerpTime: 0.000001
24002400
rotateLerpTime: 0.000001
24012401
scaleLerpTime: 0.000001
2402+
enableConstraints: 1
2403+
constraintsManager: {fileID: 0}
24022404
elasticsManager: {fileID: 0}
24032405
onManipulationStarted:
24042406
m_PersistentCalls:
@@ -2429,6 +2431,7 @@ MonoBehaviour:
24292431
boundsCalculationMethod: 0
24302432
activation: 3
24312433
flattenAxis: 0
2434+
uniformScaleOnFlattenedAxis: 1
24322435
boxPadding: {x: 0, y: 0, z: 0}
24332436
boxDisplayConfiguration: {fileID: 1129875403}
24342437
linksConfiguration: {fileID: 510879433}
@@ -2441,6 +2444,8 @@ MonoBehaviour:
24412444
rotateLerpTime: 0.001
24422445
scaleLerpTime: 0.001
24432446
translateLerpTime: 0.001
2447+
enableConstraints: 1
2448+
constraintsManager: {fileID: 0}
24442449
rotateStarted:
24452450
m_PersistentCalls:
24462451
m_Calls: []
@@ -2472,6 +2477,8 @@ MonoBehaviour:
24722477
m_Script: {fileID: 11500000, guid: a98de877dee5fc341b4eb59dfdab266c, type: 3}
24732478
m_Name:
24742479
m_EditorClassIdentifier:
2480+
autoConstraintSelection: 1
2481+
selectedConstraints: []
24752482
--- !u!1 &231954695
24762483
GameObject:
24772484
m_ObjectHideFlags: 0
@@ -5193,6 +5200,8 @@ MonoBehaviour:
51935200
moveLerpTime: 0.001
51945201
rotateLerpTime: 0.001
51955202
scaleLerpTime: 0.001
5203+
enableConstraints: 1
5204+
constraintsManager: {fileID: 0}
51965205
elasticsManager: {fileID: 0}
51975206
onManipulationStarted:
51985207
m_PersistentCalls:

‎Assets/MRTK/Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-04-TargetPositioning.unity‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16997,6 +16997,9 @@ MonoBehaviour:
1699716997
moveLerpTime: 0.001
1699816998
rotateLerpTime: 0.001
1699916999
scaleLerpTime: 0.001
17000+
enableConstraints: 1
17001+
constraintsManager: {fileID: 0}
17002+
elasticsManager: {fileID: 0}
1700017003
onManipulationStarted:
1700117004
m_PersistentCalls:
1700217005
m_Calls:
@@ -17079,30 +17082,6 @@ MonoBehaviour:
1707917082
onHoverExited:
1708017083
m_PersistentCalls:
1708117084
m_Calls: []
17082-
translationElasticConfigurationObject: {fileID: 0}
17083-
rotationElasticConfigurationObject: {fileID: 0}
17084-
scaleElasticConfigurationObject: {fileID: 0}
17085-
translationElasticExtent:
17086-
StretchBounds:
17087-
m_Center: {x: 0, y: 0, z: 0}
17088-
m_Extent: {x: 0, y: 0, z: 0}
17089-
UseBounds: 0
17090-
SnapPoints: []
17091-
RepeatSnapPoints: 0
17092-
SnapRadius: 0
17093-
rotationElasticExtent:
17094-
SnapPoints: []
17095-
RepeatSnapPoints: 0
17096-
SnapRadius: 0
17097-
scaleElasticExtent:
17098-
StretchBounds:
17099-
m_Center: {x: 0, y: 0, z: 0}
17100-
m_Extent: {x: 0, y: 0, z: 0}
17101-
UseBounds: 0
17102-
SnapPoints: []
17103-
RepeatSnapPoints: 0
17104-
SnapRadius: 0
17105-
elasticTypes: 0
1710617085
--- !u!1 &936412165
1710717086
GameObject:
1710817087
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)