summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AutoVisual/IGPFamily.pde4
-rw-r--r--AutoVisual/IGPHexagon.pde38
-rw-r--r--AutoVisual/IGPSquare.pde118
3 files changed, 80 insertions, 80 deletions
diff --git a/AutoVisual/IGPFamily.pde b/AutoVisual/IGPFamily.pde
index 4434a79..ac7d4cc 100644
--- a/AutoVisual/IGPFamily.pde
+++ b/AutoVisual/IGPFamily.pde
@@ -9,8 +9,8 @@ class IGPFamily {
ArrayList <PVector> alphaCircleVectors;
ArrayList <PVector> alphaCircleVectorsSixteen;
ArrayList <PVector> constructionCircleCenters;
- ArrayList <PVector> constructionPartsTwelve;
- ArrayList <PVector> constructionPartsSixteen;
+ ArrayList <PVector> outerSquareVectors;
+ ArrayList <PVector> outerSquareVectorsSixteen;
IGPFamily(float x, float y, float d){
ellipseMode(CENTER);
diff --git a/AutoVisual/IGPHexagon.pde b/AutoVisual/IGPHexagon.pde
index 11e5457..4babb3b 100644
--- a/AutoVisual/IGPHexagon.pde
+++ b/AutoVisual/IGPHexagon.pde
@@ -19,41 +19,41 @@ class IGPHexagon extends IGPFamily{
void setVectorsOnConstructionCircles(){
int amount = 12;
- constructionPartsTwelve = new ArrayList <PVector>(12);
+ outerSquareVectors = new ArrayList <PVector>(12);
// 0°
- constructionPartsTwelve.add(getVectorOnCircle(constructionCircleCenters.get(0), 0));
+ outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(0), 0));
// 30°
- constructionPartsTwelve.add(getVectorOnCircle(constructionCircleCenters.get(1), 0));
+ outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(1), 0));
// 60°
- constructionPartsTwelve.add(getVectorOnCircle(constructionCircleCenters.get(1), 60));
+ outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(1), 60));
// 90°
- constructionPartsTwelve.add(getVectorOnCircle(constructionCircleCenters.get(1), 120));
+ outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(1), 120));
// 120°
- constructionPartsTwelve.add(getVectorOnCircle(constructionCircleCenters.get(2), 120));
+ outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(2), 120));
// 150°
- constructionPartsTwelve.add(getVectorOnCircle(constructionCircleCenters.get(3), 120));
+ outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(3), 120));
// 180°
- constructionPartsTwelve.add(getVectorOnCircle(constructionCircleCenters.get(3), 180));
+ outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(3), 180));
// 210°
- constructionPartsTwelve.add(getVectorOnCircle(constructionCircleCenters.get(4), 180));
+ outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(4), 180));
// 240°
- constructionPartsTwelve.add(getVectorOnCircle(constructionCircleCenters.get(4), 240));
+ outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(4), 240));
// 270°
- constructionPartsTwelve.add(getVectorOnCircle(constructionCircleCenters.get(4), 300));
+ outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(4), 300));
// 300°
- constructionPartsTwelve.add(getVectorOnCircle(constructionCircleCenters.get(5), 300));
+ outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(5), 300));
// 330°
- constructionPartsTwelve.add(getVectorOnCircle(constructionCircleCenters.get(5), 0));
+ outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(5), 0));
}
void createDividingConstructionLines(int amount){
stroke(0.66, 0.66, 0.66, 0.4);
- createLine(constructionPartsTwelve.get(0), constructionPartsTwelve.get(6));
- createLine(constructionPartsTwelve.get(1), constructionPartsTwelve.get(7));
- createLine(constructionPartsTwelve.get(2), constructionPartsTwelve.get(8));
- createLine(constructionPartsTwelve.get(3), constructionPartsTwelve.get(9));
- createLine(constructionPartsTwelve.get(4), constructionPartsTwelve.get(10));
- createLine(constructionPartsTwelve.get(5), constructionPartsTwelve.get(11));
+ createLine(outerSquareVectors.get(0), outerSquareVectors.get(6));
+ createLine(outerSquareVectors.get(1), outerSquareVectors.get(7));
+ createLine(outerSquareVectors.get(2), outerSquareVectors.get(8));
+ createLine(outerSquareVectors.get(3), outerSquareVectors.get(9));
+ createLine(outerSquareVectors.get(4), outerSquareVectors.get(10));
+ createLine(outerSquareVectors.get(5), outerSquareVectors.get(11));
}
void createDividingLines(int amount){
diff --git a/AutoVisual/IGPSquare.pde b/AutoVisual/IGPSquare.pde
index 3432c81..5ad0823 100644
--- a/AutoVisual/IGPSquare.pde
+++ b/AutoVisual/IGPSquare.pde
@@ -5,8 +5,8 @@ class IGPSquare extends IGPFamily {
super(x, y, d);
parts = p;
setVectorsOnAlphaCircle();
- setConstructionCircleCenters();
setVectorsOnOuterSquare();
+ setConstructionCircleCenters();
}
void setConstructionCircleCenters(){
@@ -19,76 +19,76 @@ class IGPSquare extends IGPFamily {
void setVectorsOnOuterSquare(){
int amount = 12;
- constructionPartsTwelve = new ArrayList <PVector>(12);
- constructionPartsTwelve.add(alphaCircleVectors.get(0));
- constructionPartsTwelve.add(extendLine(mid, alphaCircleVectors.get(1), mid.x+radius, false));
- constructionPartsTwelve.add(extendLine(mid, alphaCircleVectors.get(2), mid.y-radius, true));
- constructionPartsTwelve.add(alphaCircleVectors.get(3));
- constructionPartsTwelve.add(extendLine(mid, alphaCircleVectors.get(4), mid.y-radius, true));
- constructionPartsTwelve.add(extendLine(mid, alphaCircleVectors.get(5), mid.x-radius, false));
- constructionPartsTwelve.add(alphaCircleVectors.get(6));
- constructionPartsTwelve.add(extendLine(mid, alphaCircleVectors.get(7), mid.x-radius, false));
- constructionPartsTwelve.add(extendLine(mid, alphaCircleVectors.get(8), mid.y+radius, true));
- constructionPartsTwelve.add(alphaCircleVectors.get(9));
- constructionPartsTwelve.add(extendLine(mid, alphaCircleVectors.get(10), mid.y+radius, true));
- constructionPartsTwelve.add(extendLine(mid, alphaCircleVectors.get(11), mid.x+radius, false));
+ outerSquareVectors = new ArrayList <PVector>(12);
+ outerSquareVectors.add(alphaCircleVectors.get(0));
+ outerSquareVectors.add(extendLine(mid, alphaCircleVectors.get(1), mid.x+radius, false));
+ outerSquareVectors.add(extendLine(mid, alphaCircleVectors.get(2), mid.y-radius, true));
+ outerSquareVectors.add(alphaCircleVectors.get(3));
+ outerSquareVectors.add(extendLine(mid, alphaCircleVectors.get(4), mid.y-radius, true));
+ outerSquareVectors.add(extendLine(mid, alphaCircleVectors.get(5), mid.x-radius, false));
+ outerSquareVectors.add(alphaCircleVectors.get(6));
+ outerSquareVectors.add(extendLine(mid, alphaCircleVectors.get(7), mid.x-radius, false));
+ outerSquareVectors.add(extendLine(mid, alphaCircleVectors.get(8), mid.y+radius, true));
+ outerSquareVectors.add(alphaCircleVectors.get(9));
+ outerSquareVectors.add(extendLine(mid, alphaCircleVectors.get(10), mid.y+radius, true));
+ outerSquareVectors.add(extendLine(mid, alphaCircleVectors.get(11), mid.x+radius, false));
- constructionPartsSixteen = new ArrayList <PVector>(16);
- constructionPartsSixteen.add(alphaCircleVectorsSixteen.get(0));
- constructionPartsSixteen.add(extendLine(mid, alphaCircleVectorsSixteen.get(1), mid.x+radius, false));
- constructionPartsSixteen.add(new PVector(mid.x+radius, mid.y-radius));
- constructionPartsSixteen.add(extendLine(mid, alphaCircleVectorsSixteen.get(3), mid.y-radius, true));
- constructionPartsSixteen.add(alphaCircleVectorsSixteen.get(4));
- constructionPartsSixteen.add(extendLine(mid, alphaCircleVectorsSixteen.get(5), mid.y-radius, true));
- constructionPartsSixteen.add(new PVector(mid.x-radius, mid.y-radius));
- constructionPartsSixteen.add(extendLine(mid, alphaCircleVectorsSixteen.get(7), mid.x-radius, false));
- constructionPartsSixteen.add(alphaCircleVectorsSixteen.get(8));
- constructionPartsSixteen.add(extendLine(mid, alphaCircleVectorsSixteen.get(9), mid.x-radius, false));
- constructionPartsSixteen.add(new PVector(mid.x-radius, mid.y+radius));
- constructionPartsSixteen.add(extendLine(mid, alphaCircleVectorsSixteen.get(11), mid.y+radius, true));
- constructionPartsSixteen.add(alphaCircleVectorsSixteen.get(12));
- constructionPartsSixteen.add(extendLine(mid, alphaCircleVectorsSixteen.get(13), mid.y+radius, true));
- constructionPartsSixteen.add(new PVector(mid.x+radius, mid.y+radius));
- constructionPartsSixteen.add(extendLine(mid, alphaCircleVectorsSixteen.get(15), mid.x+radius, false));
+ outerSquareVectorsSixteen = new ArrayList <PVector>(16);
+ outerSquareVectorsSixteen.add(alphaCircleVectorsSixteen.get(0));
+ outerSquareVectorsSixteen.add(extendLine(mid, alphaCircleVectorsSixteen.get(1), mid.x+radius, false));
+ outerSquareVectorsSixteen.add(new PVector(mid.x+radius, mid.y-radius));
+ outerSquareVectorsSixteen.add(extendLine(mid, alphaCircleVectorsSixteen.get(3), mid.y-radius, true));
+ outerSquareVectorsSixteen.add(alphaCircleVectorsSixteen.get(4));
+ outerSquareVectorsSixteen.add(extendLine(mid, alphaCircleVectorsSixteen.get(5), mid.y-radius, true));
+ outerSquareVectorsSixteen.add(new PVector(mid.x-radius, mid.y-radius));
+ outerSquareVectorsSixteen.add(extendLine(mid, alphaCircleVectorsSixteen.get(7), mid.x-radius, false));
+ outerSquareVectorsSixteen.add(alphaCircleVectorsSixteen.get(8));
+ outerSquareVectorsSixteen.add(extendLine(mid, alphaCircleVectorsSixteen.get(9), mid.x-radius, false));
+ outerSquareVectorsSixteen.add(new PVector(mid.x-radius, mid.y+radius));
+ outerSquareVectorsSixteen.add(extendLine(mid, alphaCircleVectorsSixteen.get(11), mid.y+radius, true));
+ outerSquareVectorsSixteen.add(alphaCircleVectorsSixteen.get(12));
+ outerSquareVectorsSixteen.add(extendLine(mid, alphaCircleVectorsSixteen.get(13), mid.y+radius, true));
+ outerSquareVectorsSixteen.add(new PVector(mid.x+radius, mid.y+radius));
+ outerSquareVectorsSixteen.add(extendLine(mid, alphaCircleVectorsSixteen.get(15), mid.x+radius, false));
}
void createDividingLines(){
if(parts == 12){
- createLine(constructionPartsTwelve.get(0), constructionPartsTwelve.get(6));
- createLine(constructionPartsTwelve.get(1), constructionPartsTwelve.get(7));
- createLine(constructionPartsTwelve.get(2), constructionPartsTwelve.get(8));
- createLine(constructionPartsTwelve.get(3), constructionPartsTwelve.get(9));
- createLine(constructionPartsTwelve.get(4), constructionPartsTwelve.get(10));
- createLine(constructionPartsTwelve.get(5), constructionPartsTwelve.get(11));
+ createLine(outerSquareVectors.get(0), outerSquareVectors.get(6));
+ createLine(outerSquareVectors.get(1), outerSquareVectors.get(7));
+ createLine(outerSquareVectors.get(2), outerSquareVectors.get(8));
+ createLine(outerSquareVectors.get(3), outerSquareVectors.get(9));
+ createLine(outerSquareVectors.get(4), outerSquareVectors.get(10));
+ createLine(outerSquareVectors.get(5), outerSquareVectors.get(11));
}else if (parts == 16){
- createLine(constructionPartsSixteen.get(0), constructionPartsSixteen.get(8));
- createLine(constructionPartsSixteen.get(1), constructionPartsSixteen.get(9));
- createLine(constructionPartsSixteen.get(2), constructionPartsSixteen.get(10));
- createLine(constructionPartsSixteen.get(3), constructionPartsSixteen.get(11));
- createLine(constructionPartsSixteen.get(4), constructionPartsSixteen.get(12));
- createLine(constructionPartsSixteen.get(5), constructionPartsSixteen.get(13));
- createLine(constructionPartsSixteen.get(6), constructionPartsSixteen.get(14));
- createLine(constructionPartsSixteen.get(7), constructionPartsSixteen.get(15));
+ createLine(outerSquareVectorsSixteen.get(0), outerSquareVectorsSixteen.get(8));
+ createLine(outerSquareVectorsSixteen.get(1), outerSquareVectorsSixteen.get(9));
+ createLine(outerSquareVectorsSixteen.get(2), outerSquareVectorsSixteen.get(10));
+ createLine(outerSquareVectorsSixteen.get(3), outerSquareVectorsSixteen.get(11));
+ createLine(outerSquareVectorsSixteen.get(4), outerSquareVectorsSixteen.get(12));
+ createLine(outerSquareVectorsSixteen.get(5), outerSquareVectorsSixteen.get(13));
+ createLine(outerSquareVectorsSixteen.get(6), outerSquareVectorsSixteen.get(14));
+ createLine(outerSquareVectorsSixteen.get(7), outerSquareVectorsSixteen.get(15));
}
}
void createDividingConstructionLines(){
if(parts == 12){
- createLine(constructionPartsTwelve.get(0), constructionPartsTwelve.get(6));
- createLine(constructionPartsTwelve.get(1), constructionPartsTwelve.get(7));
- createLine(constructionPartsTwelve.get(2), constructionPartsTwelve.get(8));
- createLine(constructionPartsTwelve.get(3), constructionPartsTwelve.get(9));
- createLine(constructionPartsTwelve.get(4), constructionPartsTwelve.get(10));
- createLine(constructionPartsTwelve.get(5), constructionPartsTwelve.get(11));
+ createLine(outerSquareVectors.get(0), outerSquareVectors.get(6));
+ createLine(outerSquareVectors.get(1), outerSquareVectors.get(7));
+ createLine(outerSquareVectors.get(2), outerSquareVectors.get(8));
+ createLine(outerSquareVectors.get(3), outerSquareVectors.get(9));
+ createLine(outerSquareVectors.get(4), outerSquareVectors.get(10));
+ createLine(outerSquareVectors.get(5), outerSquareVectors.get(11));
}else if (parts == 16){
- createLine(constructionPartsSixteen.get(0), constructionPartsSixteen.get(8));
- createLine(constructionPartsSixteen.get(1), constructionPartsSixteen.get(9));
- createLine(constructionPartsSixteen.get(2), constructionPartsSixteen.get(10));
- createLine(constructionPartsSixteen.get(3), constructionPartsSixteen.get(11));
- createLine(constructionPartsSixteen.get(4), constructionPartsSixteen.get(12));
- createLine(constructionPartsSixteen.get(5), constructionPartsSixteen.get(13));
- createLine(constructionPartsSixteen.get(6), constructionPartsSixteen.get(14));
- createLine(constructionPartsSixteen.get(7), constructionPartsSixteen.get(15));
+ createLine(outerSquareVectorsSixteen.get(0), outerSquareVectorsSixteen.get(8));
+ createLine(outerSquareVectorsSixteen.get(1), outerSquareVectorsSixteen.get(9));
+ createLine(outerSquareVectorsSixteen.get(2), outerSquareVectorsSixteen.get(10));
+ createLine(outerSquareVectorsSixteen.get(3), outerSquareVectorsSixteen.get(11));
+ createLine(outerSquareVectorsSixteen.get(4), outerSquareVectorsSixteen.get(12));
+ createLine(outerSquareVectorsSixteen.get(5), outerSquareVectorsSixteen.get(13));
+ createLine(outerSquareVectorsSixteen.get(6), outerSquareVectorsSixteen.get(14));
+ createLine(outerSquareVectorsSixteen.get(7), outerSquareVectorsSixteen.get(15));
}
}
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-21 12:47:52 +0000