pengtaihao
/
com.unity.uiextensions
mirror of https://github.com/Unity-UI-Extensions/com.unity.uiextensions
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix menuOptions add credit header

pull/413/head
soprachevAK 2020-08-18 18:21:17 +03:00
parent 2f46065d99
commit 5c88d7d3a0
2 changed files with 1537 additions and 1533 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Editor/UIExtensionsMenuOptions.cs
View File

@ -817,6 +817,7 @@ namespace UnityEditor.UI
overlayScrollPanelScrollbarRT.GetComponent<Scrollbar>().direction = Scrollbar.Direction.BottomToTop; overlayScrollPanelScrollbarRT.GetComponent<Scrollbar>().direction = Scrollbar.Direction.BottomToTop;
overlayScrollPanelScrollBar.transform.GetChild(0).name = "SlidingArea"; overlayScrollPanelScrollBar.transform.GetChild(0).name = "SlidingArea";
//Arrow Button //Arrow Button
arrowButton.name = "ArrowBtn"; arrowButton.name = "ArrowBtn";
var arrowButtonRT = arrowButton.GetComponent<RectTransform>(); var arrowButtonRT = arrowButton.GetComponent<RectTransform>();

17
Runtime/Scripts/Primitives/UISquircle.cs
View File

@ -1,4 +1,6 @@
using System.Collections.Generic; /// Credit Soprachev Andrei
using System.Collections.Generic;
using System.Linq; using System.Linq;
using UnityEditor; using UnityEditor;
@ -16,11 +18,11 @@ namespace UnityEngine.UI.Extensions
} }
[Space] [Space]
public Type squircleType; public Type squircleType = Type.Scaled;
[Range(1, 40)] [Range(1, 40)]
public float n = 4; public float n = 4;
[Min(0.1f)] [Min(0.1f)]
public float delta = 10f; public float delta = 5f;
public float quality = 0.1f; public float quality = 0.1f;
[Min(0)] [Min(0)]
public float radius = 1000; public float radius = 1000;
@ -30,13 +32,14 @@ namespace UnityEngine.UI.Extensions
private List<Vector2> vert = new List<Vector2>(); private List<Vector2> vert = new List<Vector2>();
float Func(float t, bool xByY) private float SquircleFunc(float t, bool xByY)
{ {
if (xByY) if (xByY)
return (float)System.Math.Pow(C - System.Math.Pow(t / a, n), 1f / n) * b; return (float)System.Math.Pow(C - System.Math.Pow(t / a, n), 1f / n) * b;
return (float)System.Math.Pow(C - System.Math.Pow(t / b, n), 1f / n) * a; return (float)System.Math.Pow(C - System.Math.Pow(t / b, n), 1f / n) * a;
} }
protected override void OnPopulateMesh(VertexHelper vh) protected override void OnPopulateMesh(VertexHelper vh)
{ {
@ -68,7 +71,7 @@ namespace UnityEngine.UI.Extensions
vert.Add(new Vector2(0, height)); vert.Add(new Vector2(0, height));
while (x < y) while (x < y)
{ {
y = Func(x, true); y = SquircleFunc(x, true);
vert.Add(new Vector2(dx + x, dy + y)); vert.Add(new Vector2(dx + x, dy + y));
x += delta; x += delta;
} }
@ -80,7 +83,7 @@ namespace UnityEngine.UI.Extensions
while (y > 0) while (y > 0)
{ {
x = Func(y, false); x = SquircleFunc(y, false);
vert.Add(new Vector2(dx + x, dy + y)); vert.Add(new Vector2(dx + x, dy + y));
y -= delta; y -= delta;
} }
@ -128,7 +131,7 @@ namespace UnityEngine.UI.Extensions
public override void OnInspectorGUI() public override void OnInspectorGUI()
{ {
DrawDefaultInspector(); DrawDefaultInspector();
var script = (UISquircle)target; UISquircle script = (UISquircle)target;
GUILayout.Label("Vertex count: " + script.vert.Count().ToString()); GUILayout.Label("Vertex count: " + script.vert.Count().ToString());
} }
} }