Skip to content

Commit 0fd3db4

Browse files
mediumTajmediumTaj
authored
Merge pull request #111 from watson-developer-cloud/develop
Unity SDK v0.6.1
2 parents 8bcdc79 + 90c55d8 commit 0fd3db4

Some content is hidden

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

46 files changed

+1701
-411
lines changed

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
Change Log
22
==========
3+
## Version 0.6.1
4+
_2016-07-17_
5+
6+
* Fix: Updated documentation
7+
38
## Version 0.6.0
49

510
_2016-07-15_

‎Config.json.enc

0 Bytes
Binary file not shown.

‎Docs/UnitySDK.shfbproj

Lines changed: 41 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<Name>Documentation</Name>
1515
<!-- SHFB properties -->
1616
<FrameworkVersion>.NET Framework 3.5</FrameworkVersion>
17-
<OutputPath>..\Assets\Watson\Editor\Help\</OutputPath>
17+
<OutputPath>..\Scripts\Editor\Help\</OutputPath>
1818
<HtmlHelpName>WatsonUnitySDK</HtmlHelpName>
1919
<Language>en-US</Language>
2020
<ComponentPath>
@@ -25,7 +25,7 @@
2525
<KeepLogFile>False</KeepLogFile>
2626
<DisableCodeBlockComponent>False</DisableCodeBlockComponent>
2727
<CleanIntermediates>True</CleanIntermediates>
28-
<HelpFileVersion>1.0.0.0</HelpFileVersion>
28+
<HelpFileVersion>1.1.0.0</HelpFileVersion>
2929
<MaximumGroupParts>2</MaximumGroupParts>
3030
<NamespaceGrouping>False</NamespaceGrouping>
3131
<SyntaxFilters>C#</SyntaxFilters>
@@ -37,8 +37,8 @@
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" />
40+
<DocumentationSource sourceFile="..\..\..\Temp\UnityVS_bin\Debug\Assembly-CSharp.dll" />
41+
<DocumentationSource sourceFile="..\..\..\Temp\UnityVS_bin\Debug\Assembly-CSharp.xml" />
4242
</DocumentationSources>
4343
<NamespaceSummaries>
4444
<NamespaceSummaryItem name="DentedPixel.LTEditor" isDocumented="False" />
@@ -72,18 +72,28 @@
7272
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.v1" isDocumented="True">Version 1.0 of all services.</NamespaceSummaryItem>
7373
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Utilities" isDocumented="True">Various utility classes.</NamespaceSummaryItem>
7474
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Widgets" isDocumented="True">Widget classes.</NamespaceSummaryItem>
75-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services" isDocumented="True">Watson service classes.</NamespaceSummaryItem></NamespaceSummaries>
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>
7692
<ApiFilter>
7793
<Filter entryType="Namespace" fullName="" isExposed="False" />
7894
<Filter entryType="Namespace" fullName="FullSerializer" isExposed="False" />
7995
<Filter entryType="Namespace" fullName="FullSerializer.Internal" isExposed="False" />
8096
<Filter entryType="Namespace" fullName="FullSerializer.Internal.DirectConverters" isExposed="False" />
81-
<Filter entryType="Namespace" fullName="FullSerializer.Speedup" isExposed="False" />
82-
<Filter entryType="Namespace" fullName="IBM.Watson.DeveloperCloud.DataModels" isExposed="True">
83-
<Filter entryType="Class" fullName="IBM.Watson.DeveloperCloud.DataModels.SpeechResultList" filterName="SpeechResultList" isExposed="True">
84-
<Filter entryType="Constructor" fullName="IBM.Watson.DeveloperCloud.DataModels.SpeechResultList.#ctor" filterName=".ctor" isExposed="False" />
85-
</Filter>
86-
</Filter>
8797
<Filter entryType="Namespace" fullName="IBM.Watson.DeveloperCloud.DataTypes" isExposed="True">
8898
<Filter entryType="Class" fullName="IBM.Watson.DeveloperCloud.DataTypes.AudioData" filterName="AudioData" isExposed="True">
8999
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.DataTypes.AudioData.Finalize" filterName="Finalize" isExposed="False" />
@@ -96,32 +106,9 @@
96106
</Filter>
97107
</Filter>
98108
<Filter entryType="Namespace" fullName="IBM.Watson.DeveloperCloud.Editor" isExposed="False" />
99-
<Filter entryType="Namespace" fullName="IBM.Watson.DeveloperCloud.Services.v1" isExposed="True">
100-
<Filter entryType="Class" fullName="IBM.Watson.DeveloperCloud.Services.v1.Dialog" filterName="Dialog" isExposed="True">
101-
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Services.v1.Dialog.GetServiceID" filterName="GetServiceID" isExposed="False" />
102-
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Services.v1.Dialog.GetServiceStatus" filterName="GetServiceStatus" isExposed="False" />
103-
</Filter>
104-
<Filter entryType="Class" fullName="IBM.Watson.DeveloperCloud.Services.v1.LanguageClassifier" filterName="LanguageClassifier" isExposed="True">
105-
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Services.v1.LanguageClassifier.GetServiceID" filterName="GetServiceID" isExposed="False" />
106-
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Services.v1.LanguageClassifier.GetServiceStatus" filterName="GetServiceStatus" isExposed="False" />
107-
</Filter>
108-
<Filter entryType="Class" fullName="IBM.Watson.DeveloperCloud.Services.v1.SpeechToText" filterName="SpeechToText" isExposed="True">
109-
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Services.v1.SpeechToText.GetServiceID" filterName="GetServiceID" isExposed="False" />
110-
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Services.v1.SpeechToText.GetServiceStatus" filterName="GetServiceStatus" isExposed="False" />
111-
</Filter>
112-
<Filter entryType="Class" fullName="IBM.Watson.DeveloperCloud.Services.v1.TextToSpeech" filterName="TextToSpeech" isExposed="True">
113-
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Services.v1.TextToSpeech.GetServiceID" filterName="GetServiceID" isExposed="False" />
114-
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Services.v1.TextToSpeech.GetServiceStatus" filterName="GetServiceStatus" isExposed="False" />
115-
</Filter>
116-
<Filter entryType="Class" fullName="IBM.Watson.DeveloperCloud.Services.v1.Translate" filterName="Translate" isExposed="True">
117-
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Services.v1.Translate.GetServiceID" filterName="GetServiceID" isExposed="False" />
118-
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Services.v1.Translate.GetServiceStatus" filterName="GetServiceStatus" isExposed="False" />
119-
</Filter>
120-
</Filter>
121109
<Filter entryType="Namespace" fullName="IBM.Watson.DeveloperCloud.UnitTests" isExposed="False" />
122110
<Filter entryType="Namespace" fullName="IBM.Watson.DeveloperCloud.Utilities" isExposed="True">
123111
<Filter entryType="Class" fullName="IBM.Watson.DeveloperCloud.Utilities.Constants.String" filterName="Constants.String" isExposed="True">
124-
<Filter entryType="Field" fullName="IBM.Watson.DeveloperCloud.Utilities.Constants.String.DEBUG_DISPLAY_AVATAR_MOOD" filterName="DEBUG_DISPLAY_AVATAR_MOOD" isExposed="False" />
125112
<Filter entryType="Field" fullName="IBM.Watson.DeveloperCloud.Utilities.Constants.String.DEBUG_DISPLAY_QUALITY" filterName="DEBUG_DISPLAY_QUALITY" isExposed="False" />
126113
</Filter>
127114
</Filter>
@@ -148,10 +135,6 @@
148135
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Widgets.MicrophoneWidget.GetName" filterName="GetName" isExposed="False" />
149136
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Widgets.MicrophoneWidget.Start" filterName="Start" isExposed="False" />
150137
</Filter>
151-
<Filter entryType="Class" fullName="IBM.Watson.DeveloperCloud.Widgets.NlcWidget" filterName="NlcWidget" isExposed="True">
152-
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Widgets.NlcWidget.GetName" filterName="GetName" isExposed="False" />
153-
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Widgets.NlcWidget.Start" filterName="Start" isExposed="False" />
154-
</Filter>
155138
<Filter entryType="Class" fullName="IBM.Watson.DeveloperCloud.Widgets.SpeechDisplayWidget" filterName="SpeechDisplayWidget" isExposed="True">
156139
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Widgets.SpeechDisplayWidget.GetName" filterName="GetName" isExposed="False" />
157140
</Filter>
@@ -166,11 +149,6 @@
166149
<Filter entryType="Class" fullName="IBM.Watson.DeveloperCloud.Widgets.TouchWidget" filterName="TouchWidget" isExposed="True">
167150
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Widgets.TouchWidget.GetName" filterName="GetName" isExposed="False" />
168151
</Filter>
169-
<Filter entryType="Class" fullName="IBM.Watson.DeveloperCloud.Widgets.TranslateWidget" filterName="TranslateWidget" isExposed="True">
170-
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Widgets.TranslateWidget.Awake" filterName="Awake" isExposed="False" />
171-
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Widgets.TranslateWidget.GetName" filterName="GetName" isExposed="False" />
172-
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Widgets.TranslateWidget.Start" filterName="Start" isExposed="False" />
173-
</Filter>
174152
<Filter entryType="Class" fullName="IBM.Watson.DeveloperCloud.Widgets.Widget" filterName="Widget" isExposed="True">
175153
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Widgets.Widget.Awake" filterName="Awake" isExposed="False" />
176154
<Filter entryType="Method" fullName="IBM.Watson.DeveloperCloud.Widgets.Widget.Start" filterName="Start" isExposed="False" />
@@ -183,26 +161,33 @@
183161
</Filter>
184162
</Filter>
185163
<Filter entryType="Namespace" fullName="MiniJSON" isExposed="False" />
186-
<Filter entryType="Namespace" fullName="TouchScript.Examples" isExposed="False" />
187-
<Filter entryType="Namespace" fullName="TouchScript.Examples.CameraControl" isExposed="False" />
188-
<Filter entryType="Namespace" fullName="TouchScript.Examples.Checkers" isExposed="False" />
189-
<Filter entryType="Namespace" fullName="TouchScript.Examples.Colors" isExposed="False" />
190-
<Filter entryType="Namespace" fullName="TouchScript.Examples.Input" isExposed="False" />
191-
<Filter entryType="Namespace" fullName="TouchScript.Examples.Multiuser" isExposed="False" />
192-
<Filter entryType="Namespace" fullName="TouchScript.Examples.Photos" isExposed="False" />
193-
<Filter entryType="Namespace" fullName="TouchScript.Examples.Portal" isExposed="False" />
194-
<Filter entryType="Namespace" fullName="TouchScript.Examples.Tap" isExposed="False" />
195-
<Filter entryType="Namespace" fullName="TouchScript.Examples.UI" isExposed="False" />
196-
<Filter entryType="Namespace" fullName="UnityStandardAssets.ImageEffects" isExposed="False" />
197-
<Filter entryType="Namespace" fullName="UnityStandardAssets.Utility" isExposed="False" />
164+
<Filter entryType="Namespace" fullName="TouchScript" isExposed="False" />
165+
<Filter entryType="Namespace" fullName="TouchScript.Behaviors" isExposed="False" />
166+
<Filter entryType="Namespace" fullName="TouchScript.Behaviors.Visualizer" isExposed="False" />
167+
<Filter entryType="Namespace" fullName="TouchScript.Clusters" isExposed="False" />
168+
<Filter entryType="Namespace" fullName="TouchScript.Devices.Display" isExposed="False" />
169+
<Filter entryType="Namespace" fullName="TouchScript.Gestures" isExposed="False" />
170+
<Filter entryType="Namespace" fullName="TouchScript.Gestures.Base" isExposed="False" />
171+
<Filter entryType="Namespace" fullName="TouchScript.Gestures.Clustered" isExposed="False" />
172+
<Filter entryType="Namespace" fullName="TouchScript.Gestures.UI" isExposed="False" />
173+
<Filter entryType="Namespace" fullName="TouchScript.Hit" isExposed="False" />
174+
<Filter entryType="Namespace" fullName="TouchScript.InputSources" isExposed="False" />
175+
<Filter entryType="Namespace" fullName="TouchScript.InputSources.InputHandlers" isExposed="False" />
176+
<Filter entryType="Namespace" fullName="TouchScript.Layers" isExposed="False" />
177+
<Filter entryType="Namespace" fullName="TouchScript.Utils" isExposed="False" />
178+
<Filter entryType="Namespace" fullName="TouchScript.Utils.Attributes" isExposed="False" />
179+
<Filter entryType="Namespace" fullName="TouchScript.Utils.Geom" isExposed="False" />
198180
<Filter entryType="Namespace" fullName="WebSocketSharp" isExposed="False" />
199181
<Filter entryType="Namespace" fullName="WebSocketSharp.Net" isExposed="False" />
200182
<Filter entryType="Namespace" fullName="WebSocketSharp.Net.WebSockets" isExposed="False" />
201183
<Filter entryType="Namespace" fullName="WebSocketSharp.Server" isExposed="False" />
202184
</ApiFilter>
203-
<VisibleItems>Protected, ProtectedInternalAsProtected</VisibleItems>
185+
<VisibleItems>ProtectedInternalAsProtected</VisibleItems>
204186
<RootNamespaceTitle>IBM.Watson</RootNamespaceTitle>
205187
<MissingTags>Summary, Parameter, Returns, AutoDocumentCtors, Namespace, TypeParameter, AutoDocumentDispose</MissingTags>
188+
<HtmlHelp1xCompilerPath>
189+
</HtmlHelp1xCompilerPath>
190+
<SaveComponentCacheCapacity>100</SaveComponentCacheCapacity>
206191
</PropertyGroup>
207192
<!-- There are no properties for these groups. AnyCPU needs to appear in order for Visual Studio to perform
208193
the build. The others are optional common platform types that may appear. -->

‎Examples/ServiceExamples/Scripts/ExamplePersonalityInsights.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ void Start ()
2929
LogSystem.InstallDefaultReactors();
3030
string dataPath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/personalityInsights.json";
3131

32-
if(!m_personalityInsights.GetProfile(OnGetProfile, dataPath, DataModels.ContentType.TEXT_PLAIN, DataModels.Language.ENGLISH))
32+
if(!m_personalityInsights.GetProfile(OnGetProfile, dataPath, ContentType.TEXT_PLAIN, Language.ENGLISH))
3333
Log.Debug("ExamplePersonalityInsights", "Failed to get profile!");
3434
}
3535

36-
private void OnGetProfile(DataModels.Profile profile, string data)
36+
private void OnGetProfile(Profile profile, string data)
3737
{
3838
Log.Debug("ExamplePersonalityInsights", "data: {0}", data);
3939
if(profile != null)
@@ -60,7 +60,7 @@ private void OnGetProfile(DataModels.Profile profile, string data)
6060
}
6161
}
6262

63-
private void LogTraitTree(DataModels.TraitTreeNode traitTreeNode)
63+
private void LogTraitTree(TraitTreeNode traitTreeNode)
6464
{
6565
if(!string.IsNullOrEmpty(traitTreeNode.id))
6666
Log.Debug("ExamplePersonalityInsights", "id: {0}", traitTreeNode.id);
@@ -77,7 +77,7 @@ private void LogTraitTree(DataModels.TraitTreeNode traitTreeNode)
7777
if(!string.IsNullOrEmpty(traitTreeNode.raw_sampling_error))
7878
Log.Debug("ExamplePersonalityInsights", "raw_sampling_error: {0}", traitTreeNode.raw_sampling_error);
7979
if(traitTreeNode.children != null && traitTreeNode.children.Length > 0)
80-
foreach(DataModels.TraitTreeNode childNode in traitTreeNode.children)
80+
foreach(TraitTreeNode childNode in traitTreeNode.children)
8181
LogTraitTree(childNode);
8282
}
8383
}

‎Scripts/Camera/CameraTarget.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,10 @@ void Update()
278278

279279
#region public Functions
280280

281+
/// <summary>
282+
/// Sets the target position with offset.
283+
/// </summary>
284+
/// <param name="offsetPosition"></param>
281285
public void SetTargetPositionWithOffset(Vector3 offsetPosition)
282286
{
283287
m_OffsetPosition = offsetPosition;

‎Scripts/Camera/WatsonCamera.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ public class WatsonCamera : MonoBehaviour
5656

5757
#region Public Variable
5858

59+
/// <summary>
60+
/// Static instance of WatsonCamera.
61+
/// </summary>
5962
public static WatsonCamera Instance
6063
{
6164
get
@@ -64,6 +67,9 @@ public static WatsonCamera Instance
6467
}
6568
}
6669

70+
/// <summary>
71+
/// The camera's current target.
72+
/// </summary>
6773
public CameraTarget CurrentCameraTarget
6874
{
6975
get
@@ -106,6 +112,9 @@ public CameraTarget CurrentCameraTarget
106112
}
107113
}
108114

115+
/// <summary>
116+
/// The camera's default target.
117+
/// </summary>
109118
public CameraTarget DefaultCameraTarget
110119
{
111120
get

‎Scripts/Editor/Help/WatsonUnitySDK.chm

100644100755
1.35 MB
Binary file not shown.

‎Scripts/Editor/Help/WatsonUnitySDK.chm.meta

100644100755
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)