Skip to content

Commit 4a189e5

Browse files
germanattanasiogermanattanasio
authored
Merge pull request #207 from watson-developer-cloud/develop
Watson Developer Cloud Unity SDK v0.13.0
2 parents c1718ba + 4ebfc10 commit 4a189e5

File tree

330 files changed

+7810
-1081
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

330 files changed

+7810
-1081
lines changed

‎.travis.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,18 @@ language: objective-c
22
osx_image: xcode61
33
rvm:
44
- 2.1.2
5+
cache:
6+
directories:
7+
- ./Unity
8+
before_install:
9+
- chmod a+x ./Travis/installUnity.sh
510
install:
611
- ./Travis/installUnity.sh
12+
before_script:
13+
- chmod a+x ./Travis/createProject.sh
14+
- chmod a+x ./Travis/installSDK.sh
15+
- chmod a+x ./Travis/runTests.sh
16+
- chmod a+x ./Travis/build.sh
717
script:
818
- ./Travis/createProject.sh
919
- ./Travis/installSDK.sh

‎Art/UI/touch-loader.png

100755100644
File mode changed.

‎CHANGELOG.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,29 @@
11
Change Log
22
==========
3+
## Version 0.13.0
4+
_2017-01-25_
5+
6+
* New: Abstracted `Discovery` service.
7+
* Fix: Updated TouchScript plugin.
8+
* New: Updated builds to use Unity 5.5.
9+
* Fix: TextToSpeech Widget now has multi output.
10+
* Fix: Added custom scenes in build editor.
11+
12+
## Version 0.13.0
13+
_2016-12-02_
14+
15+
* Fix: Increased conversation version.
16+
* Fix: Fixed infinite loop in Conversation service example.
17+
318
## Version 0.12.0
4-
_2016-11-4_
19+
_2016-11-04_
20+
521
* New: Added streaming `SpeechToText` example.
622
* New: Abstraction for `Personality Insights V3`
723

824
## Version 0.11.0
925
_2016-10-27_
26+
1027
* New: Abstracted `Speech to Text` customization methods.
1128

1229
## Version 0.10.0

‎Config.json.enc

800 Bytes
Binary file not shown.

‎Docs/UnitySDK.shfbproj

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -37,58 +37,58 @@
3737
<HelpTitle>Watson Unity SDK</HelpTitle>
3838
<ContentPlacement>AboveNamespaces</ContentPlacement>
3939
<DocumentationSources>
40-
<DocumentationSource sourceFile="..\..\..\Temp\UnityVS_bin\Debug\Assembly-CSharp.dll" />
41-
<DocumentationSource sourceFile="..\..\..\Temp\UnityVS_bin\Debug\Assembly-CSharp.xml" />
42-
</DocumentationSources>
40+
<DocumentationSource sourceFile="..\..\..\..\DocumentationBuilder\ConsoleApplication1\ConsoleApplication1\bin\Debug\Assembly-CSharp.dll" />
41+
<DocumentationSource sourceFile="..\..\..\..\DocumentationBuilder\ConsoleApplication1\ConsoleApplication1\bin\Debug\Assembly-CSharp.xml" /></DocumentationSources>
4342
<NamespaceSummaries>
4443
<NamespaceSummaryItem name="DentedPixel.LTEditor" isDocumented="False" />
45-
<NamespaceSummaryItem name="FullSerializer" isDocumented="False" />
46-
<NamespaceSummaryItem name="FullSerializer.Internal" isDocumented="False" />
47-
<NamespaceSummaryItem name="FullSerializer.Internal.DirectConverters" isDocumented="False" />
48-
<NamespaceSummaryItem name="MiniJSON" isDocumented="False" />
49-
<NamespaceSummaryItem name="TouchScript.Examples" isDocumented="False" />
50-
<NamespaceSummaryItem name="TouchScript.Examples.CameraControl" isDocumented="False" />
51-
<NamespaceSummaryItem name="TouchScript.Examples.Checkers" isDocumented="False" />
52-
<NamespaceSummaryItem name="TouchScript.Examples.Colors" isDocumented="False" />
53-
<NamespaceSummaryItem name="TouchScript.Examples.Input" isDocumented="False" />
54-
<NamespaceSummaryItem name="TouchScript.Examples.Multiuser" isDocumented="False" />
55-
<NamespaceSummaryItem name="TouchScript.Examples.Photos" isDocumented="False" />
56-
<NamespaceSummaryItem name="TouchScript.Examples.Portal" isDocumented="False" />
57-
<NamespaceSummaryItem name="TouchScript.Examples.Tap" isDocumented="False" />
58-
<NamespaceSummaryItem name="TouchScript.Examples.UI" isDocumented="False" />
59-
<NamespaceSummaryItem name="UnityStandardAssets.ImageEffects" isDocumented="False" />
60-
<NamespaceSummaryItem name="UnityStandardAssets.Utility" isDocumented="False" />
61-
<NamespaceSummaryItem name="WebSocketSharp" isDocumented="False" />
62-
<NamespaceSummaryItem name="WebSocketSharp.Net" isDocumented="False" />
63-
<NamespaceSummaryItem name="WebSocketSharp.Net.WebSockets" isDocumented="False" />
64-
<NamespaceSummaryItem name="WebSocketSharp.Server" isDocumented="False" />
65-
<NamespaceSummaryItem name="(global)" isDocumented="False" />
66-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Camera" isDocumented="True">Watson Unity SDK camera controls and touch interfaces.</NamespaceSummaryItem>
67-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Connection" isDocumented="True">Connection classes.</NamespaceSummaryItem>
68-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.DataModels" isDocumented="True">Data models for all services.</NamespaceSummaryItem>
69-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.DataTypes" isDocumented="True">Data types for Widget communications.</NamespaceSummaryItem>
70-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Debug" isDocumented="True">Debugging classes.</NamespaceSummaryItem>
71-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Logging" isDocumented="True">Logging subsystem.</NamespaceSummaryItem>
72-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.v1" isDocumented="True">Version 1.0 of all services.</NamespaceSummaryItem>
73-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Utilities" isDocumented="True">Various utility classes.</NamespaceSummaryItem>
74-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Widgets" isDocumented="True">Widget classes.</NamespaceSummaryItem>
75-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services" isDocumented="True">Watson service classes.</NamespaceSummaryItem>
76-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.AlchemyAPI.v1" isDocumented="True">Alchemy API version 1 service abstraction.</NamespaceSummaryItem>
77-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.Conversation.v1" isDocumented="True">Conversation version 1 service abstraction.</NamespaceSummaryItem>
78-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.ConversationExperimental.v1" isDocumented="True">Experimental Conversation service abstraction.</NamespaceSummaryItem>
79-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.DeepQA.v1" isDocumented="True">Deep QA version 1 service abstraction.</NamespaceSummaryItem>
80-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.Dialog.v1" isDocumented="True">Dialog version 1 service abstraction.</NamespaceSummaryItem>
81-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.DocumentConversion.v1" isDocumented="True">Document Conversiont version 1 service abstraction.</NamespaceSummaryItem>
82-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.LanguageTranslator.v1" isDocumented="True">Language Translator version 1 service abstraction.</NamespaceSummaryItem>
83-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.NaturalLanguageClassifier.v1" isDocumented="True">Natural Language Classifier version 1 service abstraction.</NamespaceSummaryItem>
84-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.PersonalityInsights.v2" isDocumented="True">Personality Insightst version 2 service abstraction.</NamespaceSummaryItem>
85-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.RetrieveAndRank.v1" isDocumented="True">Retrieve and Rankt version 1 service abstraction.</NamespaceSummaryItem>
86-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.SpeechToText.v1" isDocumented="True">Speech to Text version 1 service abstraction.</NamespaceSummaryItem>
87-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.TextToSpeech.v1" isDocumented="True">Text to Speech version 1 service abstraction.</NamespaceSummaryItem>
88-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.ToneAnalyzer.v3" isDocumented="True">Tone Analyzer version 3 service abstraction.</NamespaceSummaryItem>
89-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.TradeoffAnalytics.v1" isDocumented="True">Tradeoff Analytics version 1 service abstraction.</NamespaceSummaryItem>
90-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.VisualRecognition.v3" isDocumented="True">Visual Recognitionr version 3 service abstraction.</NamespaceSummaryItem>
91-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.LanguageTranslation.v1" isDocumented="True">Language Translation version 1 service abstraction.</NamespaceSummaryItem></NamespaceSummaries>
44+
<NamespaceSummaryItem name="FullSerializer" isDocumented="False" />
45+
<NamespaceSummaryItem name="FullSerializer.Internal" isDocumented="False" />
46+
<NamespaceSummaryItem name="FullSerializer.Internal.DirectConverters" isDocumented="False" />
47+
<NamespaceSummaryItem name="MiniJSON" isDocumented="False" />
48+
<NamespaceSummaryItem name="TouchScript.Examples" isDocumented="False" />
49+
<NamespaceSummaryItem name="TouchScript.Examples.CameraControl" isDocumented="False" />
50+
<NamespaceSummaryItem name="TouchScript.Examples.Checkers" isDocumented="False" />
51+
<NamespaceSummaryItem name="TouchScript.Examples.Colors" isDocumented="False" />
52+
<NamespaceSummaryItem name="TouchScript.Examples.Input" isDocumented="False" />
53+
<NamespaceSummaryItem name="TouchScript.Examples.Multiuser" isDocumented="False" />
54+
<NamespaceSummaryItem name="TouchScript.Examples.Photos" isDocumented="False" />
55+
<NamespaceSummaryItem name="TouchScript.Examples.Portal" isDocumented="False" />
56+
<NamespaceSummaryItem name="TouchScript.Examples.Tap" isDocumented="False" />
57+
<NamespaceSummaryItem name="TouchScript.Examples.UI" isDocumented="False" />
58+
<NamespaceSummaryItem name="UnityStandardAssets.ImageEffects" isDocumented="False" />
59+
<NamespaceSummaryItem name="UnityStandardAssets.Utility" isDocumented="False" />
60+
<NamespaceSummaryItem name="WebSocketSharp" isDocumented="False" />
61+
<NamespaceSummaryItem name="WebSocketSharp.Net" isDocumented="False" />
62+
<NamespaceSummaryItem name="WebSocketSharp.Net.WebSockets" isDocumented="False" />
63+
<NamespaceSummaryItem name="WebSocketSharp.Server" isDocumented="False" />
64+
<NamespaceSummaryItem name="(global)" isDocumented="False" />
65+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Camera" isDocumented="True">Watson Unity SDK camera controls and touch interfaces.</NamespaceSummaryItem>
66+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Connection" isDocumented="True">Connection classes.</NamespaceSummaryItem>
67+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.DataModels" isDocumented="True">Data models for all services.</NamespaceSummaryItem>
68+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.DataTypes" isDocumented="True">Data types for Widget communications.</NamespaceSummaryItem>
69+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Debug" isDocumented="True">Debugging classes.</NamespaceSummaryItem>
70+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Logging" isDocumented="True">Logging subsystem.</NamespaceSummaryItem>
71+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.v1" isDocumented="True">Version 1.0 of all services.</NamespaceSummaryItem>
72+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Utilities" isDocumented="True">Various utility classes.</NamespaceSummaryItem>
73+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Widgets" isDocumented="True">Widget classes.</NamespaceSummaryItem>
74+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services" isDocumented="True">Watson service classes.</NamespaceSummaryItem>
75+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.AlchemyAPI.v1" isDocumented="True">Alchemy API version 1 service abstraction.</NamespaceSummaryItem>
76+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.Conversation.v1" isDocumented="True">Conversation version 1 service abstraction.</NamespaceSummaryItem>
77+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.ConversationExperimental.v1" isDocumented="True">Experimental Conversation service abstraction.</NamespaceSummaryItem>
78+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.DeepQA.v1" isDocumented="True">Deep QA version 1 service abstraction.</NamespaceSummaryItem>
79+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.Dialog.v1" isDocumented="True">Dialog version 1 service abstraction.</NamespaceSummaryItem>
80+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.DocumentConversion.v1" isDocumented="True">Document Conversiont version 1 service abstraction.</NamespaceSummaryItem>
81+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.LanguageTranslator.v1" isDocumented="True">Language Translator version 1 service abstraction.</NamespaceSummaryItem>
82+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.NaturalLanguageClassifier.v1" isDocumented="True">Natural Language Classifier version 1 service abstraction.</NamespaceSummaryItem>
83+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.PersonalityInsights.v2" isDocumented="True">Personality Insightst version 2 service abstraction.</NamespaceSummaryItem>
84+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.RetrieveAndRank.v1" isDocumented="True">Retrieve and Rankt version 1 service abstraction.</NamespaceSummaryItem>
85+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.SpeechToText.v1" isDocumented="True">Speech to Text version 1 service abstraction.</NamespaceSummaryItem>
86+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.TextToSpeech.v1" isDocumented="True">Text to Speech version 1 service abstraction.</NamespaceSummaryItem>
87+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.ToneAnalyzer.v3" isDocumented="True">Tone Analyzer version 3 service abstraction.</NamespaceSummaryItem>
88+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.TradeoffAnalytics.v1" isDocumented="True">Tradeoff Analytics version 1 service abstraction.</NamespaceSummaryItem>
89+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.VisualRecognition.v3" isDocumented="True">Visual Recognitionr version 3 service abstraction.</NamespaceSummaryItem>
90+
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.LanguageTranslation.v1" isDocumented="True">Language Translation version 1 service abstraction.</NamespaceSummaryItem>
91+
</NamespaceSummaries>
9292
<ApiFilter>
9393
<Filter entryType="Namespace" fullName="" isExposed="False" />
9494
<Filter entryType="Namespace" fullName="FullSerializer" isExposed="False" />

‎Examples/ServiceExamples/ExampleStreaming.unity

100755100644
File mode changed.

‎Examples/ServiceExamples/ExampleStreaming.unity.meta

100755100644
File mode changed.

‎Examples/ServiceExamples/Scripts/ExampleAlchemyDataNews.cs

100755100644
File mode changed.

‎Examples/ServiceExamples/Scripts/ExampleAlchemyDataNews.cs.meta

100755100644
File mode changed.

‎Examples/ServiceExamples/Scripts/ExampleAlchemyLanguage.cs

100755100644
File mode changed.

‎Examples/ServiceExamples/Scripts/ExampleConversation.cs

100755100644
Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ private void OnMessageWithOnlyInput(MessageResponse resp, string customData)
5151
if (resp != null)
5252
{
5353
foreach (Intent mi in resp.intents)
54-
Debug.Log("intent: " + mi.intent + ", confidence: " + mi.confidence);
54+
Debug.Log("Message Only intent: " + mi.intent + ", confidence: " + mi.confidence);
5555

5656
if (resp.output != null && resp.output.text.Length > 0)
5757
foreach (string txt in resp.output.text)
58-
Debug.Log("output: " + txt);
58+
Debug.Log("Message Only output: " + txt);
5959

6060
string questionStr = questionArray[UnityEngine.Random.Range(0, questionArray.Length - 1)];
6161
Debug.Log(string.Format("**********User: {0}", questionStr));
@@ -69,14 +69,39 @@ private void OnMessageWithOnlyInput(MessageResponse resp, string customData)
6969
}
7070
else
7171
{
72-
Debug.Log("Failed to invoke Message();");
72+
Debug.Log("Message Only: Failed to invoke Message();");
7373
}
7474
}
7575

7676
private void MessageWithFullMessageRequest(MessageRequest messageRequest)
7777
{
7878
if (messageRequest == null)
7979
throw new ArgumentNullException("messageRequest");
80-
m_Conversation.Message(OnMessageWithOnlyInput, m_WorkspaceID, messageRequest);
80+
m_Conversation.Message(OnMessageWithFullRequest, m_WorkspaceID, messageRequest);
81+
}
82+
83+
private void OnMessageWithFullRequest(MessageResponse resp, string customData)
84+
{
85+
if (resp != null)
86+
{
87+
foreach (Intent mi in resp.intents)
88+
Debug.Log("Full Request intent: " + mi.intent + ", confidence: " + mi.confidence);
89+
90+
if (resp.output != null && resp.output.text.Length > 0)
91+
foreach (string txt in resp.output.text)
92+
Debug.Log("Full Request output: " + txt);
93+
94+
string questionStr = questionArray[UnityEngine.Random.Range(0, questionArray.Length - 1)];
95+
Debug.Log(string.Format("**********User: {0}", questionStr));
96+
97+
MessageRequest messageRequest = new MessageRequest();
98+
messageRequest.InputText = questionStr;
99+
messageRequest.alternate_intents = m_UseAlternateIntents;
100+
messageRequest.ContextData = resp.context;
101+
}
102+
else
103+
{
104+
Debug.Log("Full Request: Failed to invoke Message();");
105+
}
81106
}
82107
}

‎Examples/ServiceExamples/Scripts/ExampleConversationExperimental.cs

100755100644
File mode changed.

‎Examples/ServiceExamples/Scripts/ExampleConversationExperimental.cs.meta

100755100644
File mode changed.

0 commit comments

Comments
 (0)