Skip to content

Commit a20755b

Browse files
Stephen HodgsonStephen Hodgson
authored andcommitted
Fixed SpeechInputSource test scene
1 parent c8807cf commit a20755b

File tree

2 files changed

+36
-19
lines changed

2 files changed

+36
-19
lines changed

Assets/HoloToolkit/Input/Tests/Scenes/SpeechInputSource.unity

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ GameObject:
232232
- component: {fileID: 1071413368}
233233
- component: {fileID: 1071413364}
234234
m_Layer: 0
235-
m_Name: Sphere
235+
m_Name: Sphere2
236236
m_TagString: Untagged
237237
m_Icon: {fileID: 0}
238238
m_NavMeshLayer: 0
@@ -416,7 +416,6 @@ GameObject:
416416
- component: {fileID: 1117903547}
417417
- component: {fileID: 1117903549}
418418
- component: {fileID: 1117903550}
419-
- component: {fileID: 1117903548}
420419
m_Layer: 0
421420
m_Name: Spheres
422421
m_TagString: Untagged
@@ -440,17 +439,6 @@ Transform:
440439
m_Father: {fileID: 501355360}
441440
m_RootOrder: 1
442441
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
443-
--- !u!114 &1117903548
444-
MonoBehaviour:
445-
m_ObjectHideFlags: 0
446-
m_PrefabParentObject: {fileID: 0}
447-
m_PrefabInternal: {fileID: 0}
448-
m_GameObject: {fileID: 1117903546}
449-
m_Enabled: 1
450-
m_EditorHideFlags: 0
451-
m_Script: {fileID: 11500000, guid: ec2809d00e1924343b61a3db70c2a77d, type: 3}
452-
m_Name:
453-
m_EditorClassIdentifier:
454442
--- !u!114 &1117903549
455443
MonoBehaviour:
456444
m_ObjectHideFlags: 0
@@ -478,8 +466,8 @@ MonoBehaviour:
478466
Response:
479467
m_PersistentCalls:
480468
m_Calls:
481-
- m_Target: {fileID: 1117903548}
482-
m_MethodName: ResetAll
469+
- m_Target: {fileID: 2114791809}
470+
m_MethodName: ResetColor
483471
m_Mode: 1
484472
m_Arguments:
485473
m_ObjectArgument: {fileID: 0}
@@ -488,7 +476,29 @@ MonoBehaviour:
488476
m_FloatArgument: 0
489477
m_StringArgument:
490478
m_BoolArgument: 0
491-
m_CallState: 2
479+
m_CallState: 1
480+
- m_Target: {fileID: 1071413364}
481+
m_MethodName: ResetColor
482+
m_Mode: 1
483+
m_Arguments:
484+
m_ObjectArgument: {fileID: 0}
485+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
486+
m_IntArgument: 0
487+
m_FloatArgument: 0
488+
m_StringArgument:
489+
m_BoolArgument: 0
490+
m_CallState: 1
491+
- m_Target: {fileID: 1525392733}
492+
m_MethodName: ResetColor
493+
m_Mode: 1
494+
m_Arguments:
495+
m_ObjectArgument: {fileID: 0}
496+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
497+
m_IntArgument: 0
498+
m_FloatArgument: 0
499+
m_StringArgument:
500+
m_BoolArgument: 0
501+
m_CallState: 1
492502
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
493503
PublicKeyToken=null
494504
--- !u!1 &1525392731
@@ -505,7 +515,7 @@ GameObject:
505515
- component: {fileID: 1525392737}
506516
- component: {fileID: 1525392733}
507517
m_Layer: 0
508-
m_Name: Sphere
518+
m_Name: Sphere3
509519
m_TagString: Untagged
510520
m_Icon: {fileID: 0}
511521
m_NavMeshLayer: 0
@@ -869,7 +879,7 @@ GameObject:
869879
- component: {fileID: 2036229832}
870880
- component: {fileID: 2036229831}
871881
m_Layer: 0
872-
m_Name: Text
882+
m_Name: InstructionText
873883
m_TagString: Untagged
874884
m_Icon: {fileID: 0}
875885
m_NavMeshLayer: 0
@@ -967,7 +977,7 @@ GameObject:
967977
- component: {fileID: 2114791810}
968978
- component: {fileID: 2114791809}
969979
m_Layer: 0
970-
m_Name: Sphere
980+
m_Name: Sphere1
971981
m_TagString: Untagged
972982
m_Icon: {fileID: 0}
973983
m_NavMeshLayer: 0

Assets/HoloToolkit/Input/Tests/Scripts/SphereKeywords.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ namespace HoloToolkit.Unity.InputModule.Tests
99
public class SphereKeywords : MonoBehaviour, ISpeechHandler
1010
{
1111
private Material cachedMaterial;
12+
private Color defaultColor;
1213

1314
private void Awake()
1415
{
1516
cachedMaterial = GetComponent<Renderer>().material;
17+
defaultColor = cachedMaterial.color;
1618
}
1719

1820
public void ChangeColor(string color)
@@ -31,6 +33,11 @@ public void ChangeColor(string color)
3133
}
3234
}
3335

36+
public void ResetColor()
37+
{
38+
cachedMaterial.SetColor("_Color", defaultColor);
39+
}
40+
3441
public void OnSpeechKeywordRecognized(SpeechKeywordRecognizedEventData eventData)
3542
{
3643
ChangeColor(eventData.RecognizedText);

0 commit comments

Comments
 (0)