Skip to content

Commit 97083dd

Browse files
StephenHodgsonStephenHodgson
committed
Updated SpeechInputScene for good measure.
Reverted SpeechInputHandlerEditor early return if no keywords were found.
1 parent b246e10 commit 97083dd

File tree

2 files changed

+48
-27
lines changed

2 files changed

+48
-27
lines changed

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

Lines changed: 48 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
1313
--- !u!104 &2
1414
RenderSettings:
1515
m_ObjectHideFlags: 0
16-
serializedVersion: 7
16+
serializedVersion: 8
1717
m_Fog: 0
1818
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
1919
m_FogMode: 3
@@ -25,6 +25,7 @@ RenderSettings:
2525
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
2626
m_AmbientIntensity: 1
2727
m_AmbientMode: 0
28+
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
2829
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
2930
m_HaloStrength: 0.5
3031
m_FlareStrength: 1
@@ -41,7 +42,7 @@ RenderSettings:
4142
--- !u!157 &3
4243
LightmapSettings:
4344
m_ObjectHideFlags: 0
44-
serializedVersion: 7
45+
serializedVersion: 9
4546
m_GIWorkflowMode: 1
4647
m_GISettings:
4748
serializedVersion: 2
@@ -53,7 +54,7 @@ LightmapSettings:
5354
m_EnableBakedLightmaps: 1
5455
m_EnableRealtimeLightmaps: 1
5556
m_LightmapEditorSettings:
56-
serializedVersion: 4
57+
serializedVersion: 8
5758
m_Resolution: 2
5859
m_BakeResolution: 40
5960
m_TextureWidth: 1024
@@ -66,13 +67,27 @@ LightmapSettings:
6667
m_LightmapParameters: {fileID: 0}
6768
m_LightmapsBakeMode: 1
6869
m_TextureCompression: 1
69-
m_DirectLightInLightProbes: 1
7070
m_FinalGather: 0
7171
m_FinalGatherFiltering: 1
7272
m_FinalGatherRayCount: 256
7373
m_ReflectionCompression: 2
74+
m_MixedBakeMode: 1
75+
m_BakeBackend: 0
76+
m_PVRSampling: 1
77+
m_PVRDirectSampleCount: 32
78+
m_PVRSampleCount: 500
79+
m_PVRBounces: 2
80+
m_PVRFiltering: 0
81+
m_PVRFilteringMode: 1
82+
m_PVRCulling: 1
83+
m_PVRFilteringGaussRadiusDirect: 1
84+
m_PVRFilteringGaussRadiusIndirect: 5
85+
m_PVRFilteringGaussRadiusAO: 2
86+
m_PVRFilteringAtrousColorSigma: 1
87+
m_PVRFilteringAtrousNormalSigma: 1
88+
m_PVRFilteringAtrousPositionSigma: 1
7489
m_LightingDataAsset: {fileID: 0}
75-
m_RuntimeCPUUsage: 25
90+
m_ShadowMaskMode: 2
7691
--- !u!196 &4
7792
NavMeshSettings:
7893
serializedVersion: 2
@@ -89,6 +104,8 @@ NavMeshSettings:
89104
minRegionArea: 2
90105
manualCellSize: 0
91106
cellSize: 0.16666667
107+
manualTileSize: 0
108+
tileSize: 256
92109
accuratePlacement: 0
93110
m_NavMeshData: {fileID: 0}
94111
--- !u!1001 &109306855
@@ -292,6 +309,7 @@ MeshRenderer:
292309
m_AutoUVMaxAngle: 89
293310
m_LightmapParameters: {fileID: 0}
294311
m_SortingLayerID: 0
312+
m_SortingLayer: 0
295313
m_SortingOrder: 0
296314
--- !u!135 &1071413366
297315
SphereCollider:
@@ -323,8 +341,8 @@ MonoBehaviour:
323341
m_Script: {fileID: 11500000, guid: e7d6513c2cdf97f409654a2a4114d9b1, type: 3}
324342
m_Name:
325343
m_EditorClassIdentifier:
326-
keywords:
327-
- Keyword: Red
344+
Keywords:
345+
- Keyword: Blue
328346
Response:
329347
m_PersistentCalls:
330348
m_Calls:
@@ -336,7 +354,7 @@ MonoBehaviour:
336354
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
337355
m_IntArgument: 0
338356
m_FloatArgument: 0
339-
m_StringArgument: Red
357+
m_StringArgument: Blue
340358
m_BoolArgument: 0
341359
m_CallState: 2
342360
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
@@ -358,7 +376,7 @@ MonoBehaviour:
358376
m_CallState: 2
359377
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
360378
PublicKeyToken=null
361-
- Keyword: Blue
379+
- Keyword: Red
362380
Response:
363381
m_PersistentCalls:
364382
m_Calls:
@@ -370,7 +388,7 @@ MonoBehaviour:
370388
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
371389
m_IntArgument: 0
372390
m_FloatArgument: 0
373-
m_StringArgument: Blue
391+
m_StringArgument: Red
374392
m_BoolArgument: 0
375393
m_CallState: 2
376394
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
@@ -461,7 +479,7 @@ MonoBehaviour:
461479
m_Script: {fileID: 11500000, guid: e7d6513c2cdf97f409654a2a4114d9b1, type: 3}
462480
m_Name:
463481
m_EditorClassIdentifier:
464-
keywords:
482+
Keywords:
465483
- Keyword: Reset All
466484
Response:
467485
m_PersistentCalls:
@@ -476,7 +494,7 @@ MonoBehaviour:
476494
m_FloatArgument: 0
477495
m_StringArgument:
478496
m_BoolArgument: 0
479-
m_CallState: 1
497+
m_CallState: 2
480498
- m_Target: {fileID: 1071413364}
481499
m_MethodName: ResetColor
482500
m_Mode: 1
@@ -487,7 +505,7 @@ MonoBehaviour:
487505
m_FloatArgument: 0
488506
m_StringArgument:
489507
m_BoolArgument: 0
490-
m_CallState: 1
508+
m_CallState: 2
491509
- m_Target: {fileID: 1525392733}
492510
m_MethodName: ResetColor
493511
m_Mode: 1
@@ -498,7 +516,7 @@ MonoBehaviour:
498516
m_FloatArgument: 0
499517
m_StringArgument:
500518
m_BoolArgument: 0
501-
m_CallState: 1
519+
m_CallState: 2
502520
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
503521
PublicKeyToken=null
504522
--- !u!1 &1525392731
@@ -575,6 +593,7 @@ MeshRenderer:
575593
m_AutoUVMaxAngle: 89
576594
m_LightmapParameters: {fileID: 0}
577595
m_SortingLayerID: 0
596+
m_SortingLayer: 0
578597
m_SortingOrder: 0
579598
--- !u!135 &1525392735
580599
SphereCollider:
@@ -606,8 +625,8 @@ MonoBehaviour:
606625
m_Script: {fileID: 11500000, guid: e7d6513c2cdf97f409654a2a4114d9b1, type: 3}
607626
m_Name:
608627
m_EditorClassIdentifier:
609-
keywords:
610-
- Keyword: Red
628+
Keywords:
629+
- Keyword: Blue
611630
Response:
612631
m_PersistentCalls:
613632
m_Calls:
@@ -619,7 +638,7 @@ MonoBehaviour:
619638
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
620639
m_IntArgument: 0
621640
m_FloatArgument: 0
622-
m_StringArgument: Red
641+
m_StringArgument: Blue
623642
m_BoolArgument: 0
624643
m_CallState: 2
625644
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
@@ -641,7 +660,7 @@ MonoBehaviour:
641660
m_CallState: 2
642661
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
643662
PublicKeyToken=null
644-
- Keyword: Blue
663+
- Keyword: Red
645664
Response:
646665
m_PersistentCalls:
647666
m_Calls:
@@ -653,7 +672,7 @@ MonoBehaviour:
653672
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
654673
m_IntArgument: 0
655674
m_FloatArgument: 0
656-
m_StringArgument: Blue
675+
m_StringArgument: Red
657676
m_BoolArgument: 0
658677
m_CallState: 2
659678
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
@@ -743,7 +762,7 @@ Light:
743762
m_PrefabInternal: {fileID: 0}
744763
m_GameObject: {fileID: 1724572002}
745764
m_Enabled: 1
746-
serializedVersion: 7
765+
serializedVersion: 8
747766
m_Type: 1
748767
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
749768
m_Intensity: 1
@@ -768,6 +787,8 @@ Light:
768787
m_Lightmapping: 4
769788
m_AreaSize: {x: 1, y: 1}
770789
m_BounceIntensity: 1
790+
m_ColorTemperature: 6570
791+
m_UseColorTemperature: 0
771792
m_ShadowRadius: 0
772793
m_ShadowAngle: 0
773794
--- !u!4 &1724572004
@@ -962,6 +983,7 @@ MeshRenderer:
962983
m_AutoUVMaxAngle: 89
963984
m_LightmapParameters: {fileID: 0}
964985
m_SortingLayerID: 0
986+
m_SortingLayer: 0
965987
m_SortingOrder: 0
966988
--- !u!1 &2114791804
967989
GameObject:
@@ -1013,6 +1035,7 @@ MeshRenderer:
10131035
m_AutoUVMaxAngle: 89
10141036
m_LightmapParameters: {fileID: 0}
10151037
m_SortingLayerID: 0
1038+
m_SortingLayer: 0
10161039
m_SortingOrder: 0
10171040
--- !u!135 &2114791806
10181041
SphereCollider:
@@ -1068,8 +1091,8 @@ MonoBehaviour:
10681091
m_Script: {fileID: 11500000, guid: e7d6513c2cdf97f409654a2a4114d9b1, type: 3}
10691092
m_Name:
10701093
m_EditorClassIdentifier:
1071-
keywords:
1072-
- Keyword: Red
1094+
Keywords:
1095+
- Keyword: Blue
10731096
Response:
10741097
m_PersistentCalls:
10751098
m_Calls:
@@ -1081,7 +1104,7 @@ MonoBehaviour:
10811104
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
10821105
m_IntArgument: 0
10831106
m_FloatArgument: 0
1084-
m_StringArgument: Red
1107+
m_StringArgument: Blue
10851108
m_BoolArgument: 0
10861109
m_CallState: 2
10871110
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
@@ -1103,7 +1126,7 @@ MonoBehaviour:
11031126
m_CallState: 2
11041127
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
11051128
PublicKeyToken=null
1106-
- Keyword: Blue
1129+
- Keyword: Red
11071130
Response:
11081131
m_PersistentCalls:
11091132
m_Calls:
@@ -1115,7 +1138,7 @@ MonoBehaviour:
11151138
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
11161139
m_IntArgument: 0
11171140
m_FloatArgument: 0
1118-
m_StringArgument: Blue
1141+
m_StringArgument: Red
11191142
m_BoolArgument: 0
11201143
m_CallState: 2
11211144
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,

‎Assets/HoloToolkit/Input/Scripts/Editor/SpeechInputHandlerEditor.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ private void ShowList(SerializedProperty list)
5757
// remove the keywords already assigned from the registered list
5858
var handler = (SpeechInputHandler)target;
5959

60-
if (handler.Keywords == null) { return; }
61-
6260
string[] availableKeywords = registeredKeywords.Except(handler.Keywords.Select(keywordAndResponse => keywordAndResponse.Keyword)).ToArray();
6361

6462
// keyword rows

0 commit comments

Comments
 (0)