Merged in UIKnob_Improvements (pull request #101)

UIKnob Improvements

Author: SimonDarksideJTest

Examples~

@@ -1,6 +1,7 @@
 /// Credit Tomasz Schelenz 
 /// Sourced from - https://bitbucket.org/SimonDarksideJ/unity-ui-extensions/issues/46/feature-uiknob#comment-29243988
 
+using System;
 using UnityEngine.Events;
 using UnityEngine.EventSystems;
 
@@ -31,17 +32,21 @@ public enum Direction { CW, CCW };
         [Tooltip("Direction of rotation CW - clockwise, CCW - counterClockwise")]
         public Direction direction = Direction.CW;
         [HideInInspector]
-        public float knobValue;
+        public float KnobValue;
         [Tooltip("Max value of the knob, maximum RAW output value knob can reach, overrides snap step, IF set to 0 or higher than loops, max value will be set by loops")]
-        public float maxValue = 0;
+        public float MaxValue = 0;
         [Tooltip("How many rotations knob can do, if higher than max value, the latter will limit max value")]
-        public int loops = 1;
+        public int Loops = 0;
         [Tooltip("Clamp output value between 0 and 1, useful with loops > 1")]
-        public bool clampOutput01 = false;
+        public bool ClampOutput01 = false;
         [Tooltip("snap to position?")]
-        public bool snapToPosition = false;
+        public bool SnapToPosition = false;
         [Tooltip("Number of positions to snap")]
-        public int snapStepsPerLoop = 10;
+        public int SnapStepsPerLoop = 10;
+        [Tooltip("Parent touch area to extend the touch radius")]
+        public RectTransform ParentTouchMask;
+        [Tooltip("Default background color of the touch mask. Defaults as transparent")]
+        public Color MaskBackground = new Color(0, 0, 0, 0);
         [Space(30)]
         public KnobFloatValueEvent OnValueChanged;
         private float _currentLoops = 0;
@@ -55,7 +60,48 @@ public enum Direction { CW, CCW };
 
         protected override void Awake()
         {
-			_screenSpaceOverlay = GetComponentInParent<Canvas>().rootCanvas.renderMode == RenderMode.ScreenSpaceOverlay;
+            _screenSpaceOverlay = GetComponentInParent<Canvas>().rootCanvas.renderMode == RenderMode.ScreenSpaceOverlay;
+        }
+
+        protected override void Start()
+        {
+            CheckForParentTouchMask();
+        }
+
+        private void CheckForParentTouchMask()
+        {
+            if (ParentTouchMask)
+            {
+                Image maskImage = ParentTouchMask.gameObject.GetOrAddComponent<Image>();
+                maskImage.color = MaskBackground;
+                EventTrigger trigger = ParentTouchMask.gameObject.GetOrAddComponent<EventTrigger>();
+                trigger.triggers.Clear();
+                //PointerDownEvent
+                EventTrigger.Entry pointerDownEntry = new EventTrigger.Entry();
+                pointerDownEntry.eventID = EventTriggerType.PointerDown;
+                pointerDownEntry.callback.AddListener((data) => { OnPointerDown((PointerEventData)data); });
+                trigger.triggers.Add(pointerDownEntry);
+                //PointerUpEvent
+                EventTrigger.Entry pointerUpEntry = new EventTrigger.Entry();
+                pointerUpEntry.eventID = EventTriggerType.PointerUp;
+                pointerUpEntry.callback.AddListener((data) => { OnPointerUp((PointerEventData)data); });
+                trigger.triggers.Add(pointerUpEntry);
+                //PointerEnterEvent
+                EventTrigger.Entry pointerEnterEntry = new EventTrigger.Entry();
+                pointerEnterEntry.eventID = EventTriggerType.PointerEnter;
+                pointerEnterEntry.callback.AddListener((data) => { OnPointerEnter((PointerEventData)data); });
+                trigger.triggers.Add(pointerEnterEntry);
+                //PointerExitEvent
+                EventTrigger.Entry pointerExitEntry = new EventTrigger.Entry();
+                pointerExitEntry.eventID = EventTriggerType.PointerExit;
+                pointerExitEntry.callback.AddListener((data) => { OnPointerExit((PointerEventData)data); });
+                trigger.triggers.Add(pointerExitEntry);
+                //DragEvent
+                EventTrigger.Entry dragEntry = new EventTrigger.Entry();
+                dragEntry.eventID = EventTriggerType.Drag;
+                dragEntry.callback.AddListener((data) => { OnDrag((PointerEventData)data); });
+                trigger.triggers.Add(dragEntry);
+            }
         }
 
         public override void OnPointerUp(PointerEventData eventData)
@@ -71,7 +117,6 @@ public override void OnPointerExit(PointerEventData eventData)
             _canDrag = false;
         }
 
-
         public override void OnPointerDown(PointerEventData eventData)
         {
             _canDrag = true;
@@ -115,83 +160,117 @@ public void OnDrag(PointerEventData eventData)
 
             if (direction == Direction.CW)
             {
-                knobValue = 1 - (finalRotation.eulerAngles.z / 360f);
+                KnobValue = 1 - (finalRotation.eulerAngles.z / 360f);
 
-                if (snapToPosition)
+                if (SnapToPosition)
                 {
-                    SnapToPosition(ref knobValue);
-                    finalRotation.eulerAngles = new Vector3(0, 0, 360 - 360 * knobValue);
+                    SnapToPositionValue(ref KnobValue);
+                    finalRotation.eulerAngles = new Vector3(0, 0, 360 - 360 * KnobValue);
                 }
             }
             else
             {
-                knobValue = (finalRotation.eulerAngles.z / 360f);
+                KnobValue = (finalRotation.eulerAngles.z / 360f);
 
-                if (snapToPosition)
+                if (SnapToPosition)
                 {
-                    SnapToPosition(ref knobValue);
-                    finalRotation.eulerAngles = new Vector3(0, 0, 360 * knobValue);
+                    SnapToPositionValue(ref KnobValue);
+                    finalRotation.eulerAngles = new Vector3(0, 0, 360 * KnobValue);
                 }
             }
 
+            UpdateKnobValue();
+
+            transform.rotation = finalRotation;
+            InvokeEvents(KnobValue + _currentLoops);
+
+            _previousValue = KnobValue;
+        }
+
+        private void UpdateKnobValue()
+        {
             //PREVENT OVERROTATION
-            if (Mathf.Abs(knobValue - _previousValue) > 0.5f)
+            if (Mathf.Abs(KnobValue - _previousValue) > 0.5f)
             {
-                if (knobValue < 0.5f && loops > 1 && _currentLoops < loops - 1)
+                if (KnobValue < 0.5f && Loops > 1 && _currentLoops < Loops - 1)
                 {
                     _currentLoops++;
                 }
-                else if (knobValue > 0.5f && _currentLoops >= 1)
+                else if (KnobValue > 0.5f && _currentLoops >= 1)
                 {
                     _currentLoops--;
                 }
                 else
                 {
-                    if (knobValue > 0.5f && _currentLoops == 0)
+                    if (KnobValue > 0.5f && _currentLoops == 0)
                     {
-                        knobValue = 0;
+                        KnobValue = 0;
                         transform.localEulerAngles = Vector3.zero;
-                        InvokeEvents(knobValue + _currentLoops);
+                        InvokeEvents(KnobValue + _currentLoops);
                         return;
                     }
-                    else if (knobValue < 0.5f && _currentLoops == loops - 1)
+                    else if (KnobValue < 0.5f && _currentLoops == Loops - 1)
                     {
-                        knobValue = 1;
+                        KnobValue = 1;
                         transform.localEulerAngles = Vector3.zero;
-                        InvokeEvents(knobValue + _currentLoops);
+                        InvokeEvents(KnobValue + _currentLoops);
                         return;
                     }
                 }
             }
 
             //CHECK MAX VALUE
-            if (maxValue > 0)
+            if (MaxValue > 0)
             {
-                if (knobValue + _currentLoops > maxValue)
+                if (KnobValue + _currentLoops > MaxValue)
                 {
-                    knobValue = maxValue;
-                    float maxAngle = direction == Direction.CW ? 360f - 360f * maxValue : 360f * maxValue;
+                    KnobValue = MaxValue;
+                    float maxAngle = direction == Direction.CW ? 360f - 360f * MaxValue : 360f * MaxValue;
                     transform.localEulerAngles = new Vector3(0, 0, maxAngle);
-                    InvokeEvents(knobValue);
+                    InvokeEvents(KnobValue);
                     return;
                 }
             }
+        }
 
-            transform.rotation = finalRotation;
-            InvokeEvents(knobValue + _currentLoops);
+        public void SetKnobValue(float value, int loops = 0)
+        {
+            Quaternion newRoation = Quaternion.identity;
+            KnobValue = value;
+            _currentLoops = loops;
+
+            if (SnapToPosition)
+            {
+                SnapToPositionValue(ref KnobValue);
 
-            _previousValue = knobValue;
+            }
+            if (direction == Direction.CW)
+            {
+                newRoation.eulerAngles = new Vector3(0, 0, 360 - 360 * KnobValue);
+            }
+            else
+            {
+                newRoation.eulerAngles = new Vector3(0, 0, 360 * KnobValue);
+            }
+
+            UpdateKnobValue();
+
+            transform.rotation = newRoation;
+            InvokeEvents(KnobValue + _currentLoops);
+
+            _previousValue = KnobValue;
         }
-        private void SnapToPosition(ref float knobValue)
+
+        private void SnapToPositionValue(ref float knobValue)
         {
-            float snapStep = 1 / (float)snapStepsPerLoop;
+            float snapStep = 1 / (float)SnapStepsPerLoop;
             float newValue = Mathf.Round(knobValue / snapStep) * snapStep;
             knobValue = newValue;
         }
         private void InvokeEvents(float value)
         {
-            if (clampOutput01)
-                value /= loops;
+            if (ClampOutput01)
+                value /= Loops;
             OnValueChanged.Invoke(value);
         }
 

Runtime/Scripts/Controls/UI_Knob.cs

@@ -5,7 +5,6 @@
 using System;
 using UnityEngine.Events;
 using UnityEngine.EventSystems;
-using UnityEngine.UIElements;
 
 namespace UnityEngine.UI.Extensions
 {