diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-05-06 22:46:29 -0400 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-05-06 22:46:29 -0400 |
commit | 69fd85ee8e91f610524dfa8134b1d2c56fd8a56d (patch) | |
tree | 72509f1526208c903896c12fafdbc1d01a77eb36 /src/us/minak/MetaCircle.java | |
parent | 5186680f2f185528cd4a0eacc06d28f175d4e58e (diff) | |
parent | f5956625b9086ae719da90095f050403e5e71764 (diff) |
Merge branch 'master' of https://github.com/AndrewMurrell/minak
Diffstat (limited to 'src/us/minak/MetaCircle.java')
-rw-r--r-- | src/us/minak/MetaCircle.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/us/minak/MetaCircle.java b/src/us/minak/MetaCircle.java index 908842a..9139dc9 100644 --- a/src/us/minak/MetaCircle.java +++ b/src/us/minak/MetaCircle.java @@ -5,7 +5,7 @@ package us.minak; * */ public class MetaCircle { - public MetaExpression metaExpr; + private MetaExpression metaExpression; public float x; public float y; public float radius; @@ -14,7 +14,7 @@ public class MetaCircle { public int expansion; //the level of expansion (if multiple circles are expanded, this decides precidence) MetaCircle(float x, float y, float radius, int color, MetaExpression metaExpr) { - this.metaExpr = metaExpr; + this.setMetaExpression(metaExpr); this.x = x; this.y = y; this.radius = radius; @@ -26,4 +26,12 @@ public class MetaCircle { public boolean containsPoint(float x, float y) { return Math.pow(x - this.x, 2) + Math.pow(y - this.y, 2) < Math.pow(this.radius, 2) ? true : false; } + + public MetaExpression getMetaExpression() { + return metaExpression; + } + + public void setMetaExpression(MetaExpression metaExpr) { + this.metaExpression = metaExpr; + } } |