Skip to content

Commit 44805e6

Browse files
authored
Reserialize assets for 2.8 (#10591)
* Fix the default to not use deprecated value * Reserialization! * Unity 2018 wants this * Set thumbCollider * Update PokePointer.cs * Update MixedRealityPointerProfile.cs
1 parent befc10c commit 44805e6

File tree

163 files changed

+1053
-388
lines changed

Some content is hidden

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

163 files changed

+1053
-388
lines changed

Assets/MRTK/Core/Definitions/InputSystem/MixedRealityPointerProfile.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,7 @@ public bool IsEyeTrackingEnabled
112112
/// The concrete Pointer Mediator component to use.
113113
/// This is a component that mediates all pointers in system, disabling / enabling them based on the state of other pointers.
114114
/// </summary>
115-
public SystemType PointerMediator
116-
{
117-
get { return pointerMediator; }
118-
}
115+
public SystemType PointerMediator => pointerMediator;
119116

120117
[SerializeField]
121118
[Implements(typeof(IMixedRealityPrimaryPointerSelector), TypeGrouping.ByNamespaceFlat)]
@@ -125,9 +122,6 @@ public SystemType PointerMediator
125122
/// <summary>
126123
/// Primary pointer selector implementation to use. This is used by the focus provider to choose the primary pointer.
127124
/// </summary>
128-
public SystemType PrimaryPointerSelector
129-
{
130-
get { return primaryPointerSelector; }
131-
}
125+
public SystemType PrimaryPointerSelector => primaryPointerSelector;
132126
}
133127
}

Assets/MRTK/Examples/Common/Prefabs/CoffeeCup.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ MonoBehaviour:
146146
startDimensionIndex: 0
147147
CanSelect: 1
148148
CanDeselect: 1
149-
VoiceCommand:
149+
voiceCommand:
150150
voiceRequiresFocus: 1
151151
profiles:
152152
- Target: {fileID: 1409004022357944}

Assets/MRTK/Examples/Common/Prefabs/FingerChaser.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ MonoBehaviour:
9292
m_Name:
9393
m_EditorClassIdentifier:
9494
trackedTargetType: 6
95-
trackedHandness: 2
95+
trackedHandedness: 2
9696
trackedHandJoint: 1
9797
transformOverride: {fileID: 0}
9898
additionalOffset: {x: 0, y: 0, z: 0}

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

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@ MonoBehaviour:
10081008
m_Name:
10091009
m_EditorClassIdentifier:
10101010
trackedTargetType: 6
1011-
trackedHandness: 3
1011+
trackedHandedness: 3
10121012
trackedHandJoint: 2
10131013
transformOverride: {fileID: 0}
10141014
additionalOffset: {x: 0, y: -0.1, z: 0.05}
@@ -1789,8 +1789,23 @@ MonoBehaviour:
17891789
m_EditorClassIdentifier:
17901790
handType: 3
17911791
proximityType: 3
1792+
executionOrder: 0
17921793
constraintOnRotation: 5
17931794
useLocalSpaceForConstraint: 0
1795+
--- !u!114 &2002207254829818895
1796+
MonoBehaviour:
1797+
m_ObjectHideFlags: 0
1798+
m_CorrespondingSourceObject: {fileID: 0}
1799+
m_PrefabInstance: {fileID: 0}
1800+
m_PrefabAsset: {fileID: 0}
1801+
m_GameObject: {fileID: 3348028431359731200}
1802+
m_Enabled: 1
1803+
m_EditorHideFlags: 0
1804+
m_Script: {fileID: 11500000, guid: a98de877dee5fc341b4eb59dfdab266c, type: 3}
1805+
m_Name:
1806+
m_EditorClassIdentifier:
1807+
autoConstraintSelection: 1
1808+
selectedConstraints: []
17941809
--- !u!114 &3623808747050032925
17951810
MonoBehaviour:
17961811
m_ObjectHideFlags: 0
@@ -1940,20 +1955,6 @@ MonoBehaviour:
19401955
onHoverExited:
19411956
m_PersistentCalls:
19421957
m_Calls: []
1943-
--- !u!114 &2002207254829818895
1944-
MonoBehaviour:
1945-
m_ObjectHideFlags: 0
1946-
m_CorrespondingSourceObject: {fileID: 0}
1947-
m_PrefabInstance: {fileID: 0}
1948-
m_PrefabAsset: {fileID: 0}
1949-
m_GameObject: {fileID: 3348028431359731200}
1950-
m_Enabled: 1
1951-
m_EditorHideFlags: 0
1952-
m_Script: {fileID: 11500000, guid: a98de877dee5fc341b4eb59dfdab266c, type: 3}
1953-
m_Name:
1954-
m_EditorClassIdentifier:
1955-
autoConstraintSelection: 1
1956-
selectedConstraints: []
19571958
--- !u!1 &7127482986725950285
19581959
GameObject:
19591960
m_ObjectHideFlags: 0

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

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,20 @@ BoxCollider:
1313
serializedVersion: 2
1414
m_Size: {x: 1, y: 0.99999994, z: 1}
1515
m_Center: {x: 0.00000004856583, y: 0, z: 3.0616168e-17}
16+
--- !u!114 &3132783863372908526
17+
MonoBehaviour:
18+
m_ObjectHideFlags: 0
19+
m_CorrespondingSourceObject: {fileID: 0}
20+
m_PrefabInstance: {fileID: 0}
21+
m_PrefabAsset: {fileID: 0}
22+
m_GameObject: {fileID: 4598087010110318165}
23+
m_Enabled: 1
24+
m_EditorHideFlags: 0
25+
m_Script: {fileID: 11500000, guid: a98de877dee5fc341b4eb59dfdab266c, type: 3}
26+
m_Name:
27+
m_EditorClassIdentifier:
28+
autoConstraintSelection: 1
29+
selectedConstraints: []
1630
--- !u!114 &5692620129258657323
1731
MonoBehaviour:
1832
m_ObjectHideFlags: 0
@@ -27,6 +41,7 @@ MonoBehaviour:
2741
m_EditorClassIdentifier:
2842
handType: 3
2943
proximityType: 3
44+
executionOrder: 0
3045
constraintOnRotation: 5
3146
useLocalSpaceForConstraint: 0
3247
--- !u!114 &5842008468326789035
@@ -167,20 +182,6 @@ MonoBehaviour:
167182
onHoverExited:
168183
m_PersistentCalls:
169184
m_Calls: []
170-
--- !u!114 &3132783863372908526
171-
MonoBehaviour:
172-
m_ObjectHideFlags: 0
173-
m_CorrespondingSourceObject: {fileID: 0}
174-
m_PrefabInstance: {fileID: 0}
175-
m_PrefabAsset: {fileID: 0}
176-
m_GameObject: {fileID: 4598087010110318165}
177-
m_Enabled: 1
178-
m_EditorHideFlags: 0
179-
m_Script: {fileID: 11500000, guid: a98de877dee5fc341b4eb59dfdab266c, type: 3}
180-
m_Name:
181-
m_EditorClassIdentifier:
182-
autoConstraintSelection: 1
183-
selectedConstraints: []
184185
--- !u!1 &5842008466616385027
185186
GameObject:
186187
m_ObjectHideFlags: 0
@@ -1470,7 +1471,7 @@ MonoBehaviour:
14701471
m_Name:
14711472
m_EditorClassIdentifier:
14721473
trackedTargetType: 6
1473-
trackedHandness: 3
1474+
trackedHandedness: 3
14741475
trackedHandJoint: 2
14751476
transformOverride: {fileID: 0}
14761477
additionalOffset: {x: 0, y: -0.1, z: 0.05}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ MonoBehaviour:
141141
m_Name:
142142
m_EditorClassIdentifier:
143143
trackedTargetType: 6
144-
trackedHandness: 3
144+
trackedHandedness: 3
145145
trackedHandJoint: 2
146146
transformOverride: {fileID: 0}
147147
additionalOffset: {x: 0, y: 0, z: 0.03}

Assets/MRTK/Examples/Common/Prefabs/HandMenu_Slider.prefab

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,13 @@ MonoBehaviour:
790790
m_Name:
791791
m_EditorClassIdentifier:
792792
thumbRoot: {fileID: 7993839106062047049}
793+
isTouchable: 0
794+
snapToPosition: 0
795+
thumbCollider: {fileID: 4759724201994911970}
796+
touchCollider: {fileID: 0}
793797
sliderValue: 0.5
798+
useSliderStepDivisions: 0
799+
sliderStepDivisions: 1
794800
trackVisuals: {fileID: 0}
795801
tickMarks: {fileID: 0}
796802
thumbVisuals: {fileID: 0}
@@ -879,10 +885,12 @@ MonoBehaviour:
879885
m_Script: {fileID: 11500000, guid: db568ff594a361d4e9a9ac960905ddd3, type: 3}
880886
m_Name:
881887
m_EditorClassIdentifier:
888+
playSoundsOnlyOnInteract: 0
882889
interactionStartSound: {fileID: 8300000, guid: 6c0efce9e4f4243449555af66e975f27,
883890
type: 3}
884891
interactionEndSound: {fileID: 8300000, guid: 32c013149113ba24cb267e1e3f6725c7, type: 3}
885892
playTickSounds: 1
893+
alignWithStepSlider: 1
886894
passNotchSound: {fileID: 8300000, guid: 0632575a55cf09349a999a10968f6395, type: 3}
887895
tickEvery: 0.1
888896
startPitch: 0.75

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ MonoBehaviour:
205205
m_Name:
206206
m_EditorClassIdentifier:
207207
trackedTargetType: 6
208-
trackedHandness: 3
208+
trackedHandedness: 3
209209
trackedHandJoint: 2
210210
transformOverride: {fileID: 0}
211211
additionalOffset: {x: 0, y: 0, z: 0.03}

Assets/MRTK/Examples/Common/Prefabs/PianoKey.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ MonoBehaviour:
294294
startDimensionIndex: 0
295295
CanSelect: 1
296296
CanDeselect: 1
297-
VoiceCommand:
297+
voiceCommand:
298298
voiceRequiresFocus: 1
299299
profiles:
300300
- Target: {fileID: 8538809683663889752}

Assets/MRTK/Examples/Common/Prefabs/PressableRoundButton.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ MonoBehaviour:
585585
startDimensionIndex: 0
586586
CanSelect: 0
587587
CanDeselect: 0
588-
VoiceCommand: Select
588+
voiceCommand: Select
589589
voiceRequiresFocus: 1
590590
profiles:
591591
- Target: {fileID: 6037652004605441796}

0 commit comments

Comments
 (0)