Skip to content

Commit e32e1e1

Browse files
Merge pull request #1106 from HattMarris1/master
Updated medical example to use SpeechInputSource.cs and SpeechInputHandler.cs
2 parents 02249bb + ce61952 commit e32e1e1

File tree

1 file changed

+43
-28
lines changed

1 file changed

+43
-28
lines changed

Assets/HoloToolkit-Examples/Medical/Scenes/MedicalExample.unity

Lines changed: 43 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
41+
m_IndirectSpecularColor: {r: 0.44657874, g: 0.4964127, b: 0.5748172, a: 1}
4242
--- !u!157 &3
4343
LightmapSettings:
4444
m_ObjectHideFlags: 0
@@ -777,20 +777,6 @@ Light:
777777
m_Lightmapping: 4
778778
m_AreaSize: {x: 1, y: 1}
779779
m_BounceIntensity: 1
780-
m_FalloffTable:
781-
m_Table[0]: 0
782-
m_Table[1]: 0
783-
m_Table[2]: 0
784-
m_Table[3]: 0
785-
m_Table[4]: 0
786-
m_Table[5]: 0
787-
m_Table[6]: 0
788-
m_Table[7]: 0
789-
m_Table[8]: 0
790-
m_Table[9]: 0
791-
m_Table[10]: 0
792-
m_Table[11]: 0
793-
m_Table[12]: 0
794780
m_ColorTemperature: 6570
795781
m_UseColorTemperature: 0
796782
m_ShadowRadius: 0
@@ -1449,8 +1435,9 @@ GameObject:
14491435
serializedVersion: 5
14501436
m_Component:
14511437
- component: {fileID: 2116398419}
1452-
- component: {fileID: 2116398418}
14531438
- component: {fileID: 2116398420}
1439+
- component: {fileID: 2116398421}
1440+
- component: {fileID: 2116398418}
14541441
m_Layer: 0
14551442
m_Name: Managers
14561443
m_TagString: Untagged
@@ -1466,13 +1453,11 @@ MonoBehaviour:
14661453
m_GameObject: {fileID: 2116398417}
14671454
m_Enabled: 1
14681455
m_EditorHideFlags: 0
1469-
m_Script: {fileID: 11500000, guid: 3f2795b3e072e1745a4f8c670d64284f, type: 3}
1456+
m_Script: {fileID: 11500000, guid: e7d6513c2cdf97f409654a2a4114d9b1, type: 3}
14701457
m_Name:
14711458
m_EditorClassIdentifier:
1472-
RecognizerStart: 0
1473-
KeywordsAndResponses:
1459+
Keywords:
14741460
- Keyword: slice x on
1475-
KeyCode: 0
14761461
Response:
14771462
m_PersistentCalls:
14781463
m_Calls:
@@ -1490,7 +1475,6 @@ MonoBehaviour:
14901475
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
14911476
PublicKeyToken=null
14921477
- Keyword: slice x off
1493-
KeyCode: 0
14941478
Response:
14951479
m_PersistentCalls:
14961480
m_Calls:
@@ -1508,7 +1492,6 @@ MonoBehaviour:
15081492
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
15091493
PublicKeyToken=null
15101494
- Keyword: slice y on
1511-
KeyCode: 0
15121495
Response:
15131496
m_PersistentCalls:
15141497
m_Calls:
@@ -1526,7 +1509,6 @@ MonoBehaviour:
15261509
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
15271510
PublicKeyToken=null
15281511
- Keyword: slice y off
1529-
KeyCode: 0
15301512
Response:
15311513
m_PersistentCalls:
15321514
m_Calls:
@@ -1544,7 +1526,6 @@ MonoBehaviour:
15441526
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
15451527
PublicKeyToken=null
15461528
- Keyword: slice z on
1547-
KeyCode: 0
15481529
Response:
15491530
m_PersistentCalls:
15501531
m_Calls:
@@ -1562,7 +1543,6 @@ MonoBehaviour:
15621543
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
15631544
PublicKeyToken=null
15641545
- Keyword: slice z off
1565-
KeyCode: 0
15661546
Response:
15671547
m_PersistentCalls:
15681548
m_Calls:
@@ -1580,7 +1560,6 @@ MonoBehaviour:
15801560
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
15811561
PublicKeyToken=null
15821562
- Keyword: thick slices on
1583-
KeyCode: 0
15841563
Response:
15851564
m_PersistentCalls:
15861565
m_Calls:
@@ -1598,7 +1577,6 @@ MonoBehaviour:
15981577
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
15991578
PublicKeyToken=null
16001579
- Keyword: thick slices off
1601-
KeyCode: 0
16021580
Response:
16031581
m_PersistentCalls:
16041582
m_Calls:
@@ -1616,7 +1594,6 @@ MonoBehaviour:
16161594
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
16171595
PublicKeyToken=null
16181596
- Keyword: place
1619-
KeyCode: 0
16201597
Response:
16211598
m_PersistentCalls:
16221599
m_Calls:
@@ -1633,6 +1610,8 @@ MonoBehaviour:
16331610
m_CallState: 2
16341611
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
16351612
PublicKeyToken=null
1613+
IsGlobalListener: 1
1614+
PersistentKeywords: 0
16361615
--- !u!4 &2116398419
16371616
Transform:
16381617
m_ObjectHideFlags: 0
@@ -1658,3 +1637,39 @@ MonoBehaviour:
16581637
m_Script: {fileID: 11500000, guid: f122ca4ae6b527e4798205becf9a0550, type: 3}
16591638
m_Name:
16601639
m_EditorClassIdentifier:
1640+
AnchorDebugText: {fileID: 0}
1641+
ShowDetailedLogs: 0
1642+
PersistentAnchors: 0
1643+
--- !u!114 &2116398421
1644+
MonoBehaviour:
1645+
m_ObjectHideFlags: 0
1646+
m_PrefabParentObject: {fileID: 0}
1647+
m_PrefabInternal: {fileID: 0}
1648+
m_GameObject: {fileID: 2116398417}
1649+
m_Enabled: 1
1650+
m_EditorHideFlags: 0
1651+
m_Script: {fileID: 11500000, guid: c62fd7a55ba7458499b69cae18f83806, type: 3}
1652+
m_Name:
1653+
m_EditorClassIdentifier:
1654+
PersistentKeywords: 1
1655+
RecognizerStart: 0
1656+
Keywords:
1657+
- Keyword: slice x on
1658+
KeyCode: 49
1659+
- Keyword: slice x off
1660+
KeyCode: 50
1661+
- Keyword: slice y on
1662+
KeyCode: 51
1663+
- Keyword: slice y off
1664+
KeyCode: 52
1665+
- Keyword: slice z on
1666+
KeyCode: 53
1667+
- Keyword: slice z off
1668+
KeyCode: 54
1669+
- Keyword: thick slices on
1670+
KeyCode: 55
1671+
- Keyword: thick slices off
1672+
KeyCode: 56
1673+
- Keyword: place
1674+
KeyCode: 57
1675+
recognitionConfidenceLevel: 1

0 commit comments

Comments
 (0)