Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #3

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions Custom 2D Colliders.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Custom 2D Colliders/Scripts.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Custom 2D Colliders/Scripts/ArcCollider2D.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Custom 2D Colliders/Scripts/BezierCurveCollider2D.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Custom 2D Colliders/Scripts/CapsuleCollider2D.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Custom 2D Colliders/Scripts/Editor.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Custom 2D Colliders/Scripts/Editor/ArcCollider2D_Editor.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 18 additions & 22 deletions Custom 2D Colliders/Scripts/Editor/EllipseCollider2D_Editor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,36 +29,32 @@
using UnityEditor;
using System.Collections;

[CustomEditor (typeof(EllipseCollider2D))]
public class EllipseCollider_Editor : Editor {

EllipseCollider2D ec;
EdgeCollider2D edgeCollider;
Vector2 off;

void OnEnable()
[CustomEditor(typeof(EllipseCollider2D))]
public sealed class EllipseCollider_Editor : Editor
{
EllipseCollider2D ellipseCollider
{
ec = (EllipseCollider2D)target;
get { return (EllipseCollider2D)target; }
}

edgeCollider = ec.GetComponent<EdgeCollider2D>();
if (edgeCollider == null) {
ec.gameObject.AddComponent<EdgeCollider2D>();
edgeCollider = ec.GetComponent<EdgeCollider2D>();
PolygonCollider2D polygonCollider
{
get {
return ellipseCollider.GetComponent<PolygonCollider2D>() ?? ellipseCollider.gameObject.AddComponent<PolygonCollider2D>();
}
edgeCollider.points = ec.getPoints(edgeCollider.offset);
}

void OnEnable()
{
polygonCollider.hideFlags = HideFlags.HideInInspector;
}

public override void OnInspectorGUI()
{
GUI.changed = false;
DrawDefaultInspector();

if (GUI.changed || !off.Equals(edgeCollider.offset))
{
edgeCollider.points = ec.getPoints(edgeCollider.offset);
}

off = edgeCollider.offset;

if (GUI.changed)
polygonCollider.points = ellipseCollider.getPoints();
}

}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Custom 2D Colliders/Scripts/Editor/StarCollider2D_Editor.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 21 additions & 23 deletions Custom 2D Colliders/Scripts/EllipseCollider2D.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,45 +32,43 @@

[AddComponentMenu("Physics 2D/Ellipse Collider 2D")]

[RequireComponent(typeof(EdgeCollider2D))]
public class EllipseCollider2D : MonoBehaviour {

[Range(1, 25)]
[RequireComponent(typeof(PolygonCollider2D))]
public sealed class EllipseCollider2D : MonoBehaviour {
public PolygonCollider2D polygonCollider
{
get { return gameObject.GetComponent<PolygonCollider2D>(); }
}

[Range(0, 25)]
public float radiusX = 1, radiusY = 2;

[Range(10,90)]
[Range(10, 90)]
public int smoothness = 30;

[Range(0, 180)]
[Range(-180, 180)]
public int rotation = 0;

public Vector2 offset = new Vector2(0.0f, 0.0f);

Vector2 origin, center;

public Vector2[] getPoints(Vector2 off)
public void Start()
{
List<Vector2> points = new List<Vector2>();
polygonCollider.points = getPoints();
}

origin = transform.localPosition;
center = origin + off;
public Vector2[] getPoints()
{
List<Vector2> points = new List<Vector2>();

float ang = 0;
float o = rotation * Mathf.Deg2Rad;

for (int i = 0; i <= smoothness; i++)
{
float a = ang * Mathf.Deg2Rad;

// fan shuriken
//float radius;
//float radX = 90 - (Mathf.Abs(ang) % 90);
//float radY = 90 - radX;
//radius = ((radiusX * radX / 90f) + (radiusY * radY / 90f)) / 2f;
//float x = center.x + radius * Mathf.Cos(a);
//float y = center.y + radius * Mathf.Sin(a);


// https://www.uwgb.edu/dutchs/Geometry/HTMLCanvas/ObliqueEllipses5a.HTM
float x = center.x + radiusX * Mathf.Cos(a) * Mathf.Cos(o) - radiusY * Mathf.Sin(a) * Mathf.Sin(o);
float y = center.y - radiusX * Mathf.Cos(a) * Mathf.Sin(o) - radiusY * Mathf.Sin(a) * Mathf.Cos(o);
float x = offset.x + radiusX * Mathf.Cos(a) * Mathf.Cos(o) - radiusY * Mathf.Sin(a) * Mathf.Sin(o);
float y = offset.y - radiusX * Mathf.Cos(a) * Mathf.Sin(o) - radiusY * Mathf.Sin(a) * Mathf.Cos(o);

points.Add(new Vector2(x, y));
ang += 360f/smoothness;
Expand Down
12 changes: 12 additions & 0 deletions Custom 2D Colliders/Scripts/EllipseCollider2D.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Custom 2D Colliders/Scripts/RoundedBoxCollider2D.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Custom 2D Colliders/Scripts/StarCollider2D.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions CustomColliders2D.unitypackage.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions LICENSE.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions README.md.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.