From 08913104a952f5a843169ab8611c01a451c0fab2 Mon Sep 17 00:00:00 2001 From: TORISOUP Date: Tue, 13 Aug 2019 23:33:00 +0900 Subject: [PATCH] Implements EventSystem interfaces. --- Assets/UniRx.Async/Triggers/AsyncBeginDragTrigger.cs | 4 ++-- Assets/UniRx.Async/Triggers/AsyncCancelTrigger.cs | 4 ++-- Assets/UniRx.Async/Triggers/AsyncDeselectTrigger.cs | 4 ++-- Assets/UniRx.Async/Triggers/AsyncDragTrigger.cs | 4 ++-- Assets/UniRx.Async/Triggers/AsyncDropTrigger.cs | 4 ++-- Assets/UniRx.Async/Triggers/AsyncEndDragTrigger.cs | 4 ++-- .../Triggers/AsyncInitializePotentialDragTrigger.cs | 4 ++-- Assets/UniRx.Async/Triggers/AsyncMoveTrigger.cs | 4 ++-- Assets/UniRx.Async/Triggers/AsyncPointerClickTrigger.cs | 4 ++-- Assets/UniRx.Async/Triggers/AsyncPointerDownTrigger.cs | 4 ++-- Assets/UniRx.Async/Triggers/AsyncPointerEnterTrigger.cs | 4 ++-- Assets/UniRx.Async/Triggers/AsyncPointerExitTrigger.cs | 4 ++-- Assets/UniRx.Async/Triggers/AsyncPointerUpTrigger.cs | 4 ++-- Assets/UniRx.Async/Triggers/AsyncScrollTrigger.cs | 4 ++-- Assets/UniRx.Async/Triggers/AsyncSelectTrigger.cs | 4 ++-- Assets/UniRx.Async/Triggers/AsyncSubmitTrigger.cs | 4 ++-- Assets/UniRx.Async/Triggers/AsyncUpdateSelectedTrigger.cs | 4 ++-- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Assets/UniRx.Async/Triggers/AsyncBeginDragTrigger.cs b/Assets/UniRx.Async/Triggers/AsyncBeginDragTrigger.cs index e17664be..bbecbea0 100644 --- a/Assets/UniRx.Async/Triggers/AsyncBeginDragTrigger.cs +++ b/Assets/UniRx.Async/Triggers/AsyncBeginDragTrigger.cs @@ -10,7 +10,7 @@ namespace UniRx.Async.Triggers { [DisallowMultipleComponent] - public class AsyncBeginDragTrigger : AsyncTriggerBase + public class AsyncBeginDragTrigger : AsyncTriggerBase, IBeginDragHandler { AsyncTriggerPromise onBeginDrag; AsyncTriggerPromiseDictionary onBeginDrags; @@ -22,7 +22,7 @@ protected override IEnumerable GetPromises() } - void OnBeginDrag(PointerEventData eventData) + void IBeginDragHandler.OnBeginDrag(PointerEventData eventData) { TrySetResult(onBeginDrag, onBeginDrags, eventData); } diff --git a/Assets/UniRx.Async/Triggers/AsyncCancelTrigger.cs b/Assets/UniRx.Async/Triggers/AsyncCancelTrigger.cs index f397ddef..9b146892 100644 --- a/Assets/UniRx.Async/Triggers/AsyncCancelTrigger.cs +++ b/Assets/UniRx.Async/Triggers/AsyncCancelTrigger.cs @@ -10,7 +10,7 @@ namespace UniRx.Async.Triggers { [DisallowMultipleComponent] - public class AsyncCancelTrigger : AsyncTriggerBase + public class AsyncCancelTrigger : AsyncTriggerBase, ICancelHandler { AsyncTriggerPromise onCancel; AsyncTriggerPromiseDictionary onCancels; @@ -22,7 +22,7 @@ protected override IEnumerable GetPromises() } - void OnCancel(BaseEventData eventData) + void ICancelHandler.OnCancel(BaseEventData eventData) { TrySetResult(onCancel, onCancels, eventData); } diff --git a/Assets/UniRx.Async/Triggers/AsyncDeselectTrigger.cs b/Assets/UniRx.Async/Triggers/AsyncDeselectTrigger.cs index e1e7ce43..a76b4219 100644 --- a/Assets/UniRx.Async/Triggers/AsyncDeselectTrigger.cs +++ b/Assets/UniRx.Async/Triggers/AsyncDeselectTrigger.cs @@ -10,7 +10,7 @@ namespace UniRx.Async.Triggers { [DisallowMultipleComponent] - public class AsyncDeselectTrigger : AsyncTriggerBase + public class AsyncDeselectTrigger : AsyncTriggerBase, IDeselectHandler { AsyncTriggerPromise onDeselect; AsyncTriggerPromiseDictionary onDeselects; @@ -22,7 +22,7 @@ protected override IEnumerable GetPromises() } - void OnDeselect(BaseEventData eventData) + void IDeselectHandler.OnDeselect(BaseEventData eventData) { TrySetResult(onDeselect, onDeselects, eventData); } diff --git a/Assets/UniRx.Async/Triggers/AsyncDragTrigger.cs b/Assets/UniRx.Async/Triggers/AsyncDragTrigger.cs index b1e4d566..0a36282a 100644 --- a/Assets/UniRx.Async/Triggers/AsyncDragTrigger.cs +++ b/Assets/UniRx.Async/Triggers/AsyncDragTrigger.cs @@ -10,7 +10,7 @@ namespace UniRx.Async.Triggers { [DisallowMultipleComponent] - public class AsyncDragTrigger : AsyncTriggerBase + public class AsyncDragTrigger : AsyncTriggerBase, IDragHandler { AsyncTriggerPromise onDrag; AsyncTriggerPromiseDictionary onDrags; @@ -22,7 +22,7 @@ protected override IEnumerable GetPromises() } - void OnDrag(PointerEventData eventData) + void IDragHandler.OnDrag(PointerEventData eventData) { TrySetResult(onDrag, onDrags, eventData); } diff --git a/Assets/UniRx.Async/Triggers/AsyncDropTrigger.cs b/Assets/UniRx.Async/Triggers/AsyncDropTrigger.cs index 7042c4d3..25b62175 100644 --- a/Assets/UniRx.Async/Triggers/AsyncDropTrigger.cs +++ b/Assets/UniRx.Async/Triggers/AsyncDropTrigger.cs @@ -10,7 +10,7 @@ namespace UniRx.Async.Triggers { [DisallowMultipleComponent] - public class AsyncDropTrigger : AsyncTriggerBase + public class AsyncDropTrigger : AsyncTriggerBase, IDropHandler { AsyncTriggerPromise onDrop; AsyncTriggerPromiseDictionary onDrops; @@ -22,7 +22,7 @@ protected override IEnumerable GetPromises() } - void OnDrop(PointerEventData eventData) + void IDropHandler.OnDrop(PointerEventData eventData) { TrySetResult(onDrop, onDrops, eventData); } diff --git a/Assets/UniRx.Async/Triggers/AsyncEndDragTrigger.cs b/Assets/UniRx.Async/Triggers/AsyncEndDragTrigger.cs index 2b4ce34f..0e8f27c2 100644 --- a/Assets/UniRx.Async/Triggers/AsyncEndDragTrigger.cs +++ b/Assets/UniRx.Async/Triggers/AsyncEndDragTrigger.cs @@ -10,7 +10,7 @@ namespace UniRx.Async.Triggers { [DisallowMultipleComponent] - public class AsyncEndDragTrigger : AsyncTriggerBase + public class AsyncEndDragTrigger : AsyncTriggerBase, IEndDragHandler { AsyncTriggerPromise onEndDrag; AsyncTriggerPromiseDictionary onEndDrags; @@ -22,7 +22,7 @@ protected override IEnumerable GetPromises() } - void OnEndDrag(PointerEventData eventData) + void IEndDragHandler.OnEndDrag(PointerEventData eventData) { TrySetResult(onEndDrag, onEndDrags, eventData); } diff --git a/Assets/UniRx.Async/Triggers/AsyncInitializePotentialDragTrigger.cs b/Assets/UniRx.Async/Triggers/AsyncInitializePotentialDragTrigger.cs index 4334b4e4..8dda82a6 100644 --- a/Assets/UniRx.Async/Triggers/AsyncInitializePotentialDragTrigger.cs +++ b/Assets/UniRx.Async/Triggers/AsyncInitializePotentialDragTrigger.cs @@ -10,7 +10,7 @@ namespace UniRx.Async.Triggers { [DisallowMultipleComponent] - public class AsyncInitializePotentialDragTrigger : AsyncTriggerBase + public class AsyncInitializePotentialDragTrigger : AsyncTriggerBase, IInitializePotentialDragHandler { AsyncTriggerPromise onInitializePotentialDrag; AsyncTriggerPromiseDictionary onInitializePotentialDrags; @@ -22,7 +22,7 @@ protected override IEnumerable GetPromises() } - void OnInitializePotentialDrag(PointerEventData eventData) + void IInitializePotentialDragHandler.OnInitializePotentialDrag(PointerEventData eventData) { TrySetResult(onInitializePotentialDrag, onInitializePotentialDrags, eventData); } diff --git a/Assets/UniRx.Async/Triggers/AsyncMoveTrigger.cs b/Assets/UniRx.Async/Triggers/AsyncMoveTrigger.cs index 6066c8dc..19d0f562 100644 --- a/Assets/UniRx.Async/Triggers/AsyncMoveTrigger.cs +++ b/Assets/UniRx.Async/Triggers/AsyncMoveTrigger.cs @@ -10,7 +10,7 @@ namespace UniRx.Async.Triggers { [DisallowMultipleComponent] - public class AsyncMoveTrigger : AsyncTriggerBase + public class AsyncMoveTrigger : AsyncTriggerBase, IMoveHandler { AsyncTriggerPromise onMove; AsyncTriggerPromiseDictionary onMoves; @@ -22,7 +22,7 @@ protected override IEnumerable GetPromises() } - void OnMove(AxisEventData eventData) + void IMoveHandler.OnMove(AxisEventData eventData) { TrySetResult(onMove, onMoves, eventData); } diff --git a/Assets/UniRx.Async/Triggers/AsyncPointerClickTrigger.cs b/Assets/UniRx.Async/Triggers/AsyncPointerClickTrigger.cs index 5a9167a1..b4ed5769 100644 --- a/Assets/UniRx.Async/Triggers/AsyncPointerClickTrigger.cs +++ b/Assets/UniRx.Async/Triggers/AsyncPointerClickTrigger.cs @@ -10,7 +10,7 @@ namespace UniRx.Async.Triggers { [DisallowMultipleComponent] - public class AsyncPointerClickTrigger : AsyncTriggerBase + public class AsyncPointerClickTrigger : AsyncTriggerBase, IPointerClickHandler { AsyncTriggerPromise onPointerClick; AsyncTriggerPromiseDictionary onPointerClicks; @@ -22,7 +22,7 @@ protected override IEnumerable GetPromises() } - void OnPointerClick(PointerEventData eventData) + void IPointerClickHandler.OnPointerClick(PointerEventData eventData) { TrySetResult(onPointerClick, onPointerClicks, eventData); } diff --git a/Assets/UniRx.Async/Triggers/AsyncPointerDownTrigger.cs b/Assets/UniRx.Async/Triggers/AsyncPointerDownTrigger.cs index 12cb568e..aa6bc36b 100644 --- a/Assets/UniRx.Async/Triggers/AsyncPointerDownTrigger.cs +++ b/Assets/UniRx.Async/Triggers/AsyncPointerDownTrigger.cs @@ -10,7 +10,7 @@ namespace UniRx.Async.Triggers { [DisallowMultipleComponent] - public class AsyncPointerDownTrigger : AsyncTriggerBase + public class AsyncPointerDownTrigger : AsyncTriggerBase, IPointerDownHandler { AsyncTriggerPromise onPointerDown; AsyncTriggerPromiseDictionary onPointerDowns; @@ -22,7 +22,7 @@ protected override IEnumerable GetPromises() } - void OnPointerDown(PointerEventData eventData) + void IPointerDownHandler.OnPointerDown(PointerEventData eventData) { TrySetResult(onPointerDown, onPointerDowns, eventData); } diff --git a/Assets/UniRx.Async/Triggers/AsyncPointerEnterTrigger.cs b/Assets/UniRx.Async/Triggers/AsyncPointerEnterTrigger.cs index 2532079e..179766df 100644 --- a/Assets/UniRx.Async/Triggers/AsyncPointerEnterTrigger.cs +++ b/Assets/UniRx.Async/Triggers/AsyncPointerEnterTrigger.cs @@ -10,7 +10,7 @@ namespace UniRx.Async.Triggers { [DisallowMultipleComponent] - public class AsyncPointerEnterTrigger : AsyncTriggerBase + public class AsyncPointerEnterTrigger : AsyncTriggerBase, IPointerEnterHandler { AsyncTriggerPromise onPointerEnter; AsyncTriggerPromiseDictionary onPointerEnters; @@ -22,7 +22,7 @@ protected override IEnumerable GetPromises() } - void OnPointerEnter(PointerEventData eventData) + void IPointerEnterHandler.OnPointerEnter(PointerEventData eventData) { TrySetResult(onPointerEnter, onPointerEnters, eventData); } diff --git a/Assets/UniRx.Async/Triggers/AsyncPointerExitTrigger.cs b/Assets/UniRx.Async/Triggers/AsyncPointerExitTrigger.cs index 29063d42..4d0051e6 100644 --- a/Assets/UniRx.Async/Triggers/AsyncPointerExitTrigger.cs +++ b/Assets/UniRx.Async/Triggers/AsyncPointerExitTrigger.cs @@ -10,7 +10,7 @@ namespace UniRx.Async.Triggers { [DisallowMultipleComponent] - public class AsyncPointerExitTrigger : AsyncTriggerBase + public class AsyncPointerExitTrigger : AsyncTriggerBase, IPointerExitHandler { AsyncTriggerPromise onPointerExit; AsyncTriggerPromiseDictionary onPointerExits; @@ -22,7 +22,7 @@ protected override IEnumerable GetPromises() } - void OnPointerExit(PointerEventData eventData) + void IPointerExitHandler.OnPointerExit(PointerEventData eventData) { TrySetResult(onPointerExit, onPointerExits, eventData); } diff --git a/Assets/UniRx.Async/Triggers/AsyncPointerUpTrigger.cs b/Assets/UniRx.Async/Triggers/AsyncPointerUpTrigger.cs index 1eb0b926..11e5d660 100644 --- a/Assets/UniRx.Async/Triggers/AsyncPointerUpTrigger.cs +++ b/Assets/UniRx.Async/Triggers/AsyncPointerUpTrigger.cs @@ -10,7 +10,7 @@ namespace UniRx.Async.Triggers { [DisallowMultipleComponent] - public class AsyncPointerUpTrigger : AsyncTriggerBase + public class AsyncPointerUpTrigger : AsyncTriggerBase, IPointerUpHandler { AsyncTriggerPromise onPointerUp; AsyncTriggerPromiseDictionary onPointerUps; @@ -22,7 +22,7 @@ protected override IEnumerable GetPromises() } - void OnPointerUp(PointerEventData eventData) + void IPointerUpHandler.OnPointerUp(PointerEventData eventData) { TrySetResult(onPointerUp, onPointerUps, eventData); } diff --git a/Assets/UniRx.Async/Triggers/AsyncScrollTrigger.cs b/Assets/UniRx.Async/Triggers/AsyncScrollTrigger.cs index 363a25ad..6908ff92 100644 --- a/Assets/UniRx.Async/Triggers/AsyncScrollTrigger.cs +++ b/Assets/UniRx.Async/Triggers/AsyncScrollTrigger.cs @@ -10,7 +10,7 @@ namespace UniRx.Async.Triggers { [DisallowMultipleComponent] - public class AsyncScrollTrigger : AsyncTriggerBase + public class AsyncScrollTrigger : AsyncTriggerBase, IScrollHandler { AsyncTriggerPromise onScroll; AsyncTriggerPromiseDictionary onScrolls; @@ -22,7 +22,7 @@ protected override IEnumerable GetPromises() } - void OnScroll(PointerEventData eventData) + void IScrollHandler.OnScroll(PointerEventData eventData) { TrySetResult(onScroll, onScrolls, eventData); } diff --git a/Assets/UniRx.Async/Triggers/AsyncSelectTrigger.cs b/Assets/UniRx.Async/Triggers/AsyncSelectTrigger.cs index 1a98f9df..ad4e99f2 100644 --- a/Assets/UniRx.Async/Triggers/AsyncSelectTrigger.cs +++ b/Assets/UniRx.Async/Triggers/AsyncSelectTrigger.cs @@ -10,7 +10,7 @@ namespace UniRx.Async.Triggers { [DisallowMultipleComponent] - public class AsyncSelectTrigger : AsyncTriggerBase + public class AsyncSelectTrigger : AsyncTriggerBase, ISelectHandler { AsyncTriggerPromise onSelect; AsyncTriggerPromiseDictionary onSelects; @@ -22,7 +22,7 @@ protected override IEnumerable GetPromises() } - void OnSelect(BaseEventData eventData) + void ISelectHandler.OnSelect(BaseEventData eventData) { TrySetResult(onSelect, onSelects, eventData); } diff --git a/Assets/UniRx.Async/Triggers/AsyncSubmitTrigger.cs b/Assets/UniRx.Async/Triggers/AsyncSubmitTrigger.cs index ff9b17d5..22a00fa8 100644 --- a/Assets/UniRx.Async/Triggers/AsyncSubmitTrigger.cs +++ b/Assets/UniRx.Async/Triggers/AsyncSubmitTrigger.cs @@ -10,7 +10,7 @@ namespace UniRx.Async.Triggers { [DisallowMultipleComponent] - public class AsyncSubmitTrigger : AsyncTriggerBase + public class AsyncSubmitTrigger : AsyncTriggerBase, ISubmitHandler { AsyncTriggerPromise onSubmit; AsyncTriggerPromiseDictionary onSubmits; @@ -22,7 +22,7 @@ protected override IEnumerable GetPromises() } - void OnSubmit(BaseEventData eventData) + void ISubmitHandler.OnSubmit(BaseEventData eventData) { TrySetResult(onSubmit, onSubmits, eventData); } diff --git a/Assets/UniRx.Async/Triggers/AsyncUpdateSelectedTrigger.cs b/Assets/UniRx.Async/Triggers/AsyncUpdateSelectedTrigger.cs index fcb81f69..025242c5 100644 --- a/Assets/UniRx.Async/Triggers/AsyncUpdateSelectedTrigger.cs +++ b/Assets/UniRx.Async/Triggers/AsyncUpdateSelectedTrigger.cs @@ -10,7 +10,7 @@ namespace UniRx.Async.Triggers { [DisallowMultipleComponent] - public class AsyncUpdateSelectedTrigger : AsyncTriggerBase + public class AsyncUpdateSelectedTrigger : AsyncTriggerBase, IUpdateSelectedHandler { AsyncTriggerPromise onUpdateSelected; AsyncTriggerPromiseDictionary onUpdateSelecteds; @@ -22,7 +22,7 @@ protected override IEnumerable GetPromises() } - void OnUpdateSelected(BaseEventData eventData) + void IUpdateSelectedHandler.OnUpdateSelected(BaseEventData eventData) { TrySetResult(onUpdateSelected, onUpdateSelecteds, eventData); }