Skip to content

Commit 2a99eab

Browse files
committed
Update to MRTK v2.1.0
1 parent 37dbc64 commit 2a99eab

File tree

6 files changed

+129
-18
lines changed

6 files changed

+129
-18
lines changed

Assets/MRDL_PeriodicTable/Prefabs/ElementContainer.prefab

+120-15
Original file line numberDiff line numberDiff line change
@@ -2259,6 +2259,7 @@ GameObject:
22592259
- component: {fileID: 65331312176076676}
22602260
- component: {fileID: 114895204902812642}
22612261
- component: {fileID: 6075953362897447473}
2262+
- component: {fileID: 2356920043342396677}
22622263
m_Layer: 8
22632264
m_Name: Element
22642265
m_TagString: Untagged
@@ -2432,20 +2433,16 @@ MonoBehaviour:
24322433
m_Script: {fileID: 11500000, guid: 1410eac1ae94b4d4492a09cc368e152c, type: 3}
24332434
m_Name:
24342435
m_EditorClassIdentifier:
2435-
Enabled: 1
24362436
states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
2437-
InputAction:
2438-
id: 0
2439-
description:
2440-
axisConstraint: 0
24412437
InputActionId: 0
2442-
IsGlobal: 0
2438+
isGlobal: 0
24432439
Dimensions: 1
2444-
StartDimensionIndex: 0
2440+
dimensionIndex: 0
2441+
startDimensionIndex: 0
24452442
CanSelect: 1
24462443
CanDeselect: 1
24472444
VoiceCommand:
2448-
RequiresFocus: 1
2445+
voiceRequiresFocus: 1
24492446
profiles:
24502447
- Target: {fileID: 1361587674879038}
24512448
Themes:
@@ -2478,10 +2475,118 @@ MonoBehaviour:
24782475
m_StringArgument:
24792476
m_BoolArgument: 0
24802477
m_CallState: 2
2478+
- m_Target: {fileID: 2356920043342396677}
2479+
m_MethodName: PlayOneShot
2480+
m_Mode: 2
2481+
m_Arguments:
2482+
m_ObjectArgument: {fileID: 8300000, guid: 06f9d598e90313646bbff63530142344,
2483+
type: 3}
2484+
m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine
2485+
m_IntArgument: 0
2486+
m_FloatArgument: 0
2487+
m_StringArgument:
2488+
m_BoolArgument: 0
2489+
m_CallState: 2
24812490
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
24822491
Culture=neutral, PublicKeyToken=null
24832492
Events: []
2484-
dimensionIndex: 0
2493+
enabledOnStart: 1
2494+
--- !u!82 &2356920043342396677
2495+
AudioSource:
2496+
m_ObjectHideFlags: 0
2497+
m_CorrespondingSourceObject: {fileID: 0}
2498+
m_PrefabInstance: {fileID: 0}
2499+
m_PrefabAsset: {fileID: 0}
2500+
m_GameObject: {fileID: 1836423756577020}
2501+
m_Enabled: 1
2502+
serializedVersion: 4
2503+
OutputAudioMixerGroup: {fileID: 0}
2504+
m_audioClip: {fileID: 0}
2505+
m_PlayOnAwake: 1
2506+
m_Volume: 1
2507+
m_Pitch: 1
2508+
Loop: 0
2509+
Mute: 0
2510+
Spatialize: 0
2511+
SpatializePostEffects: 0
2512+
Priority: 128
2513+
DopplerLevel: 1
2514+
MinDistance: 1
2515+
MaxDistance: 500
2516+
Pan2D: 0
2517+
rolloffMode: 0
2518+
BypassEffects: 0
2519+
BypassListenerEffects: 0
2520+
BypassReverbZones: 0
2521+
rolloffCustomCurve:
2522+
serializedVersion: 2
2523+
m_Curve:
2524+
- serializedVersion: 3
2525+
time: 0
2526+
value: 1
2527+
inSlope: 0
2528+
outSlope: 0
2529+
tangentMode: 0
2530+
weightedMode: 0
2531+
inWeight: 0.33333334
2532+
outWeight: 0.33333334
2533+
- serializedVersion: 3
2534+
time: 1
2535+
value: 0
2536+
inSlope: 0
2537+
outSlope: 0
2538+
tangentMode: 0
2539+
weightedMode: 0
2540+
inWeight: 0.33333334
2541+
outWeight: 0.33333334
2542+
m_PreInfinity: 2
2543+
m_PostInfinity: 2
2544+
m_RotationOrder: 4
2545+
panLevelCustomCurve:
2546+
serializedVersion: 2
2547+
m_Curve:
2548+
- serializedVersion: 3
2549+
time: 0
2550+
value: 0
2551+
inSlope: 0
2552+
outSlope: 0
2553+
tangentMode: 0
2554+
weightedMode: 0
2555+
inWeight: 0.33333334
2556+
outWeight: 0.33333334
2557+
m_PreInfinity: 2
2558+
m_PostInfinity: 2
2559+
m_RotationOrder: 4
2560+
spreadCustomCurve:
2561+
serializedVersion: 2
2562+
m_Curve:
2563+
- serializedVersion: 3
2564+
time: 0
2565+
value: 0
2566+
inSlope: 0
2567+
outSlope: 0
2568+
tangentMode: 0
2569+
weightedMode: 0
2570+
inWeight: 0.33333334
2571+
outWeight: 0.33333334
2572+
m_PreInfinity: 2
2573+
m_PostInfinity: 2
2574+
m_RotationOrder: 4
2575+
reverbZoneMixCustomCurve:
2576+
serializedVersion: 2
2577+
m_Curve:
2578+
- serializedVersion: 3
2579+
time: 0
2580+
value: 1
2581+
inSlope: 0
2582+
outSlope: 0
2583+
tangentMode: 0
2584+
weightedMode: 0
2585+
inWeight: 0.33333334
2586+
outWeight: 0.33333334
2587+
m_PreInfinity: 2
2588+
m_PostInfinity: 2
2589+
m_RotationOrder: 4
24852590
--- !u!1 &1846409568605244
24862591
GameObject:
24872592
m_ObjectHideFlags: 0
@@ -3510,12 +3615,6 @@ PrefabInstance:
35103615
objectReference: {fileID: 0}
35113616
m_RemovedComponents: []
35123617
m_SourcePrefab: {fileID: 100100000, guid: 52b5b35a0de6bac43b6f27adf2f4cde0, type: 3}
3513-
--- !u!224 &2446254274654055319 stripped
3514-
RectTransform:
3515-
m_CorrespondingSourceObject: {fileID: 8049239005684504460, guid: 52b5b35a0de6bac43b6f27adf2f4cde0,
3516-
type: 3}
3517-
m_PrefabInstance: {fileID: 5640322541773011995}
3518-
m_PrefabAsset: {fileID: 0}
35193618
--- !u!114 &2446254274606083226 stripped
35203619
MonoBehaviour:
35213620
m_CorrespondingSourceObject: {fileID: 8049239005670084737, guid: 52b5b35a0de6bac43b6f27adf2f4cde0,
@@ -3528,3 +3627,9 @@ MonoBehaviour:
35283627
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
35293628
m_Name:
35303629
m_EditorClassIdentifier:
3630+
--- !u!224 &2446254274654055319 stripped
3631+
RectTransform:
3632+
m_CorrespondingSourceObject: {fileID: 8049239005684504460, guid: 52b5b35a0de6bac43b6f27adf2f4cde0,
3633+
type: 3}
3634+
m_PrefabInstance: {fileID: 5640322541773011995}
3635+
m_PrefabAsset: {fileID: 0}

Assets/MRDL_PeriodicTable/Scenes/Main.unity

+1
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,7 @@ MonoBehaviour:
511511
ElementPrefab: {fileID: 1877953240409378, guid: e2d688e6082495644a547415c0225f23,
512512
type: 3}
513513
ElementSeperationDistance: 0.2
514+
LegendTransform: {fileID: 722607367}
514515
Collection: {fileID: 0}
515516
MatAlkaliMetal: {fileID: 2100000, guid: 0c4cff1c31449f640b646acc22dedfba, type: 2}
516517
MatAlkalineEarthMetal: {fileID: 2100000, guid: 8e732ef942d91bb4381c401be31f5fb0,

Assets/MRDL_PeriodicTable/Scripts/PeriodicTableLoader.cs

+5
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ public class PeriodicTableLoader : MonoBehaviour
5555
// How much space to put between each element prefab
5656
public float ElementSeperationDistance;
5757

58+
// Legend
59+
public Transform LegendTransform;
60+
5861
public GridObjectCollection Collection;
5962

6063
public Material MatAlkaliMetal;
@@ -125,6 +128,8 @@ public void InitializeData()
125128
i++;
126129
}
127130
Parent.localPosition = new Vector3(0.0f, -0.7f, 0.7f);
131+
LegendTransform.localPosition = new Vector3(0.0f, 0.15f, 1.8f);
132+
128133
}
129134
}
130135
}

Assets/MixedRealityToolkit.SDK/Profiles/DefaultMixedRealityInputPointerProfile.asset

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ MonoBehaviour:
2424
- {r: 0, g: 1, b: 0.2163105, a: 1}
2525
- {r: 0, g: 0.3028021, b: 1, a: 1}
2626
- {r: 0.44855833, g: 0, b: 1, a: 1}
27-
gazeCursorPrefab: {fileID: 1000012072213228, guid: 5b3e2856904e43c680f84f326861032a,
27+
gazeCursorPrefab: {fileID: 1000012072213228, guid: 521049f9431e342478200d59fce43f92,
2828
type: 3}
2929
gazeProviderType:
3030
reference: Microsoft.MixedReality.Toolkit.Input.GazeProvider, Microsoft.MixedReality.Toolkit.Services.InputSystem

Assets/MixedRealityToolkit.SDK/Profiles/HoloLens2/DefaultHoloLens2ConfigurationProfile.asset

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ MonoBehaviour:
4141
type: 2}
4242
diagnosticsSystemProfile: {fileID: 11400000, guid: 478436bd1083882479a52d067e98e537,
4343
type: 2}
44-
enableDiagnosticsSystem: 1
44+
enableDiagnosticsSystem: 0
4545
diagnosticsSystemType:
4646
reference: Microsoft.MixedReality.Toolkit.Diagnostics.MixedRealityDiagnosticsSystem,
4747
Microsoft.MixedReality.Toolkit.Services.DiagnosticsSystem

Assets/MixedRealityToolkit.SDK/Profiles/HoloLens2/DefaultHoloLens2HandTrackingProfile.asset

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ MonoBehaviour:
2121
type: 3}
2222
handMeshPrefab: {fileID: 1887883006053652, guid: a86f479797fea8f4189f924b3b6ad979,
2323
type: 3}
24-
handMeshVisualizationModes: 0
24+
handMeshVisualizationModes: -1
2525
handJointVisualizationModes: 1

0 commit comments

Comments
 (0)