Skip to content

Commit 1b3a2f9

Browse files
committed
Fixed ambiguous issue for lower Unity version.
1 parent 6a1ae42 commit 1b3a2f9

File tree

1 file changed

+50
-20
lines changed

1 file changed

+50
-20
lines changed

Assets/JCSUnity/Scripts/Input/JCS_Input.cs

Lines changed: 50 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,12 @@ public static bool OnMouseDoubleClick(JCS_MouseButton type, bool ignorePause = f
213213
/// </summary>
214214
/// <param name="button"> type by keycode (Unity built-in) </param>
215215
/// <returns> true: if double click, false nothing happens </returns>
216-
public static bool OnMouseDoubleClick(int button, bool ignorePause = false)
216+
#if UNITY_5_4_OR_NEWER // NOTE: Resolve ambiguous issue.
217+
public
218+
#else
219+
private
220+
#endif
221+
static bool OnMouseDoubleClick(int button, bool ignorePause = false)
217222
{
218223
// Check first click
219224
if (!CLICK)
@@ -250,7 +255,12 @@ public static bool OnMouseDrag(int button, bool ignorePause = false)
250255
/// <param name="button"></param>
251256
/// <param name="ignorePause"></param>
252257
/// <returns></returns>
253-
public static bool OnMouseDrag(JCS_MouseButton button, bool ignorePause = false)
258+
#if UNITY_5_4_OR_NEWER // NOTE: Resolve ambiguous issue.
259+
public
260+
#else
261+
private
262+
#endif
263+
static bool OnMouseDrag(JCS_MouseButton button, bool ignorePause = false)
254264
{
255265
if (START_DRAGGING)
256266
{
@@ -364,7 +374,12 @@ public static Vector2 MousePosition0To1()
364374
/// true, the mouse state is correct.
365375
/// false, the mouse state is incorrect.
366376
/// </returns>
367-
public static bool GetMouseByAction(JCS_KeyActionType act, JCS_MouseButton button, bool ignorePause = false)
377+
#if UNITY_5_4_OR_NEWER // NOTE: Resolve ambiguous issue.
378+
public
379+
#else
380+
private
381+
#endif
382+
static bool GetMouseByAction(JCS_KeyActionType act, JCS_MouseButton button, bool ignorePause = false)
368383
{
369384
return GetMouseByAction(act, (int)button, ignorePause);
370385
}
@@ -412,7 +427,12 @@ public static bool GetMouseButtonDown(JCS_MouseButton button, bool ignorePause =
412427
/// true, button is down.
413428
/// false, button is not down.
414429
/// </returns>
415-
public static bool GetMouseButtonDown(int button, bool ignorePause = false)
430+
#if UNITY_5_4_OR_NEWER // NOTE: Resolve ambiguous issue.
431+
public
432+
#else
433+
private
434+
#endif
435+
static bool GetMouseButtonDown(int button, bool ignorePause = false)
416436
{
417437
if (!ignorePause)
418438
{
@@ -445,7 +465,12 @@ public static bool GetMouseButton(JCS_MouseButton button, bool ignorePause = fal
445465
/// true, button is pressed.
446466
/// false, button is not pressed.
447467
/// </returns>
448-
public static bool GetMouseButton(int button, bool ignorePause = false)
468+
#if UNITY_5_4_OR_NEWER // NOTE: Resolve ambiguous issue.
469+
public
470+
#else
471+
private
472+
#endif
473+
static bool GetMouseButton(int button, bool ignorePause = false)
449474
{
450475
if (!ignorePause)
451476
{
@@ -478,7 +503,12 @@ public static bool GetMouseButtonUp(JCS_MouseButton button, bool ignorePause = f
478503
/// true, button is up.
479504
/// false, button is not up.
480505
/// </returns>
481-
public static bool GetMouseButtonUp(int button, bool ignorePause = false)
506+
#if UNITY_5_4_OR_NEWER // NOTE: Resolve ambiguous issue.
507+
public
508+
#else
509+
private
510+
#endif
511+
static bool GetMouseButtonUp(int button, bool ignorePause = false)
482512
{
483513
if (!ignorePause)
484514
{
@@ -1546,7 +1576,7 @@ public static bool AllJoystickKeysUp(
15461576
}
15471577

15481578

1549-
#region CTRL
1579+
#region CTRL
15501580

15511581
/// <summary>
15521582
/// Is one the ctrl key pressed?
@@ -1621,9 +1651,9 @@ public static bool GetKeyUpWithCtrl(KeyCode key)
16211651

16221652
return GetKeyUp(key);
16231653
}
1624-
#endregion
1654+
#endregion
16251655

1626-
#region ALT
1656+
#region ALT
16271657

16281658
/// <summary>
16291659
/// Is one the alt key pressed?
@@ -1696,9 +1726,9 @@ public static bool GetKeyUpWithAlt(KeyCode key)
16961726

16971727
return GetKeyUp(key);
16981728
}
1699-
#endregion
1729+
#endregion
17001730

1701-
#region SHIFT
1731+
#region SHIFT
17021732

17031733
/// <summary>
17041734
/// Is one the shift key pressed?
@@ -1771,9 +1801,9 @@ public static bool GetKeyUpWithShift(KeyCode key)
17711801

17721802
return GetKeyUp(key);
17731803
}
1774-
#endregion
1804+
#endregion
17751805

1776-
#region CTRL_SHIFT
1806+
#region CTRL_SHIFT
17771807
/// <summary>
17781808
/// Check if the 'key' and the ctrl and shift key is pressed.
17791809
/// </summary>
@@ -1821,9 +1851,9 @@ public static bool GetKeyUpWithCtrlShift(KeyCode key)
18211851

18221852
return GetKeyUp(key);
18231853
}
1824-
#endregion
1854+
#endregion
18251855

1826-
#region ALT_CTRL
1856+
#region ALT_CTRL
18271857
/// <summary>
18281858
/// Check if the 'key' and the ctrl and alt key is pressed.
18291859
/// </summary>
@@ -1871,9 +1901,9 @@ public static bool GetKeyUpWithAltCtrl(KeyCode key)
18711901

18721902
return GetKeyUp(key);
18731903
}
1874-
#endregion
1904+
#endregion
18751905

1876-
#region ALT_SHIFT
1906+
#region ALT_SHIFT
18771907
/// <summary>
18781908
/// Check if the 'key' and the alt and shift key is pressed.
18791909
/// </summary>
@@ -1921,9 +1951,9 @@ public static bool GetKeyUpWithAltShift(KeyCode key)
19211951

19221952
return GetKeyUp(key);
19231953
}
1924-
#endregion
1954+
#endregion
19251955

1926-
#region ALT_CTRL_SHIFT
1956+
#region ALT_CTRL_SHIFT
19271957

19281958
/// <summary>
19291959
/// Check if the 'key', alt, shift and ctrl key is pressed.
@@ -1973,7 +2003,7 @@ public static bool GetKeyUpWithAltCtrlShift(KeyCode key)
19732003
return GetKeyUp(key);
19742004
}
19752005

1976-
#endregion
2006+
#endregion
19772007

19782008
/// <summary>
19792009
/// Get key with certain combination.

0 commit comments

Comments
 (0)