Commit b4aab49

committed

Vicsek fractal drawing completed.

1 parent 0a11850 commit b4aab49Copy full SHA for b4aab49

File tree

+30

-23

lines changed

+30

-23

lines changed

Lines changed: 11 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,13 +78,19 @@ private void drawFractal(Graphics2D g, int x, int y, int w, int h, int depth){`
`78`	`78`	`return;`
`79`	`79`	`}`
`80`	`80`
	`81`	`+ if(w <= 1 \|\| h <= 1){`
	`82`	`+ AlgoVisHelper.setColor(g, AlgoVisHelper.Indigo);`
	`83`	`+ AlgoVisHelper.fillRectangle(g, x, y, Math.max(w,1), Math.max(h,1));`
	`84`	`+ return;`
	`85`	`+ }`
	`86`	`+`
`81`	`87`	`int w_3 = w/3;`
`82`	`88`	`int h_3 = h/3;`
`83`		`- drawFractal(g, x, y, w_3, h_3, depth+1);`
`84`		`- drawFractal(g, x+2*w_3, y, w_3, h_3, depth+1);`
`85`		`- drawFractal(g, x+w_3, y+w_3, w_3, h_3, depth+1);`
`86`		`- drawFractal(g, x, y+2*w_3, w_3, h_3, depth+1);`
`87`		`- drawFractal(g, x+2w_3, y+2w_3, w_3, h_3, depth+1);`
	`89`	`+ drawFractal(g, x, y, w_3, h_3, depth + 1);`
	`90`	`+ drawFractal(g, x + 2 * w_3, y, w_3, h_3, depth + 1);`
	`91`	`+ drawFractal(g, x + w_3, y + h_3, w_3, h_3, depth + 1);`
	`92`	`+ drawFractal(g, x, y + 2 * h_3, w_3, h_3, depth + 1);`
	`93`	`+ drawFractal(g, x + 2 * w_3, y + 2 * h_3, w_3, h_3, depth + 1);`
`88`	`94`
`89`	`95`	`return;`
`90`	`96`	`}`

Lines changed: 11 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -68,26 +68,25 @@ public void paintComponent(Graphics g) {`
`68`	`68`
`69`	`69`	`private void drawFractal(Graphics2D g, int x, int y, int w, int h, int depth){`
`70`	`70`
`71`		`- int w_3 = w/3;`
`72`		`- int h_3 = h/3;`
`73`		`-`
`74`		`- if(w_3 <= 0 \|\| h_3 <= 0){`
	`71`	`+ if( depth == data.depth ){`
`75`	`72`	`AlgoVisHelper.setColor(g, AlgoVisHelper.Indigo);`
`76`		`- AlgoVisHelper.fillRectangle(g, x, y, 1, 1);`
	`73`	`+ AlgoVisHelper.fillRectangle(g, x, y, w, h);`
`77`	`74`	`return;`
`78`	`75`	`}`
`79`	`76`
`80`		`- if(depth == data.depth){`
	`77`	`+ if(w <= 1 \|\| h <= 1){`
`81`	`78`	`AlgoVisHelper.setColor(g, AlgoVisHelper.Indigo);`
`82`		`- AlgoVisHelper.fillRectangle(g, x, y, w, h);`
	`79`	`+ AlgoVisHelper.fillRectangle(g, x, y, Math.max(w,1), Math.max(h,1));`
`83`	`80`	`return;`
`84`	`81`	`}`
`85`	`82`
`86`		`- drawFractal(g, x, y, w_3, h_3, depth+1);`
`87`		`- drawFractal(g, x+2*w_3, y, w_3, h_3, depth+1);`
`88`		`- drawFractal(g, x+w_3, y+w_3, w_3, h_3, depth+1);`
`89`		`- drawFractal(g, x, y+2*w_3, w_3, h_3, depth+1);`
`90`		`- drawFractal(g, x+2w_3, y+2w_3, w_3, h_3, depth+1);`
	`83`	`+ int w_3 = w/3;`
	`84`	`+ int h_3 = h/3;`
	`85`	`+ drawFractal(g, x, y, w_3, h_3, depth + 1);`
	`86`	`+ drawFractal(g, x + 2 * w_3, y, w_3, h_3, depth + 1);`
	`87`	`+ drawFractal(g, x + w_3, y + h_3, w_3, h_3, depth + 1);`
	`88`	`+ drawFractal(g, x, y + 2 * h_3, w_3, h_3, depth + 1);`
	`89`	`+ drawFractal(g, x + 2 * w_3, y + 2 * h_3, w_3, h_3, depth + 1);`
`91`	`90`
`92`	`91`	`return;`
`93`	`92`	`}`

Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,13 @@ public class AlgoVisualizer {`
`8`	`8`	`private FractalData data;`
`9`	`9`	`private AlgoFrame frame;`
`10`	`10`
`11`		`- public AlgoVisualizer(int depth){`
	`11`	`+ public AlgoVisualizer(int maxDepth){`
`12`	`12`
`13`		`- data = new FractalData(depth);`
`14`		`- int sceneWidth = (int)Math.pow(3, depth);`
`15`		`- int sceneHeight = (int)Math.pow(3, depth);`
	`13`	`+ data = new FractalData(maxDepth);`
	`14`	`+ int sceneWidth = (int)Math.pow(3, maxDepth);`
	`15`	`+ int sceneHeight = (int)Math.pow(3, maxDepth);`
	`16`	`+// int sceneWidth = 1024;`
	`17`	`+// int sceneHeight = 768;`
`16`	`18`
`17`	`19`	`EventQueue.invokeLater(() -> {`
`18`	`20`	`frame = new AlgoFrame("Fractal Visualizer", sceneWidth,sceneHeight);`
`@@ -53,8 +55,8 @@ public void keyReleased(KeyEvent event){`
`53`	`55`
`54`	`56`	`public static void main(String[] args) {`
`55`	`57`
`56`		`- int depth = 6;`
	`58`	`+ int maxDepth = 6;`
`57`	`59`
`58`		`- AlgoVisualizer vis = new AlgoVisualizer(depth);`
	`60`	`+ AlgoVisualizer vis = new AlgoVisualizer(maxDepth);`
`59`	`61`	`}`
`60`	`62`	`}`

9.7 MB

Binary file not shown.

Comments

(0)