From beeb1d100a462d5825913f46c8560dec87e4b708 Mon Sep 17 00:00:00 2001 From: David Runge Date: Tue, 5 Jan 2016 17:57:36 +0100 Subject: AutoVisual/IGPTheGreatMosqueOfKairouan.pde: Replacing all calls to getVectorOnAlphaCircle() with calls to static lists. --- AutoVisual/IGPTheGreatMosqueOfKairouan.pde | 66 +++++++++++++++--------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/AutoVisual/IGPTheGreatMosqueOfKairouan.pde b/AutoVisual/IGPTheGreatMosqueOfKairouan.pde index a13b5b3..3861ddf 100644 --- a/AutoVisual/IGPTheGreatMosqueOfKairouan.pde +++ b/AutoVisual/IGPTheGreatMosqueOfKairouan.pde @@ -19,29 +19,29 @@ class IGPTheGreatMosqueOfKairouan extends IGPSquare{ void setVectorsOnOuterSquare(){ vectorsOnOuterSquare = new ArrayList (24); vectorsOnOuterSquare.add(alphaCircleVectors.get(0)); - vectorsOnOuterSquare.add(getVectorOnExtendedLine(getLineIntersection(getVectorOnAlphaCircle(315), getVectorOnAlphaCircle(45), getVectorOnAlphaCircle(90), getVectorOnAlphaCircle(0)), getLineIntersection(getVectorOnAlphaCircle(225), getVectorOnAlphaCircle(135), getVectorOnAlphaCircle(180), getVectorOnAlphaCircle(90)), mid.x+radius, false)); - vectorsOnOuterSquare.add(getVectorOnExtendedLine(getVectorOnAlphaCircle(90), getVectorOnAlphaCircle(45), mid.x+radius, false)); + vectorsOnOuterSquare.add(getVectorOnExtendedLine(getLineIntersection(alphaCircleVectorsSixteen.get(14), alphaCircleVectorsSixteen.get(2), alphaCircleVectorsSixteen.get(4), alphaCircleVectorsSixteen.get(0)), getLineIntersection(alphaCircleVectorsSixteen.get(10), alphaCircleVectorsSixteen.get(6), alphaCircleVectorsSixteen.get(8), alphaCircleVectorsSixteen.get(4)), mid.x+radius, false)); + vectorsOnOuterSquare.add(getVectorOnExtendedLine(alphaCircleVectorsSixteen.get(4), alphaCircleVectorsSixteen.get(2), mid.x+radius, false)); vectorsOnOuterSquare.add(new PVector(mid.x+radius, mid.y+radius)); - vectorsOnOuterSquare.add(getVectorOnExtendedLine(getVectorOnAlphaCircle(0), getVectorOnAlphaCircle(45), mid.y+radius, true)); - vectorsOnOuterSquare.add(getVectorOnExtendedLine(getLineIntersection(getVectorOnAlphaCircle(135), getVectorOnAlphaCircle(45), getVectorOnAlphaCircle(90), getVectorOnAlphaCircle(0)), getLineIntersection(getVectorOnAlphaCircle(225), getVectorOnAlphaCircle(315), getVectorOnAlphaCircle(270), getVectorOnAlphaCircle(0)), mid.y+radius, true)); + vectorsOnOuterSquare.add(getVectorOnExtendedLine(alphaCircleVectorsSixteen.get(0), alphaCircleVectorsSixteen.get(2), mid.y+radius, true)); + vectorsOnOuterSquare.add(getVectorOnExtendedLine(getLineIntersection(alphaCircleVectorsSixteen.get(6), alphaCircleVectorsSixteen.get(2), alphaCircleVectorsSixteen.get(4), alphaCircleVectorsSixteen.get(0)), getLineIntersection(alphaCircleVectorsSixteen.get(10), alphaCircleVectorsSixteen.get(14), alphaCircleVectorsSixteen.get(12), alphaCircleVectorsSixteen.get(0)), mid.y+radius, true)); vectorsOnOuterSquare.add(new PVector(mid.x, mid.y+radius)); - vectorsOnOuterSquare.add(getVectorOnExtendedLine(getLineIntersection(getVectorOnAlphaCircle(135), getVectorOnAlphaCircle(45), getVectorOnAlphaCircle(180), getVectorOnAlphaCircle(90)), getLineIntersection(getVectorOnAlphaCircle(225), getVectorOnAlphaCircle(315), getVectorOnAlphaCircle(180), getVectorOnAlphaCircle(270)), mid.y+radius, true)); - vectorsOnOuterSquare.add(getVectorOnExtendedLine(getVectorOnAlphaCircle(180), getVectorOnAlphaCircle(135), mid.y+radius, true)); + vectorsOnOuterSquare.add(getVectorOnExtendedLine(getLineIntersection(alphaCircleVectorsSixteen.get(6), alphaCircleVectorsSixteen.get(2), alphaCircleVectorsSixteen.get(8), alphaCircleVectorsSixteen.get(4)), getLineIntersection(alphaCircleVectorsSixteen.get(10), alphaCircleVectorsSixteen.get(14), alphaCircleVectorsSixteen.get(8), alphaCircleVectorsSixteen.get(12)), mid.y+radius, true)); + vectorsOnOuterSquare.add(getVectorOnExtendedLine(alphaCircleVectorsSixteen.get(8), alphaCircleVectorsSixteen.get(6), mid.y+radius, true)); vectorsOnOuterSquare.add(new PVector(mid.x-radius, mid.y+radius)); - vectorsOnOuterSquare.add(getVectorOnExtendedLine(getVectorOnAlphaCircle(90), getVectorOnAlphaCircle(135), mid.x-radius, false)); - vectorsOnOuterSquare.add(getVectorOnExtendedLine(getLineIntersection(getVectorOnAlphaCircle(135), getVectorOnAlphaCircle(225), getVectorOnAlphaCircle(90), getVectorOnAlphaCircle(180)), getLineIntersection(getVectorOnAlphaCircle(90), getVectorOnAlphaCircle(0), getVectorOnAlphaCircle(315), getVectorOnAlphaCircle(45)), mid.x-radius, false)); + vectorsOnOuterSquare.add(getVectorOnExtendedLine(alphaCircleVectorsSixteen.get(4), alphaCircleVectorsSixteen.get(6), mid.x-radius, false)); + vectorsOnOuterSquare.add(getVectorOnExtendedLine(getLineIntersection(alphaCircleVectorsSixteen.get(6), alphaCircleVectorsSixteen.get(10), alphaCircleVectorsSixteen.get(4), alphaCircleVectorsSixteen.get(8)), getLineIntersection(alphaCircleVectorsSixteen.get(4), alphaCircleVectorsSixteen.get(0), alphaCircleVectorsSixteen.get(14), alphaCircleVectorsSixteen.get(2)), mid.x-radius, false)); vectorsOnOuterSquare.add(new PVector(mid.x-radius, mid.y)); - vectorsOnOuterSquare.add(getVectorOnExtendedLine(getLineIntersection(getVectorOnAlphaCircle(180), getVectorOnAlphaCircle(270), getVectorOnAlphaCircle(135), getVectorOnAlphaCircle(225)), getLineIntersection(getVectorOnAlphaCircle(270), getVectorOnAlphaCircle(0), getVectorOnAlphaCircle(315), getVectorOnAlphaCircle(45)), mid.x-radius, false)); - vectorsOnOuterSquare.add(getVectorOnExtendedLine(getVectorOnAlphaCircle(270), getVectorOnAlphaCircle(225), mid.x-radius, false)); + vectorsOnOuterSquare.add(getVectorOnExtendedLine(getLineIntersection(alphaCircleVectorsSixteen.get(8), alphaCircleVectorsSixteen.get(12), alphaCircleVectorsSixteen.get(6), alphaCircleVectorsSixteen.get(10)), getLineIntersection(alphaCircleVectorsSixteen.get(12), alphaCircleVectorsSixteen.get(0), alphaCircleVectorsSixteen.get(14), alphaCircleVectorsSixteen.get(2)), mid.x-radius, false)); + vectorsOnOuterSquare.add(getVectorOnExtendedLine(alphaCircleVectorsSixteen.get(12), alphaCircleVectorsSixteen.get(10), mid.x-radius, false)); vectorsOnOuterSquare.add(new PVector(mid.x-radius, mid.y-radius)); - vectorsOnOuterSquare.add(getVectorOnExtendedLine(getVectorOnAlphaCircle(180), getVectorOnAlphaCircle(225), mid.y-radius, true)); - vectorsOnOuterSquare.add(getVectorOnExtendedLine(getLineIntersection(getVectorOnAlphaCircle(225), getVectorOnAlphaCircle(315), getVectorOnAlphaCircle(180), getVectorOnAlphaCircle(270)), getLineIntersection(getVectorOnAlphaCircle(180), getVectorOnAlphaCircle(90), getVectorOnAlphaCircle(135), getVectorOnAlphaCircle(45)), mid.y-radius, true)); + vectorsOnOuterSquare.add(getVectorOnExtendedLine(alphaCircleVectorsSixteen.get(8), alphaCircleVectorsSixteen.get(10), mid.y-radius, true)); + vectorsOnOuterSquare.add(getVectorOnExtendedLine(getLineIntersection(alphaCircleVectorsSixteen.get(10), alphaCircleVectorsSixteen.get(14), alphaCircleVectorsSixteen.get(8), alphaCircleVectorsSixteen.get(12)), getLineIntersection(alphaCircleVectorsSixteen.get(8), alphaCircleVectorsSixteen.get(4), alphaCircleVectorsSixteen.get(6), alphaCircleVectorsSixteen.get(2)), mid.y-radius, true)); vectorsOnOuterSquare.add(new PVector(mid.x, mid.y-radius)); - vectorsOnOuterSquare.add(getVectorOnExtendedLine(getLineIntersection(getVectorOnAlphaCircle(225), getVectorOnAlphaCircle(315), getVectorOnAlphaCircle(270), getVectorOnAlphaCircle(0)), getLineIntersection(getVectorOnAlphaCircle(90), getVectorOnAlphaCircle(0), getVectorOnAlphaCircle(135), getVectorOnAlphaCircle(45)), mid.y-radius, true)); - vectorsOnOuterSquare.add(getVectorOnExtendedLine(getVectorOnAlphaCircle(0), getVectorOnAlphaCircle(315), mid.y-radius, true)); + vectorsOnOuterSquare.add(getVectorOnExtendedLine(getLineIntersection(alphaCircleVectorsSixteen.get(10), alphaCircleVectorsSixteen.get(14), alphaCircleVectorsSixteen.get(12), alphaCircleVectorsSixteen.get(0)), getLineIntersection(alphaCircleVectorsSixteen.get(4), alphaCircleVectorsSixteen.get(0), alphaCircleVectorsSixteen.get(6), alphaCircleVectorsSixteen.get(2)), mid.y-radius, true)); + vectorsOnOuterSquare.add(getVectorOnExtendedLine(alphaCircleVectorsSixteen.get(0), alphaCircleVectorsSixteen.get(14), mid.y-radius, true)); vectorsOnOuterSquare.add(new PVector(mid.x+radius, mid.y-radius)); - vectorsOnOuterSquare.add(getVectorOnExtendedLine(getVectorOnAlphaCircle(270), getVectorOnAlphaCircle(315), mid.x+radius, false)); - vectorsOnOuterSquare.add(getVectorOnExtendedLine(getLineIntersection(getVectorOnAlphaCircle(315), getVectorOnAlphaCircle(45), getVectorOnAlphaCircle(270), getVectorOnAlphaCircle(0)), getLineIntersection(getVectorOnAlphaCircle(135), getVectorOnAlphaCircle(225), getVectorOnAlphaCircle(180), getVectorOnAlphaCircle(270)), mid.x+radius, false)); + vectorsOnOuterSquare.add(getVectorOnExtendedLine(alphaCircleVectorsSixteen.get(12), alphaCircleVectorsSixteen.get(14), mid.x+radius, false)); + vectorsOnOuterSquare.add(getVectorOnExtendedLine(getLineIntersection(alphaCircleVectorsSixteen.get(14), alphaCircleVectorsSixteen.get(2), alphaCircleVectorsSixteen.get(12), alphaCircleVectorsSixteen.get(0)), getLineIntersection(alphaCircleVectorsSixteen.get(6), alphaCircleVectorsSixteen.get(10), alphaCircleVectorsSixteen.get(8), alphaCircleVectorsSixteen.get(12)), mid.x+radius, false)); } void setMiddleStar(){ @@ -70,25 +70,25 @@ class IGPTheGreatMosqueOfKairouan extends IGPSquare{ cornerPiece[0] = vectorsOnOuterSquare.get(2); cornerPiece[1] = vectorsOnOuterSquare.get(3); cornerPiece[2] = vectorsOnOuterSquare.get(4); - cornerPiece[3] = getVectorOnAlphaCircle(45); + cornerPiece[3] = alphaCircleVectorsSixteen.get(2); cornerPieces[0] = cornerPiece; cornerPiece = new PVector[4]; cornerPiece[0] = vectorsOnOuterSquare.get(8); cornerPiece[1] = vectorsOnOuterSquare.get(9); cornerPiece[2] = vectorsOnOuterSquare.get(10); - cornerPiece[3] = getVectorOnAlphaCircle(135); + cornerPiece[3] = alphaCircleVectorsSixteen.get(6); cornerPieces[1] = cornerPiece; cornerPiece = new PVector[4]; cornerPiece[0] = vectorsOnOuterSquare.get(14); cornerPiece[1] = vectorsOnOuterSquare.get(15); cornerPiece[2] = vectorsOnOuterSquare.get(16); - cornerPiece[3] = getVectorOnAlphaCircle(225); + cornerPiece[3] = alphaCircleVectorsSixteen.get(10); cornerPieces[2] = cornerPiece; cornerPiece = new PVector[4]; cornerPiece[0] = vectorsOnOuterSquare.get(20); cornerPiece[1] = vectorsOnOuterSquare.get(21); cornerPiece[2] = vectorsOnOuterSquare.get(22); - cornerPiece[3] = getVectorOnAlphaCircle(315); + cornerPiece[3] = alphaCircleVectorsSixteen.get(14); cornerPieces[3] = cornerPiece; } @@ -97,13 +97,13 @@ class IGPTheGreatMosqueOfKairouan extends IGPSquare{ PVector[] sidePiece = new PVector[6]; sidePiece[0] = vectorsOnOuterSquare.get(0); sidePiece[1] = vectorsOnOuterSquare.get(2); - sidePiece[2] = getVectorOnAlphaCircle(45); + sidePiece[2] = alphaCircleVectorsSixteen.get(2); sidePiece[3] = getLineIntersection(vectorsOnOuterSquare.get(2), vectorsOnOuterSquare.get(16), vectorsOnOuterSquare.get(0), vectorsOnOuterSquare.get(4)); sidePiece[4] = getLineIntersection(vectorsOnOuterSquare.get(2), vectorsOnOuterSquare.get(16), vectorsOnOuterSquare.get(0), vectorsOnOuterSquare.get(6)); sidePiece[5] = getLineIntersection(vectorsOnOuterSquare.get(1), vectorsOnOuterSquare.get(11), vectorsOnOuterSquare.get(0), vectorsOnOuterSquare.get(4)); sidePieces[0] = sidePiece; sidePiece = new PVector[6]; - sidePiece[0] = getVectorOnAlphaCircle(45); + sidePiece[0] = alphaCircleVectorsSixteen.get(2); sidePiece[1] = vectorsOnOuterSquare.get(4); sidePiece[2] = vectorsOnOuterSquare.get(6); sidePiece[3] = getLineIntersection(vectorsOnOuterSquare.get(2), vectorsOnOuterSquare.get(6), vectorsOnOuterSquare.get(5), vectorsOnOuterSquare.get(19)); @@ -113,13 +113,13 @@ class IGPTheGreatMosqueOfKairouan extends IGPSquare{ sidePiece = new PVector[6]; sidePiece[0] = vectorsOnOuterSquare.get(6); sidePiece[1] = vectorsOnOuterSquare.get(8); - sidePiece[2] = getVectorOnAlphaCircle(135); + sidePiece[2] = alphaCircleVectorsSixteen.get(6); sidePiece[3] = getLineIntersection(vectorsOnOuterSquare.get(10), vectorsOnOuterSquare.get(6), vectorsOnOuterSquare.get(8), vectorsOnOuterSquare.get(22)); sidePiece[4] = getLineIntersection(vectorsOnOuterSquare.get(6), vectorsOnOuterSquare.get(12), vectorsOnOuterSquare.get(8), vectorsOnOuterSquare.get(22)); sidePiece[5] = getLineIntersection(vectorsOnOuterSquare.get(10), vectorsOnOuterSquare.get(6), vectorsOnOuterSquare.get(7), vectorsOnOuterSquare.get(17)); sidePieces[2] = sidePiece; sidePiece = new PVector[6]; - sidePiece[0] = getVectorOnAlphaCircle(135); + sidePiece[0] = alphaCircleVectorsSixteen.get(6); sidePiece[1] = vectorsOnOuterSquare.get(10); sidePiece[2] = vectorsOnOuterSquare.get(12); sidePiece[3] = getLineIntersection(vectorsOnOuterSquare.get(12), vectorsOnOuterSquare.get(8), vectorsOnOuterSquare.get(11), vectorsOnOuterSquare.get(1)); @@ -127,7 +127,7 @@ class IGPTheGreatMosqueOfKairouan extends IGPSquare{ sidePiece[5] = getLineIntersection(vectorsOnOuterSquare.get(10), vectorsOnOuterSquare.get(20), vectorsOnOuterSquare.get(8), vectorsOnOuterSquare.get(12)); sidePieces[3] = sidePiece; sidePiece = new PVector[6]; - sidePiece[0] = getVectorOnAlphaCircle(225); + sidePiece[0] = alphaCircleVectorsSixteen.get(10); sidePiece[1] = getLineIntersection(vectorsOnOuterSquare.get(16), vectorsOnOuterSquare.get(12), vectorsOnOuterSquare.get(4), vectorsOnOuterSquare.get(14)); sidePiece[2] = getLineIntersection(vectorsOnOuterSquare.get(20), vectorsOnOuterSquare.get(12), vectorsOnOuterSquare.get(4), vectorsOnOuterSquare.get(14)); sidePiece[3] = getLineIntersection(vectorsOnOuterSquare.get(16), vectorsOnOuterSquare.get(12), vectorsOnOuterSquare.get(23), vectorsOnOuterSquare.get(13)); @@ -139,11 +139,11 @@ class IGPTheGreatMosqueOfKairouan extends IGPSquare{ sidePiece[1] = getLineIntersection(vectorsOnOuterSquare.get(18), vectorsOnOuterSquare.get(14), vectorsOnOuterSquare.get(7), vectorsOnOuterSquare.get(17)); sidePiece[2] = getLineIntersection(vectorsOnOuterSquare.get(18), vectorsOnOuterSquare.get(12), vectorsOnOuterSquare.get(7), vectorsOnOuterSquare.get(17)); sidePiece[3] = getLineIntersection(vectorsOnOuterSquare.get(18), vectorsOnOuterSquare.get(14), vectorsOnOuterSquare.get(2), vectorsOnOuterSquare.get(16)); - sidePiece[4] = getVectorOnAlphaCircle(225); + sidePiece[4] = alphaCircleVectorsSixteen.get(10); sidePiece[5] = vectorsOnOuterSquare.get(16); sidePieces[5] = sidePiece; sidePiece = new PVector[6]; - sidePiece[0] = getVectorOnAlphaCircle(315); + sidePiece[0] = alphaCircleVectorsSixteen.get(14); sidePiece[1] = getLineIntersection(vectorsOnOuterSquare.get(18), vectorsOnOuterSquare.get(22), vectorsOnOuterSquare.get(20), vectorsOnOuterSquare.get(10)); sidePiece[2] = getLineIntersection(vectorsOnOuterSquare.get(18), vectorsOnOuterSquare.get(0), vectorsOnOuterSquare.get(20), vectorsOnOuterSquare.get(10)); sidePiece[3] = getLineIntersection(vectorsOnOuterSquare.get(18), vectorsOnOuterSquare.get(22), vectorsOnOuterSquare.get(19), vectorsOnOuterSquare.get(5)); @@ -156,7 +156,7 @@ class IGPTheGreatMosqueOfKairouan extends IGPSquare{ sidePiece[2] = getLineIntersection(vectorsOnOuterSquare.get(20), vectorsOnOuterSquare.get(0), vectorsOnOuterSquare.get(23), vectorsOnOuterSquare.get(13)); sidePiece[3] = getLineIntersection(vectorsOnOuterSquare.get(18), vectorsOnOuterSquare.get(0), vectorsOnOuterSquare.get(23), vectorsOnOuterSquare.get(13)); sidePiece[4] = getLineIntersection(vectorsOnOuterSquare.get(20), vectorsOnOuterSquare.get(0), vectorsOnOuterSquare.get(22), vectorsOnOuterSquare.get(8)); - sidePiece[5] = getVectorOnAlphaCircle(315); + sidePiece[5] = alphaCircleVectorsSixteen.get(14); sidePieces[7] = sidePiece; } @@ -171,7 +171,7 @@ class IGPTheGreatMosqueOfKairouan extends IGPSquare{ middlePiece[5] = getLineIntersection(vectorsOnOuterSquare.get(20), vectorsOnOuterSquare.get(0), vectorsOnOuterSquare.get(23), vectorsOnOuterSquare.get(13)); middlePieces[0] = middlePiece; middlePiece = new PVector[6]; - middlePiece[0] = getVectorOnAlphaCircle(45); + middlePiece[0] = alphaCircleVectorsSixteen.get(2); middlePiece[1] = getLineIntersection(vectorsOnOuterSquare.get(2), vectorsOnOuterSquare.get(6), vectorsOnOuterSquare.get(4), vectorsOnOuterSquare.get(14)); middlePiece[2] = getLineIntersection(vectorsOnOuterSquare.get(0), vectorsOnOuterSquare.get(6), vectorsOnOuterSquare.get(4), vectorsOnOuterSquare.get(14)); middlePiece[3] = getLineIntersection(vectorsOnOuterSquare.get(1), vectorsOnOuterSquare.get(11), vectorsOnOuterSquare.get(5), vectorsOnOuterSquare.get(19)); @@ -187,7 +187,7 @@ class IGPTheGreatMosqueOfKairouan extends IGPSquare{ middlePiece[5] = getLineIntersection(vectorsOnOuterSquare.get(2), vectorsOnOuterSquare.get(6), vectorsOnOuterSquare.get(5), vectorsOnOuterSquare.get(19)); middlePieces[2] = middlePiece; middlePiece = new PVector[6]; - middlePiece[0] = getVectorOnAlphaCircle(135); + middlePiece[0] = alphaCircleVectorsSixteen.get(6); middlePiece[1] = getLineIntersection(vectorsOnOuterSquare.get(8), vectorsOnOuterSquare.get(12), vectorsOnOuterSquare.get(10), vectorsOnOuterSquare.get(20)); middlePiece[2] = getLineIntersection(vectorsOnOuterSquare.get(1), vectorsOnOuterSquare.get(11), vectorsOnOuterSquare.get(10), vectorsOnOuterSquare.get(20)); middlePiece[3] = getLineIntersection(vectorsOnOuterSquare.get(1), vectorsOnOuterSquare.get(11), vectorsOnOuterSquare.get(7), vectorsOnOuterSquare.get(17)); @@ -203,7 +203,7 @@ class IGPTheGreatMosqueOfKairouan extends IGPSquare{ middlePiece[5] = getLineIntersection(vectorsOnOuterSquare.get(1), vectorsOnOuterSquare.get(11), vectorsOnOuterSquare.get(8), vectorsOnOuterSquare.get(12)); middlePieces[4] = middlePiece; middlePiece = new PVector[6]; - middlePiece[0] = getVectorOnAlphaCircle(225); + middlePiece[0] = alphaCircleVectorsSixteen.get(10); middlePiece[1] = getLineIntersection(vectorsOnOuterSquare.get(14), vectorsOnOuterSquare.get(18), vectorsOnOuterSquare.get(16), vectorsOnOuterSquare.get(2)); middlePiece[2] = getLineIntersection(vectorsOnOuterSquare.get(7), vectorsOnOuterSquare.get(17), vectorsOnOuterSquare.get(16), vectorsOnOuterSquare.get(2)); middlePiece[3] = getLineIntersection(vectorsOnOuterSquare.get(7), vectorsOnOuterSquare.get(17), vectorsOnOuterSquare.get(13), vectorsOnOuterSquare.get(23)); @@ -211,7 +211,7 @@ class IGPTheGreatMosqueOfKairouan extends IGPSquare{ middlePiece[5] = getLineIntersection(vectorsOnOuterSquare.get(4), vectorsOnOuterSquare.get(14), vectorsOnOuterSquare.get(12), vectorsOnOuterSquare.get(16)); middlePieces[5] = middlePiece; middlePiece = new PVector[6]; - middlePiece[0] = getVectorOnAlphaCircle(270); + middlePiece[0] = alphaCircleVectorsSixteen.get(12); middlePiece[1] = getLineIntersection(vectorsOnOuterSquare.get(18), vectorsOnOuterSquare.get(22), vectorsOnOuterSquare.get(19), vectorsOnOuterSquare.get(5)); middlePiece[2] = getLineIntersection(vectorsOnOuterSquare.get(10), vectorsOnOuterSquare.get(20), vectorsOnOuterSquare.get(19), vectorsOnOuterSquare.get(5)); middlePiece[3] = getLineIntersection(vectorsOnOuterSquare.get(10), vectorsOnOuterSquare.get(20), vectorsOnOuterSquare.get(16), vectorsOnOuterSquare.get(2)); @@ -219,7 +219,7 @@ class IGPTheGreatMosqueOfKairouan extends IGPSquare{ middlePiece[5] = getLineIntersection(vectorsOnOuterSquare.get(7), vectorsOnOuterSquare.get(17), vectorsOnOuterSquare.get(14), vectorsOnOuterSquare.get(18)); middlePieces[6] = middlePiece; middlePiece = new PVector[6]; - middlePiece[0] = getVectorOnAlphaCircle(315); + middlePiece[0] = alphaCircleVectorsSixteen.get(14); middlePiece[1] = getLineIntersection(vectorsOnOuterSquare.get(20), vectorsOnOuterSquare.get(0), vectorsOnOuterSquare.get(22), vectorsOnOuterSquare.get(8)); middlePiece[2] = getLineIntersection(vectorsOnOuterSquare.get(13), vectorsOnOuterSquare.get(23), vectorsOnOuterSquare.get(22), vectorsOnOuterSquare.get(8)); middlePiece[3] = getLineIntersection(vectorsOnOuterSquare.get(13), vectorsOnOuterSquare.get(23), vectorsOnOuterSquare.get(19), vectorsOnOuterSquare.get(5)); -- cgit v1.2.3-54-g00ecf