pengtaihao
/
com.unity.uiextensions.nosample
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor bug fixes following docs

release
Simon (darkside) Jackson 2020-10-21 18:36:57 +01:00
parent 9a0a08da78
commit a354a22a13
1 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
Runtime/Scripts/Controls/UI_Knob.cs
View File

@ -32,18 +32,18 @@ namespace UnityEngine.UI.Extensions
[Tooltip("Direction of rotation CW - clockwise, CCW - counterClockwise")] [Tooltip("Direction of rotation CW - clockwise, CCW - counterClockwise")]
public Direction direction = Direction.CW; public Direction direction = Direction.CW;
[HideInInspector] [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")] [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")] [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")] [Tooltip("Clamp output value between 0 and 1, useful with loops > 1")]
public bool clampOutput01 = false; public bool ClampOutput01 = false;
[Tooltip("snap to position?")] [Tooltip("snap to position?")]
public bool snapToPosition = false; public bool SnapToPosition = false;
[Tooltip("Number of positions to snap")] [Tooltip("Number of positions to snap")]
public int snapStepsPerLoop = 10; public int SnapStepsPerLoop = 10;
[Tooltip("Parent touch area to extend the know touch radius")] [Tooltip("Parent touch area to extend the touch radius")]
public RectTransform ParentTouchMask; public RectTransform ParentTouchMask;
[Tooltip("Default background color of the touch mask. Defaults as transparent")] [Tooltip("Default background color of the touch mask. Defaults as transparent")]
public Color MaskBackground = new Color(0, 0, 0, 0); public Color MaskBackground = new Color(0, 0, 0, 0);
@ -160,74 +160,74 @@ namespace UnityEngine.UI.Extensions
if (direction == Direction.CW) if (direction == Direction.CW)
{ {
knobValue = 1 - (finalRotation.eulerAngles.z / 360f); KnobValue = 1 - (finalRotation.eulerAngles.z / 360f);
if (snapToPosition) if (SnapToPosition)
{ {
SnapToPosition(ref knobValue); SnapToPositionValue(ref KnobValue);
finalRotation.eulerAngles = new Vector3(0, 0, 360 - 360 * knobValue); finalRotation.eulerAngles = new Vector3(0, 0, 360 - 360 * KnobValue);
} }
} }
else else
{ {
knobValue = (finalRotation.eulerAngles.z / 360f); KnobValue = (finalRotation.eulerAngles.z / 360f);
if (snapToPosition) if (SnapToPosition)
{ {
SnapToPosition(ref knobValue); SnapToPositionValue(ref KnobValue);
finalRotation.eulerAngles = new Vector3(0, 0, 360 * knobValue); finalRotation.eulerAngles = new Vector3(0, 0, 360 * KnobValue);
} }
} }
UpdateKnobValue(); UpdateKnobValue();
transform.rotation = finalRotation; transform.rotation = finalRotation;
InvokeEvents(knobValue + _currentLoops); InvokeEvents(KnobValue + _currentLoops);
_previousValue = knobValue; _previousValue = KnobValue;
} }
private void UpdateKnobValue() private void UpdateKnobValue()
{ {
//PREVENT OVERROTATION //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++; _currentLoops++;
} }
else if (knobValue > 0.5f && _currentLoops >= 1) else if (KnobValue > 0.5f && _currentLoops >= 1)
{ {
_currentLoops--; _currentLoops--;
} }
else else
{ {
if (knobValue > 0.5f && _currentLoops == 0) if (KnobValue > 0.5f && _currentLoops == 0)
{ {
knobValue = 0; KnobValue = 0;
transform.localEulerAngles = Vector3.zero; transform.localEulerAngles = Vector3.zero;
InvokeEvents(knobValue + _currentLoops); InvokeEvents(KnobValue + _currentLoops);
return; 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; transform.localEulerAngles = Vector3.zero;
InvokeEvents(knobValue + _currentLoops); InvokeEvents(KnobValue + _currentLoops);
return; return;
} }
} }
} }
//CHECK MAX VALUE //CHECK MAX VALUE
if (maxValue > 0) if (MaxValue > 0)
{ {
if (knobValue + _currentLoops > maxValue) if (KnobValue + _currentLoops > MaxValue)
{ {
knobValue = maxValue; KnobValue = MaxValue;
float maxAngle = direction == Direction.CW ? 360f - 360f * maxValue : 360f * maxValue; float maxAngle = direction == Direction.CW ? 360f - 360f * MaxValue : 360f * MaxValue;
transform.localEulerAngles = new Vector3(0, 0, maxAngle); transform.localEulerAngles = new Vector3(0, 0, maxAngle);
InvokeEvents(knobValue); InvokeEvents(KnobValue);
return; return;
} }
} }
@ -236,41 +236,41 @@ namespace UnityEngine.UI.Extensions
public void SetKnobValue(float value, int loops = 0) public void SetKnobValue(float value, int loops = 0)
{ {
Quaternion newRoation = Quaternion.identity; Quaternion newRoation = Quaternion.identity;
knobValue = value; KnobValue = value;
_currentLoops = loops; _currentLoops = loops;
if (snapToPosition) if (SnapToPosition)
{ {
SnapToPosition(ref knobValue); SnapToPositionValue(ref KnobValue);
} }
if (direction == Direction.CW) if (direction == Direction.CW)
{ {
newRoation.eulerAngles = new Vector3(0, 0, 360 - 360 * knobValue); newRoation.eulerAngles = new Vector3(0, 0, 360 - 360 * KnobValue);
} }
else else
{ {
newRoation.eulerAngles = new Vector3(0, 0, 360 * knobValue); newRoation.eulerAngles = new Vector3(0, 0, 360 * KnobValue);
} }
UpdateKnobValue(); UpdateKnobValue();
transform.rotation = newRoation; transform.rotation = newRoation;
InvokeEvents(knobValue + _currentLoops); InvokeEvents(KnobValue + _currentLoops);
_previousValue = knobValue; _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; float newValue = Mathf.Round(knobValue / snapStep) * snapStep;
knobValue = newValue; knobValue = newValue;
} }
private void InvokeEvents(float value) private void InvokeEvents(float value)
{ {
if (clampOutput01) if (ClampOutput01)
value /= loops; value /= Loops;
OnValueChanged.Invoke(value); OnValueChanged.Invoke(value);
} }