Skip to content

Commit 8f0a06c

Browse files
author
Richard Lyle
committed
* Fixed all compile errors.
1 parent cc35e14 commit 8f0a06c

File tree

2 files changed

+0
-102
lines changed

2 files changed

+0
-102
lines changed

Scripts/Camera/WatsonCamera.cs

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
using System.Collections.Generic;
2121
using IBM.Watson.DeveloperCloud.Logging;
2222
using IBM.Watson.DeveloperCloud.Utilities;
23-
using UnityStandardAssets.ImageEffects;
2423

2524
namespace IBM.Watson.DeveloperCloud.Camera
2625
{
@@ -49,8 +48,6 @@ public class WatsonCamera : MonoBehaviour
4948

5049
private float m_CommandMovementModifier = 10.0f;
5150

52-
private Antialiasing m_AntiAliasing;
53-
private DepthOfField m_DepthOfField;
5451
private bool m_DisableInteractivity = false;
5552

5653
#endregion
@@ -121,15 +118,11 @@ public CameraTarget DefaultCameraTarget{
121118

122119
void OnEnable()
123120
{
124-
EventManager.Instance.RegisterEventReceiver(Constants.Event.ON_CAMERA_SET_ANTIALIASING, OnCameraSetAntiAliasing);
125-
EventManager.Instance.RegisterEventReceiver(Constants.Event.ON_CAMERA_SET_DEPTHOFFIELD, OnCameraSetDepthOfField);
126121
EventManager.Instance.RegisterEventReceiver(Constants.Event.ON_CAMERA_SET_INTERACTIVITY, OnCameraSetTwoFingerDrag);
127122
}
128123

129124
void OnDisable()
130125
{
131-
EventManager.Instance.UnregisterEventReceiver(Constants.Event.ON_CAMERA_SET_ANTIALIASING, OnCameraSetAntiAliasing);
132-
EventManager.Instance.UnregisterEventReceiver(Constants.Event.ON_CAMERA_SET_DEPTHOFFIELD, OnCameraSetDepthOfField);
133126
EventManager.Instance.UnregisterEventReceiver(Constants.Event.ON_CAMERA_SET_INTERACTIVITY, OnCameraSetTwoFingerDrag);
134127
}
135128

@@ -139,8 +132,6 @@ void OnDisable()
139132

140133
void Awake(){
141134
mp_Instance = this;
142-
m_AntiAliasing = this.GetComponent<Antialiasing>();
143-
m_DepthOfField = this.GetComponent<DepthOfField>();
144135
}
145136

146137
void Start(){
@@ -211,32 +202,6 @@ public void DragTwoFinger(System.Object[] args)
211202

212203
#region Camera Events Received from Outside - Set default position / Move Left - Right - Up - Down / Zoom-in-out
213204

214-
public void OnCameraSetAntiAliasing(System.Object[] args)
215-
{
216-
if (args != null && args.Length == 1 && args[0] is bool)
217-
{
218-
bool valueSet = (bool)args[0];
219-
220-
if (m_AntiAliasing != null)
221-
{
222-
m_AntiAliasing.enabled = valueSet;
223-
}
224-
}
225-
}
226-
227-
public void OnCameraSetDepthOfField(System.Object[] args)
228-
{
229-
if (args != null && args.Length == 1 && args[0] is bool)
230-
{
231-
bool valueSet = (bool)args[0];
232-
233-
if (m_DepthOfField != null)
234-
{
235-
m_DepthOfField.enabled = valueSet;
236-
}
237-
}
238-
}
239-
240205
public void OnCameraSetTwoFingerDrag(System.Object[] args)
241206
{
242207
if (args != null && args.Length == 1 && args[0] is bool)

Scripts/Services/AlchemyAPI/DataModels.cs

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
using FullSerializer;
1919
using System.Text;
2020
using System.Collections.Generic;
21-
using IBM.Watson.DeveloperCloud.Services.ESRI.v1;
2221

2322
namespace IBM.Watson.DeveloperCloud.Services.AlchemyAPI.v1
2423
{
@@ -58,41 +57,6 @@ public bool HasGeographicInformation
5857
}
5958
}
6059

61-
private PositionOnMap _GeoLocation = null;
62-
public PositionOnMap GeoLocation
63-
{
64-
get
65-
{
66-
if (_GeoLocation == null)
67-
{
68-
string geoString = null;
69-
for (int i = 0; entities != null && i < entities.Length; i++)
70-
{
71-
if (entities[i].disambiguated != null)
72-
{
73-
geoString = entities[i].disambiguated.geo;
74-
if (!string.IsNullOrEmpty(geoString))
75-
{
76-
string[] geoValues = geoString.Split(' ');
77-
if (geoValues != null && geoValues.Length == 2)
78-
{
79-
double latitute = 0;
80-
double longitutde = 0;
81-
82-
if (double.TryParse(geoValues[0], out latitute) && double.TryParse(geoValues[1], out longitutde))
83-
{
84-
_GeoLocation = new PositionOnMap(latitute, longitutde, entities[i].disambiguated.name);
85-
break;
86-
}
87-
}
88-
}
89-
}
90-
}
91-
}
92-
return _GeoLocation;
93-
}
94-
}
95-
9660
public override string ToString()
9761
{
9862
StringBuilder stringBuilder = new StringBuilder();
@@ -651,37 +615,6 @@ public bool HasGeographicInformation
651615
return !string.IsNullOrEmpty(geoString);
652616
}
653617
}
654-
655-
private PositionOnMap _GeoLocation = null;
656-
public PositionOnMap GeoLocation
657-
{
658-
get
659-
{
660-
if (_GeoLocation == null)
661-
{
662-
string geoString = null;
663-
if (disambiguated != null)
664-
{
665-
geoString = disambiguated.geo;
666-
if (!string.IsNullOrEmpty(geoString))
667-
{
668-
string[] geoValues = geoString.Split(' ');
669-
if (geoValues != null && geoValues.Length == 2)
670-
{
671-
double latitute = 0;
672-
double longitutde = 0;
673-
674-
if (double.TryParse(geoValues[0], out latitute) && double.TryParse(geoValues[1], out longitutde))
675-
{
676-
_GeoLocation = new PositionOnMap(latitute, longitutde, disambiguated.name);
677-
}
678-
}
679-
}
680-
}
681-
}
682-
return _GeoLocation;
683-
}
684-
}
685618
};
686619

687620
[fsObject]

0 commit comments

Comments
 (0)