Skip to content

Commit e7ffac9

Browse files
committed
Merge pull request #59 from watson-developer-cloud/feature-fix-watsoncamera3
* Minor change on camera for each function to make all virtual protec…
2 parents bc7ce51 + 012b237 commit e7ffac9

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

Scripts/Camera/WatsonCamera.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -141,23 +141,23 @@ protected virtual void OnDisable()
141141

142142
#region Start / Update
143143

144-
void Awake()
144+
protected virtual void Awake()
145145
{
146146
mp_Instance = this;
147147
}
148148

149-
void Start()
149+
protected virtual void Start()
150150
{
151151
m_CameraInitialLocation = transform.localPosition;
152152
m_CameraInitialRotation = transform.rotation;
153153
}
154154

155-
void Update()
155+
protected virtual void Update()
156156
{
157157
CameraPositionOnUpdate();
158158
}
159159

160-
void CameraPositionOnUpdate()
160+
protected virtual void CameraPositionOnUpdate()
161161
{
162162
//For Zooming and Panning
163163
if (CurrentCameraTarget != null)
@@ -167,7 +167,7 @@ void CameraPositionOnUpdate()
167167
}
168168
}
169169

170-
void InitializeCameraTargetList()
170+
protected virtual void InitializeCameraTargetList()
171171
{
172172
if (m_ListCameraTarget == null)
173173
m_ListCameraTarget = new List<CameraTarget>();
@@ -190,7 +190,7 @@ void InitializeCameraTargetList()
190190
/// Event handler to pan and zoom with two-finger dragging
191191
/// </summary>
192192
/// <param name="args">Arguments.</param>
193-
public void DragTwoFinger(System.Object[] args)
193+
protected virtual void DragTwoFinger(System.Object[] args)
194194
{
195195
if (m_DisableInteractivity)
196196
return;
@@ -217,7 +217,7 @@ public void DragTwoFinger(System.Object[] args)
217217
/// Event Handler for setting Antialiasing event
218218
/// </summary>
219219
/// <param name="args">Arguments.</param>
220-
public void OnCameraSetAntiAliasing(System.Object[] args)
220+
protected virtual void OnCameraSetAntiAliasing(System.Object[] args)
221221
{
222222
if (args != null && args.Length > 0 && args[0] is bool)
223223
{
@@ -234,7 +234,7 @@ public void OnCameraSetAntiAliasing(System.Object[] args)
234234
/// Event Handler for setting Depth of Field event
235235
/// </summary>
236236
/// <param name="args">Arguments.</param>
237-
public void OnCameraSetDepthOfField(System.Object[] args)
237+
protected virtual void OnCameraSetDepthOfField(System.Object[] args)
238238
{
239239
if (args != null && args.Length > 0 && args[0] is bool)
240240
{
@@ -251,7 +251,7 @@ public void OnCameraSetDepthOfField(System.Object[] args)
251251
/// Event Handler for Two Finger Drag
252252
/// </summary>
253253
/// <param name="args">Arguments.</param>
254-
public void OnCameraSetTwoFingerDrag(System.Object[] args)
254+
protected virtual void OnCameraSetTwoFingerDrag(System.Object[] args)
255255
{
256256
if (args != null && args.Length > 0 && args[0] is bool)
257257
{
@@ -264,7 +264,7 @@ public void OnCameraSetTwoFingerDrag(System.Object[] args)
264264
/// Event handler reseting the camera position.
265265
/// </summary>
266266
/// <param name="args">Arguments.</param>
267-
public void ResetCameraPosition(System.Object[] args)
267+
protected virtual void ResetCameraPosition(System.Object[] args)
268268
{
269269
if (m_DisableInteractivity)
270270
return;
@@ -277,7 +277,7 @@ public void ResetCameraPosition(System.Object[] args)
277277
/// Event handler moving the camera up.
278278
/// </summary>
279279
/// <param name="args">Arguments.</param>
280-
public void MoveUp(System.Object[] args)
280+
protected virtual void MoveUp(System.Object[] args)
281281
{
282282
if (m_DisableInteractivity)
283283
return;
@@ -289,7 +289,7 @@ public void MoveUp(System.Object[] args)
289289
/// Event handler moving the camera down.
290290
/// </summary>
291291
/// <param name="args">Arguments.</param>
292-
public void MoveDown(System.Object[] args)
292+
protected virtual void MoveDown(System.Object[] args)
293293
{
294294
if (m_DisableInteractivity)
295295
return;
@@ -301,7 +301,7 @@ public void MoveDown(System.Object[] args)
301301
/// Event handler moving the camera left.
302302
/// </summary>
303303
/// <param name="args">Arguments.</param>
304-
public void MoveLeft(System.Object[] args)
304+
protected virtual void MoveLeft(System.Object[] args)
305305
{
306306
if (m_DisableInteractivity)
307307
return;
@@ -313,7 +313,7 @@ public void MoveLeft(System.Object[] args)
313313
/// Event handler moving the camera right.
314314
/// </summary>
315315
/// <param name="args">Arguments.</param>
316-
public void MoveRight(System.Object[] args)
316+
protected virtual void MoveRight(System.Object[] args)
317317
{
318318
if (m_DisableInteractivity)
319319
return;
@@ -325,7 +325,7 @@ public void MoveRight(System.Object[] args)
325325
/// Event handler zooming-in the camera.
326326
/// </summary>
327327
/// <param name="args">Arguments.</param>
328-
public void ZoomIn(System.Object[] args)
328+
protected virtual void ZoomIn(System.Object[] args)
329329
{
330330
if (m_DisableInteractivity)
331331
return;
@@ -337,7 +337,7 @@ public void ZoomIn(System.Object[] args)
337337
/// Event handler zooming-out the camera.
338338
/// </summary>
339339
/// <param name="args">Arguments.</param>
340-
public void ZoomOut(System.Object[] args)
340+
protected virtual void ZoomOut(System.Object[] args)
341341
{
342342
if (m_DisableInteractivity)
343343
return;

0 commit comments

Comments
 (0)