Skip to content

Commit

Permalink
Update to MRTK v2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
cre8ivepark committed Oct 11, 2019
1 parent 37dbc64 commit 2a99eab
Show file tree
Hide file tree
Showing 6 changed files with 129 additions and 18 deletions.
135 changes: 120 additions & 15 deletions Assets/MRDL_PeriodicTable/Prefabs/ElementContainer.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -2259,6 +2259,7 @@ GameObject:
- component: {fileID: 65331312176076676}
- component: {fileID: 114895204902812642}
- component: {fileID: 6075953362897447473}
- component: {fileID: 2356920043342396677}
m_Layer: 8
m_Name: Element
m_TagString: Untagged
Expand Down Expand Up @@ -2432,20 +2433,16 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1410eac1ae94b4d4492a09cc368e152c, type: 3}
m_Name:
m_EditorClassIdentifier:
Enabled: 1
states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
InputAction:
id: 0
description:
axisConstraint: 0
InputActionId: 0
IsGlobal: 0
isGlobal: 0
Dimensions: 1
StartDimensionIndex: 0
dimensionIndex: 0
startDimensionIndex: 0
CanSelect: 1
CanDeselect: 1
VoiceCommand:
RequiresFocus: 1
voiceRequiresFocus: 1
profiles:
- Target: {fileID: 1361587674879038}
Themes:
Expand Down Expand Up @@ -2478,10 +2475,118 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 2356920043342396677}
m_MethodName: PlayOneShot
m_Mode: 2
m_Arguments:
m_ObjectArgument: {fileID: 8300000, guid: 06f9d598e90313646bbff63530142344,
type: 3}
m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
Events: []
dimensionIndex: 0
enabledOnStart: 1
--- !u!82 &2356920043342396677
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1836423756577020}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &1846409568605244
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3510,12 +3615,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 52b5b35a0de6bac43b6f27adf2f4cde0, type: 3}
--- !u!224 &2446254274654055319 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8049239005684504460, guid: 52b5b35a0de6bac43b6f27adf2f4cde0,
type: 3}
m_PrefabInstance: {fileID: 5640322541773011995}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2446254274606083226 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8049239005670084737, guid: 52b5b35a0de6bac43b6f27adf2f4cde0,
Expand All @@ -3528,3 +3627,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &2446254274654055319 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8049239005684504460, guid: 52b5b35a0de6bac43b6f27adf2f4cde0,
type: 3}
m_PrefabInstance: {fileID: 5640322541773011995}
m_PrefabAsset: {fileID: 0}
1 change: 1 addition & 0 deletions Assets/MRDL_PeriodicTable/Scenes/Main.unity
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@ MonoBehaviour:
ElementPrefab: {fileID: 1877953240409378, guid: e2d688e6082495644a547415c0225f23,
type: 3}
ElementSeperationDistance: 0.2
LegendTransform: {fileID: 722607367}
Collection: {fileID: 0}
MatAlkaliMetal: {fileID: 2100000, guid: 0c4cff1c31449f640b646acc22dedfba, type: 2}
MatAlkalineEarthMetal: {fileID: 2100000, guid: 8e732ef942d91bb4381c401be31f5fb0,
Expand Down
5 changes: 5 additions & 0 deletions Assets/MRDL_PeriodicTable/Scripts/PeriodicTableLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ public class PeriodicTableLoader : MonoBehaviour
// How much space to put between each element prefab
public float ElementSeperationDistance;

// Legend
public Transform LegendTransform;

public GridObjectCollection Collection;

public Material MatAlkaliMetal;
Expand Down Expand Up @@ -125,6 +128,8 @@ public void InitializeData()
i++;
}
Parent.localPosition = new Vector3(0.0f, -0.7f, 0.7f);
LegendTransform.localPosition = new Vector3(0.0f, 0.15f, 1.8f);

}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ MonoBehaviour:
- {r: 0, g: 1, b: 0.2163105, a: 1}
- {r: 0, g: 0.3028021, b: 1, a: 1}
- {r: 0.44855833, g: 0, b: 1, a: 1}
gazeCursorPrefab: {fileID: 1000012072213228, guid: 5b3e2856904e43c680f84f326861032a,
gazeCursorPrefab: {fileID: 1000012072213228, guid: 521049f9431e342478200d59fce43f92,
type: 3}
gazeProviderType:
reference: Microsoft.MixedReality.Toolkit.Input.GazeProvider, Microsoft.MixedReality.Toolkit.Services.InputSystem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ MonoBehaviour:
type: 2}
diagnosticsSystemProfile: {fileID: 11400000, guid: 478436bd1083882479a52d067e98e537,
type: 2}
enableDiagnosticsSystem: 1
enableDiagnosticsSystem: 0
diagnosticsSystemType:
reference: Microsoft.MixedReality.Toolkit.Diagnostics.MixedRealityDiagnosticsSystem,
Microsoft.MixedReality.Toolkit.Services.DiagnosticsSystem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ MonoBehaviour:
type: 3}
handMeshPrefab: {fileID: 1887883006053652, guid: a86f479797fea8f4189f924b3b6ad979,
type: 3}
handMeshVisualizationModes: 0
handMeshVisualizationModes: -1
handJointVisualizationModes: 1

0 comments on commit 2a99eab

Please sign in to comment.