AutoVisual/IGP{Family,Hexagon,Pentagon,Square}.pde: Removing display() function in lower level classes, moving all calls to create* methods to displayConstructionLines(). Refactoring outerSquareVectors* ArrayLists to {twelve,sixteen}BaseVectorsOnOuterSquare, to separate their usage more obviously from creating vectorsOnOuterSquare ArrayLists holding all PVectors necessary to display geometric patterns with end points on the outer square.

1 files changed, 21 insertions, 25 deletions

diff --git a/AutoVisual/IGPHexagon.pde b/AutoVisual/IGPHexagon.pde
index bf84c55..8c2c5ab 100644
--- a/AutoVisual/IGPHexagon.pde
+++ b/AutoVisual/IGPHexagon.pde
@@ -19,40 +19,40 @@ class IGPHexagon extends IGPFamily{
 
   void setVectorsOnConstructionCircles(){
     int amount = 12;
-    outerSquareVectors = new ArrayList <PVector>(12);
+    twelveBaseVectorsOnOuterSquare = new ArrayList <PVector>(12);
     // 0°
-    outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(0), 0));
+    twelveBaseVectorsOnOuterSquare.add(getVectorOnCircle(constructionCircleCenters.get(0), 0));
     // 30°
-    outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(1), 0));
+    twelveBaseVectorsOnOuterSquare.add(getVectorOnCircle(constructionCircleCenters.get(1), 0));
     // 60°
-    outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(1), 60));
+    twelveBaseVectorsOnOuterSquare.add(getVectorOnCircle(constructionCircleCenters.get(1), 60));
     // 90°
-    outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(1), 120));
+    twelveBaseVectorsOnOuterSquare.add(getVectorOnCircle(constructionCircleCenters.get(1), 120));
     // 120°
-    outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(2), 120));
+    twelveBaseVectorsOnOuterSquare.add(getVectorOnCircle(constructionCircleCenters.get(2), 120));
     // 150°
-    outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(3), 120));  
+    twelveBaseVectorsOnOuterSquare.add(getVectorOnCircle(constructionCircleCenters.get(3), 120));  
     // 180°
-    outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(3), 180));
+    twelveBaseVectorsOnOuterSquare.add(getVectorOnCircle(constructionCircleCenters.get(3), 180));
     // 210°
-    outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(4), 180));
+    twelveBaseVectorsOnOuterSquare.add(getVectorOnCircle(constructionCircleCenters.get(4), 180));
     // 240°
-    outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(4), 240));
+    twelveBaseVectorsOnOuterSquare.add(getVectorOnCircle(constructionCircleCenters.get(4), 240));
     // 270°
-    outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(4), 300));
+    twelveBaseVectorsOnOuterSquare.add(getVectorOnCircle(constructionCircleCenters.get(4), 300));
     // 300°
-    outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(5), 300));
+    twelveBaseVectorsOnOuterSquare.add(getVectorOnCircle(constructionCircleCenters.get(5), 300));
     // 330°
-    outerSquareVectors.add(getVectorOnCircle(constructionCircleCenters.get(5), 0));
+    twelveBaseVectorsOnOuterSquare.add(getVectorOnCircle(constructionCircleCenters.get(5), 0));
   }
 
   void createDividingConstructionLines(int amount){
-    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));
+    createLine(twelveBaseVectorsOnOuterSquare.get(0), twelveBaseVectorsOnOuterSquare.get(6));
+    createLine(twelveBaseVectorsOnOuterSquare.get(1), twelveBaseVectorsOnOuterSquare.get(7));
+    createLine(twelveBaseVectorsOnOuterSquare.get(2), twelveBaseVectorsOnOuterSquare.get(8));
+    createLine(twelveBaseVectorsOnOuterSquare.get(3), twelveBaseVectorsOnOuterSquare.get(9));
+    createLine(twelveBaseVectorsOnOuterSquare.get(4), twelveBaseVectorsOnOuterSquare.get(10));
+    createLine(twelveBaseVectorsOnOuterSquare.get(5), twelveBaseVectorsOnOuterSquare.get(11));
   }
 
   void createDividingLines(int amount){
@@ -64,14 +64,10 @@ class IGPHexagon extends IGPFamily{
     createLine(alphaCircleVectors.get(5), alphaCircleVectors.get(11));
   }
 
-  void display() {
-    super.display();
-    createDividingLines(12);
-    createInnerHexagon();
-  }
-
   void displayConstructionLines(){
     super.displayConstructionLines();
+    createDividingLines(12);
+    createInnerHexagon();
     createDividingConstructionLines(12);
   }
 }