diff options
author | nfoy <nfoy@purdue.edu> | 2014-05-06 22:27:10 -0400 |
---|---|---|
committer | nfoy <nfoy@purdue.edu> | 2014-05-06 22:27:10 -0400 |
commit | 9fa809f92c74b866153b9903e5602011d4024023 (patch) | |
tree | 10dc54fc3d57a4e589dedf6c8f62106bc757216e /src/us/minak/MetaCircle.java | |
parent | 32d8ef744b082aabee4fbb30aea616cff2c74c4b (diff) | |
parent | cc0db6ceec33742b018a989d4b9bbf046418ca9f (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; + } } |