AutoVisual/IGPSquare.pde: Setting up constructionCircleCenters properly. Separating display() and displayConstructionLines() functionality.

1 files changed, 9 insertions, 13 deletions

diff --git a/AutoVisual/IGPSquare.pde b/AutoVisual/IGPSquare.pde
index 80e3700..88d6e14 100644
--- a/AutoVisual/IGPSquare.pde
+++ b/AutoVisual/IGPSquare.pde
@@ -3,19 +3,11 @@ class IGPSquare extends IGPFamily {
 
   IGPSquare(float x, float y, float d, int p){
 		super(x, y, d);
-		parts = p;
+//		parts = p;
     setVectorsOnAlphaCircle();
-//    setConstructionCircleCenters();
+    setConstructionCircleCenters();
 		setVectorsOnOuterSquare();
   }
-	
-	void setVectorsOnAlphaCircle(){
-		constructionCircleCenters = new ArrayList <PVector> (4);
-		constructionCircleCenters.add(getVectorOnAlphaCircle(0));
-		constructionCircleCenters.add(getVectorOnAlphaCircle(90));
-		constructionCircleCenters.add(getVectorOnAlphaCircle(180));
-		constructionCircleCenters.add(getVectorOnAlphaCircle(270));
-	}
 
 	void setConstructionCircleCenters(){
 		constructionCircleCenters = new ArrayList <PVector> (4);
@@ -88,10 +80,14 @@ class IGPSquare extends IGPFamily {
 		if (parts == 16){
 			createInnerSquare();
 			createInnerSquareTilted(45);
+		}
+  }
+  void displayConstructionLines(){
+    super.displayConstructionLines();
+    createDiagonalConstructionLines();
+		createDividingConstructionLines(12);
+		if (parts == 16){
 			createDividingConstructionLines(16);
-		}else if (parts == 12){
-			createDividingConstructionLines(12);
 		}
   }
-
 }