From 2bd2ab6770bde826761de7b97e40a5abecd4fd60 Mon Sep 17 00:00:00 2001 From: Scott Haynie Date: Sun, 23 Jul 2023 12:36:09 -0700 Subject: [PATCH] TextToSpeech example fixes (#11734) * Add sample hand menu to DwellExample (fix #11727) * Revert "Add sample hand menu to DwellExample (fix #11727)" This reverts commit d73af8f101f9417f32fb0a9b227b764637ed05ba. * Center logo on back of description, add spatial audio to the voices in TextToSpeechExamples (Fix #11729) --- .../Assets/Scenes/TextToSpeechExamples.unity | 142 +++--------------- 1 file changed, 25 insertions(+), 117 deletions(-) diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/TextToSpeechExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/TextToSpeechExamples.unity index e42e41d8ba4..7bfe74f0d57 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/TextToSpeechExamples.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/TextToSpeechExamples.unity @@ -153,7 +153,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 199805686} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.2474, y: 0, z: 1.1787} + m_LocalPosition: {x: 0.25, y: 0, z: 1.1787} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -169,7 +169,7 @@ AudioSource: m_GameObject: {fileID: 199805686} m_Enabled: 1 serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 @@ -216,7 +216,7 @@ AudioSource: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -592,7 +592,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 334227395} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.3871, y: 0, z: 1.1787} + m_LocalPosition: {x: 0.55, y: 0, z: 1.1787} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -608,7 +608,7 @@ AudioSource: m_GameObject: {fileID: 334227395} m_Enabled: 1 serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 @@ -655,7 +655,7 @@ AudioSource: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1010,7 +1010,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} propertyPath: m_LocalPosition.x @@ -1067,7 +1067,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 5905304275062509466, guid: df4899a7e84d2794a9428337bba8a253, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 5905304275062509466, guid: df4899a7e84d2794a9428337bba8a253, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1211,7 +1211,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 826013516} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.1121, y: 0, z: 1.1787} + m_LocalPosition: {x: -0.1, y: 0, z: 1.1787} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1227,7 +1227,7 @@ AudioSource: m_GameObject: {fileID: 826013516} m_Enabled: 1 serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 @@ -1274,7 +1274,7 @@ AudioSource: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1644,7 +1644,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 946829201} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.68} + m_LocalPosition: {x: -0.3285, y: -0.153, z: -0.68} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1831,7 +1831,7 @@ Transform: - {fileID: 1728047431} - {fileID: 946829202} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1728047430 PrefabInstance: @@ -1860,6 +1860,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -55.2 objectReference: {fileID: 0} + - target: {fileID: 772928284761863525, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_AnchoredPosition.x + value: -77.8 + objectReference: {fileID: 0} + - target: {fileID: 772928284761863525, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_AnchoredPosition.y + value: 15.8 + objectReference: {fileID: 0} - target: {fileID: 2446705927233332293, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_text value: 'This scene demonstrates the Text To Speech capability on Windows platform. @@ -2313,7 +2321,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} propertyPath: m_LocalPosition.x @@ -2361,108 +2369,20 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ad5b753b73e311143a85055b15cea562, type: 3} ---- !u!1001 &2046514902 +--- !u!1001 &2006396601 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384562270007169, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384562270007169, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 2082148069247382453, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: Spatialize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2082148069247382453, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: OutputAudioMixerGroup - value: - objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} - - target: {fileID: 2082148069247382453, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3045578032311879198, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: Spatialize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3045578032311879198, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: OutputAudioMixerGroup - value: - objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} - - target: {fileID: 3045578032311879198, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6134130586559970896, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: Spatialize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6134130586559970896, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: OutputAudioMixerGroup - value: - objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} - - target: {fileID: 6134130586559970896, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7326570055845349072, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: Spatialize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7326570055845349072, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: OutputAudioMixerGroup - value: - objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} - - target: {fileID: 7326570055845349072, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7372669237086358564, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_Name - value: HandMenu + value: SampleSceneHandMenu objectReference: {fileID: 0} - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_RootOrder - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_LocalPosition.x @@ -2504,17 +2424,5 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7618871619398064040, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: Spatialize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7618871619398064040, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: OutputAudioMixerGroup - value: - objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} - - target: {fileID: 7618871619398064040, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3}