* Fix dependencies which caused compiler issues

Author: Dogukan Erenel

Scripts/Camera/WatsonCamera.cs

@@ -48,6 +48,10 @@ public class WatsonCamera : MonoBehaviour
 
         private float m_CommandMovementModifier = 10.0f;
 
+        [SerializeField]
+        private MonoBehaviour m_AntiAliasing;
+        [SerializeField]
+        private MonoBehaviour m_DepthOfField;
         private bool m_DisableInteractivity = false;
 
         #endregion
@@ -118,11 +122,15 @@ public CameraTarget DefaultCameraTarget{
 
         void OnEnable()
         {
+            EventManager.Instance.RegisterEventReceiver(Constants.Event.ON_CAMERA_SET_ANTIALIASING, OnCameraSetAntiAliasing);
+            EventManager.Instance.RegisterEventReceiver(Constants.Event.ON_CAMERA_SET_DEPTHOFFIELD, OnCameraSetDepthOfField);
             EventManager.Instance.RegisterEventReceiver(Constants.Event.ON_CAMERA_SET_INTERACTIVITY, OnCameraSetTwoFingerDrag);
         }
 
         void OnDisable()
         {
+            EventManager.Instance.UnregisterEventReceiver(Constants.Event.ON_CAMERA_SET_ANTIALIASING, OnCameraSetAntiAliasing);
+            EventManager.Instance.UnregisterEventReceiver(Constants.Event.ON_CAMERA_SET_DEPTHOFFIELD, OnCameraSetDepthOfField);
             EventManager.Instance.UnregisterEventReceiver(Constants.Event.ON_CAMERA_SET_INTERACTIVITY, OnCameraSetTwoFingerDrag);
         }
 
@@ -202,6 +210,32 @@ public void DragTwoFinger(System.Object[] args)
 
         #region Camera Events Received from Outside - Set default position / Move Left - Right - Up - Down / Zoom-in-out
 
+        public void OnCameraSetAntiAliasing(System.Object[] args)
+        {
+            if (args != null && args.Length == 1 && args[0] is bool)
+            {
+                bool valueSet = (bool)args[0];
+
+                if (m_AntiAliasing != null)
+                {
+                    m_AntiAliasing.enabled = valueSet;
+                }
+            }
+        }
+
+        public void OnCameraSetDepthOfField(System.Object[] args)
+        {
+            if (args != null && args.Length == 1 && args[0] is bool)
+            {
+                bool valueSet = (bool)args[0];
+
+                if (m_DepthOfField != null)
+                {
+                    m_DepthOfField.enabled = valueSet;
+                }
+            }
+        }
+
         public void OnCameraSetTwoFingerDrag(System.Object[] args)
         {
             if (args != null && args.Length == 1 && args[0] is bool)

Scripts/Services/AlchemyAPI/DataModels.cs

@@ -18,6 +18,7 @@
 using FullSerializer;
 using System.Text;
 using System.Collections.Generic;
+using IBM.Watson.DeveloperCloud.Services.XRAY.v1;
 
 namespace IBM.Watson.DeveloperCloud.Services.AlchemyAPI.v1
 {
@@ -57,6 +58,41 @@ public bool HasGeographicInformation
             }
         }
 
+        private PositionOnMap _GeoLocation = null;
+        public PositionOnMap GeoLocation
+        {
+            get
+            {
+                if (_GeoLocation == null)
+                {
+                    string geoString = null;
+                    for (int i = 0; entities != null && i < entities.Length; i++)
+                    {
+                        if (entities[i].disambiguated != null)
+                        {
+                            geoString = entities[i].disambiguated.geo;
+                            if (!string.IsNullOrEmpty(geoString))
+                            {
+                                string[] geoValues = geoString.Split(' ');
+                                if (geoValues != null && geoValues.Length == 2)
+                                {
+                                    double latitute = 0;
+                                    double longitutde = 0;
+
+                                    if (double.TryParse(geoValues[0], out latitute) && double.TryParse(geoValues[1], out longitutde))
+                                    {
+                                        _GeoLocation = new PositionOnMap(latitute, longitutde, entities[i].disambiguated.name);
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                return _GeoLocation;
+            }
+        }
+
         public override string ToString()
         {
             StringBuilder stringBuilder = new StringBuilder();
@@ -615,6 +651,37 @@ public bool HasGeographicInformation
                 return !string.IsNullOrEmpty(geoString);
             }
         }
+
+        private PositionOnMap _GeoLocation = null;
+        public PositionOnMap GeoLocation
+        {
+            get
+            {
+                if (_GeoLocation == null)
+                {
+                    string geoString = null;
+                    if (disambiguated != null)
+                    {
+                        geoString = disambiguated.geo;
+                        if (!string.IsNullOrEmpty(geoString))
+                        {
+                            string[] geoValues = geoString.Split(' ');
+                            if (geoValues != null && geoValues.Length == 2)
+                            {
+                                double latitute = 0;
+                                double longitutde = 0;
+
+                                if (double.TryParse(geoValues[0], out latitute) && double.TryParse(geoValues[1], out longitutde))
+                                {
+                                    _GeoLocation = new PositionOnMap(latitute, longitutde, disambiguated.name);
+                                }
+                            }
+                        }
+                    }
+                }
+                return _GeoLocation;
+            }
+        }
     };
 
     [fsObject]
@@ -749,12 +816,6 @@ public string ToLongString()
             return stringBuilder.ToString();
         }
 
-        public override string ToString()
-        {
-            return string.Format("[CombinedCallData: status={0}, totalTransactions={1}, language={2}, text={3}, keywords={4}, entities={5}, docSentiment={6}, concepts={7}, " +
-                "relations={8}, taxonomy={9}, docEmotions={10}, dates={11}, HasData={12}, " +
-                "EntityCombined={13}, EntityCombinedCommaSeperated={14}]", status, totalTransactions, language, text, keywords, entities, docSentiment, concepts, relations, taxonomy, docEmotions, dates, HasData, EntityCombined, EntityCombinedCommaSeperated);
-        }
     };
 
 
@@ -768,32 +829,6 @@ public class Keyword
 
     };
 
-    [fsObject]
-    public class DateData
-    {
-        public string text { get; set; }
-        public string date { get; set; }
-
-        private System.DateTime m_dateValue = default(System.DateTime);
-        public System.DateTime DateValue
-        {
-            get
-            {
-                if (m_dateValue == default(System.DateTime) && !string.IsNullOrEmpty(date) && date.Length > 8)
-                {
-                    //19840101T000000
-                    System.DateTime.TryParseExact(date.Remove(8), 
-                        "yyyyddMM",
-                        System.Globalization.CultureInfo.InvariantCulture, 
-                        System.Globalization.DateTimeStyles.None, 
-                        out m_dateValue);
-                    
-                }
-                return m_dateValue;
-            }
-        }
-    };
-
     [fsObject]
     public class Concept
     {
@@ -873,5 +908,30 @@ public class DocEmotions
         public string sadness { get; set; }
     };
 
+    [fsObject]
+    public class DateData
+    {
+        public string text { get; set; }
+        public string date { get; set; }
+
+        private System.DateTime m_dateValue = default(System.DateTime);
+        public System.DateTime DateValue
+        {
+            get
+            {
+                if (m_dateValue == default(System.DateTime) && !string.IsNullOrEmpty(date) && date.Length > 8)
+                {
+                    //19840101T000000
+                    System.DateTime.TryParseExact(date.Remove(8), 
+                        "yyyyddMM",
+                        System.Globalization.CultureInfo.InvariantCulture, 
+                        System.Globalization.DateTimeStyles.None, 
+                        out m_dateValue);
+
+                }
+                return m_dateValue;
+            }
+        }
+    };
 
 }