Merge branch 'develop' into feature-fix-149-TouchWidget

ereneld · ereneld · commit a9c274de552c · 2016-09-05T16:43:28.000-05:00
diff --git a/Config.json.enc b/Config.json.enc
diff --git a/Examples/ServiceExamples/Scripts/ExampleAlchemyLanguage.cs b/Examples/ServiceExamples/Scripts/ExampleAlchemyLanguage.cs
@@ -20,6 +20,8 @@
 using IBM.Watson.DeveloperCloud.Services.AlchemyAPI.v1;
 using IBM.Watson.DeveloperCloud.Logging;
 
+#pragma warning disable 0219
+#pragma warning disable 0414
 public class ExampleAlchemyLanguage : MonoBehaviour
 {
     private AlchemyAPI m_AlchemyAPI = new AlchemyAPI();
@@ -52,7 +54,7 @@ void Start()
         //    Log.Debug("ExampleAlchemyLanguage", "Failed to get concepts HTML POST!");
 
         ////Get Concepts URL POST
-        //if (!m_AlchemyAPI.GetRankedConcepts(OnGetConcepts, m_ExampleURL_watsonJeopardy))
+        //if (!m_AlchemyAPI.GetRankedConcepts(OnGetCzoncepts, m_ExampleURL_watsonJeopardy))
         //    Log.Debug("ExampleAlchemyLanguage", "Failed to get concepts HTML POST!");
 
         ////Get Date URL POST
diff --git a/Examples/ServiceExamples/Scripts/ExampleRetrieveAndRank.cs b/Examples/ServiceExamples/Scripts/ExampleRetrieveAndRank.cs
@@ -25,6 +25,7 @@
 using UnityEditor;
 #endif
 
+#pragma warning disable 219
 public class ExampleRetrieveAndRank : MonoBehaviour
 {
     private RetrieveAndRank m_RetrieveAndRank = new RetrieveAndRank();
diff --git a/Examples/ServiceExamples/Scripts/ExampleTextToSpeech.cs b/Examples/ServiceExamples/Scripts/ExampleTextToSpeech.cs
@@ -18,6 +18,7 @@
 using UnityEngine;
 using IBM.Watson.DeveloperCloud.Services.TextToSpeech.v1;
 using IBM.Watson.DeveloperCloud.Logging;
+#pragma warning disable 0414
 
 public class ExampleTextToSpeech : MonoBehaviour
 {
diff --git a/Examples/ServiceExamples/Scripts/ExampleVisualRecognition.cs b/Examples/ServiceExamples/Scripts/ExampleVisualRecognition.cs
@@ -22,6 +22,8 @@
 using IBM.Watson.DeveloperCloud.Logging;
 using IBM.Watson.DeveloperCloud.Utilities;
 
+#pragma warning disable 0414
+
 public class ExampleVisualRecognition : MonoBehaviour
 {
     private VisualRecognition m_VisualRecognition = new VisualRecognition();
diff --git a/Scripts/Camera/CameraTarget.cs b/Scripts/Camera/CameraTarget.cs
@@ -15,6 +15,7 @@
 *
 */
 
+//#define SPLINE_INTERPOLATOR
 
 using UnityEngine;
 using IBM.Watson.DeveloperCloud.Logging;
@@ -51,8 +52,10 @@ public class CameraTarget : MonoBehaviour
         private float m_RatioAtCameraPath = 0.0f;
         [SerializeField]
         private Vector3 m_DistanceFromCamera = Vector3.zero;
+        #if SPLINE_INTERPOLATOR
         [SerializeField]
         private SplineInterpolator m_SplineInterpolator;
+        #endif
         private Transform[] m_PathTransforms;
 
         [SerializeField]
@@ -174,6 +177,7 @@ public Vector3 TargetPosition
         {
             get
             {
+                #if SPLINE_INTERPOLATOR
                 if (m_CameraPathRootObject != null)
                 {
                     if (m_PathTransforms == null)
@@ -208,7 +212,9 @@ public Vector3 TargetPosition
                     }
 
                 }
-                else if (m_UseCustomPosition)
+                else 
+                #endif
+                if (m_UseCustomPosition)
                 {
                     return m_CustomPosition;
                 }
@@ -410,6 +416,8 @@ public void SetTargetPositionWithOffset(Vector3 offsetPosition)
 
         #endregion
 
+        #if SPLINE_INTERPOLATOR
+
         void OnDrawGizmos()
         {
             if (m_CameraPathRootObject != null)
@@ -445,6 +453,8 @@ void OnDrawGizmos()
                 }
             }
         }
+
+        #endif
     }
 
 }
diff --git a/Scripts/Connection/WSConnector.cs b/Scripts/Connection/WSConnector.cs
@@ -25,6 +25,8 @@
 using System.Threading;
 using WebSocketSharp;
 
+#pragma warning disable 0618
+
 namespace IBM.Watson.DeveloperCloud.Connection
 {
     /// <summary>
diff --git a/Scripts/Services/PersonalityInsights/PersonalityInsights.cs b/Scripts/Services/PersonalityInsights/PersonalityInsights.cs
@@ -88,8 +88,7 @@ public bool GetProfile(OnGetProfile callback, string source,
             req.Headers["Content-Language"] = contentLanguage;
             req.Headers["Accept"] = accept;
             req.Headers["Accept-Language"] = acceptLanguage;
-
-            string normalizedSource = source.Trim().ToLower();
+            
             if (source.StartsWith(Application.dataPath))
             {
                 string jsonData = default(string);
diff --git a/Scripts/UnitTests/TestAlchemyLanguage.cs b/Scripts/UnitTests/TestAlchemyLanguage.cs
@@ -22,6 +22,9 @@
 using UnityEngine;
 using System.Collections.Generic;
 
+#pragma warning disable 219
+#pragma warning disable 0414
+
 namespace IBM.Watson.DeveloperCloud.UnitTests
 {
     public class TestAlchemyAPI : UnitTest
diff --git a/Scripts/UnitTests/TestConversationExperimental.cs b/Scripts/UnitTests/TestConversationExperimental.cs
@@ -22,6 +22,8 @@
 using IBM.Watson.DeveloperCloud.Utilities;
 using IBM.Watson.DeveloperCloud.Logging;
 
+#pragma warning disable 0169
+#pragma warning disable 0414
 public class TestConversationExperimental// : UnitTest  //  Commented out integration test
 {
 	private ConversationExperimental m_Conversation = new ConversationExperimental();
diff --git a/Scripts/UnitTests/TestLanguageTranslator.cs b/Scripts/UnitTests/TestLanguageTranslator.cs
@@ -20,7 +20,7 @@
 using IBM.Watson.DeveloperCloud.Services.LanguageTranslator.v1;
 using IBM.Watson.DeveloperCloud.Utilities;
 using System.Collections;
-
+#pragma warning disable 0414
 namespace IBM.Watson.DeveloperCloud.UnitTests
 {
     public class TestLanguageTranslator// : UnitTest   //  commented out UnitTest unitl LanguageTranslator goes live
diff --git a/Scripts/UnitTests/TestRetrieveAndRank.cs b/Scripts/UnitTests/TestRetrieveAndRank.cs
@@ -25,6 +25,9 @@
 using IBM.Watson.DeveloperCloud.Utilities;
 using System.Collections.Generic;
 
+#pragma warning disable 0649
+#pragma warning disable 0414
+
 namespace IBM.Watson.DeveloperCloud.UnitTests
 {
     public class TestRetrieveAndRank : UnitTest
diff --git a/Scripts/UnitTests/TestTextToSpeech.cs b/Scripts/UnitTests/TestTextToSpeech.cs
@@ -21,6 +21,7 @@
 using IBM.Watson.DeveloperCloud.Logging;
 using IBM.Watson.DeveloperCloud.Utilities;
 
+#pragma warning disable 0414
 namespace IBM.Watson.DeveloperCloud.UnitTests
 {
     public class TestTextToSpeech : UnitTest
diff --git a/Scripts/UnitTests/TestVisualRecognition.cs b/Scripts/UnitTests/TestVisualRecognition.cs
@@ -24,6 +24,8 @@
 using System;
 using IBM.Watson.DeveloperCloud.Services.VisualRecognition.v3;
 
+#pragma warning disable 0414
+
 namespace IBM.Watson.DeveloperCloud.UnitTests
 {
     public class TestVisualRecognition : UnitTest
diff --git a/Scripts/Widgets/WebCamDisplayWidget.cs b/Scripts/Widgets/WebCamDisplayWidget.cs
@@ -21,6 +21,8 @@
 using UnityEngine.UI;
 using IBM.Watson.DeveloperCloud.Logging;
 
+#pragma warning disable 0414
+
 namespace IBM.Watson.DeveloperCloud.Widgets
 {
 	/// <summary>
diff --git a/Scripts/Widgets/WebCamWidget.cs b/Scripts/Widgets/WebCamWidget.cs
@@ -22,7 +22,7 @@
 using IBM.Watson.DeveloperCloud.Logging;
 using IBM.Watson.DeveloperCloud.Utilities;
 using UnityEngine.UI;
-
+#pragma warning disable 0414
 namespace IBM.Watson.DeveloperCloud.Widgets
 {
     /// <summary>
diff --git a/ThirdParty/TouchScript/Scripts/Devices/Display/GenericDisplayDevice.cs b/ThirdParty/TouchScript/Scripts/Devices/Display/GenericDisplayDevice.cs
@@ -5,6 +5,8 @@
 using System.Text.RegularExpressions;
 using UnityEngine;
 
+#pragma warning disable 0618
+
 namespace TouchScript.Devices.Display
 {
     /// <summary>
diff --git a/ThirdParty/WebSocketSharp/Net/CookieException.cs b/ThirdParty/WebSocketSharp/Net/CookieException.cs
@@ -40,6 +40,8 @@
 using System.Runtime.Serialization;
 using System.Security.Permissions;
 
+#pragma warning disable 0618
+
 namespace WebSocketSharp.Net
 {
   /// <summary>
diff --git a/ThirdParty/WebSocketSharp/Net/WebHeaderCollection.cs b/ThirdParty/WebSocketSharp/Net/WebHeaderCollection.cs
@@ -49,6 +49,8 @@
 using System.Security.Permissions;
 using System.Text;
 
+#pragma warning disable 0618
+
 namespace WebSocketSharp.Net
 {
   /// <summary>
diff --git a/ThirdParty/WebSocketSharp/WebSocket.cs b/ThirdParty/WebSocketSharp/WebSocket.cs
@@ -148,7 +148,7 @@ public class WebSocket : IDisposable
     static WebSocket ()
     {
       EmptyBytes = new byte[0];
-      FragmentLength = 1016;
+      FragmentLength =  Int32.MaxValue - 14; // 1016
       RandomNumber = new RNGCryptoServiceProvider ();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`using UnityEditor;`
`26`	`26`	`#endif`
`27`	`27`
	`28`	`+#pragma warning disable 219`
`28`	`29`	`public class ExampleRetrieveAndRank : MonoBehaviour`
`29`	`30`	`{`
`30`	`31`	`private RetrieveAndRank m_RetrieveAndRank = new RetrieveAndRank();`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`using UnityEngine;`
`19`	`19`	`using IBM.Watson.DeveloperCloud.Services.TextToSpeech.v1;`
`20`	`20`	`using IBM.Watson.DeveloperCloud.Logging;`
	`21`	`+#pragma warning disable 0414`
`21`	`22`
`22`	`23`	`public class ExampleTextToSpeech : MonoBehaviour`
`23`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@`
`22`	`22`	`using IBM.Watson.DeveloperCloud.Logging;`
`23`	`23`	`using IBM.Watson.DeveloperCloud.Utilities;`
`24`	`24`
	`25`	`+#pragma warning disable 0414`
	`26`	`+`
`25`	`27`	`public class ExampleVisualRecognition : MonoBehaviour`
`26`	`28`	`{`
`27`	`29`	`private VisualRecognition m_VisualRecognition = new VisualRecognition();`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*/`
`17`	`17`
	`18`	`+//#define SPLINE_INTERPOLATOR`
`18`	`19`
`19`	`20`	`using UnityEngine;`
`20`	`21`	`using IBM.Watson.DeveloperCloud.Logging;`
`@@ -51,8 +52,10 @@ public class CameraTarget : MonoBehaviour`
`51`	`52`	`private float m_RatioAtCameraPath = 0.0f;`
`52`	`53`	`[SerializeField]`
`53`	`54`	`private Vector3 m_DistanceFromCamera = Vector3.zero;`
	`55`	`+ #if SPLINE_INTERPOLATOR`
`54`	`56`	`[SerializeField]`
`55`	`57`	`private SplineInterpolator m_SplineInterpolator;`
	`58`	`+ #endif`
`56`	`59`	`private Transform[] m_PathTransforms;`
`57`	`60`
`58`	`61`	`[SerializeField]`
`@@ -174,6 +177,7 @@ public Vector3 TargetPosition`
`174`	`177`	`{`
`175`	`178`	`get`
`176`	`179`	`{`
	`180`	`+ #if SPLINE_INTERPOLATOR`
`177`	`181`	`if (m_CameraPathRootObject != null)`
`178`	`182`	`{`
`179`	`183`	`if (m_PathTransforms == null)`
`@@ -208,7 +212,9 @@ public Vector3 TargetPosition`
`208`	`212`	`}`
`209`	`213`
`210`	`214`	`}`
`211`		`- else if (m_UseCustomPosition)`
	`215`	`+ else`
	`216`	`+ #endif`
	`217`	`+ if (m_UseCustomPosition)`
`212`	`218`	`{`
`213`	`219`	`return m_CustomPosition;`
`214`	`220`	`}`
`@@ -410,6 +416,8 @@ public void SetTargetPositionWithOffset(Vector3 offsetPosition)`
`410`	`416`
`411`	`417`	`#endregion`
`412`	`418`
	`419`	`+ #if SPLINE_INTERPOLATOR`
	`420`	`+`
`413`	`421`	`void OnDrawGizmos()`
`414`	`422`	`{`
`415`	`423`	`if (m_CameraPathRootObject != null)`
`@@ -445,6 +453,8 @@ void OnDrawGizmos()`
`445`	`453`	`}`
`446`	`454`	`}`
`447`	`455`	`}`
	`456`	`+`
	`457`	`+ #endif`
`448`	`458`	`}`
`449`	`459`
`450`	`460`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@`
`25`	`25`	`using System.Threading;`
`26`	`26`	`using WebSocketSharp;`
`27`	`27`
	`28`	`+#pragma warning disable 0618`
	`29`	`+`
`28`	`30`	`namespace IBM.Watson.DeveloperCloud.Connection`
`29`	`31`	`{`
`30`	`32`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@`
`22`	`22`	`using UnityEngine;`
`23`	`23`	`using System.Collections.Generic;`
`24`	`24`
	`25`	`+#pragma warning disable 219`
	`26`	`+#pragma warning disable 0414`
	`27`	`+`
`25`	`28`	`namespace IBM.Watson.DeveloperCloud.UnitTests`
`26`	`29`	`{`
`27`	`30`	`public class TestAlchemyAPI : UnitTest`