Skip to content

Commit 3cfcb4e

Browse files
committed
Added inteaction method for ConformingPix
1 parent 10e3a51 commit 3cfcb4e

File tree

2 files changed

+42
-7
lines changed

2 files changed

+42
-7
lines changed

ConformingPix.java

+35-2
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,48 @@
66
public class ConformingPix extends Pix
77
{
88

9+
/**
10+
* Default constructor
11+
* Calls Pix()
12+
*/
913
public ConformingPix()
1014
{
1115
super();
1216
}
1317

14-
15-
18+
/**
19+
* Gets closer to interacted Pix color
20+
* Causes blurring...
21+
*/
1622
public void interact(Pix p)
1723
{
24+
// Get closer to red
25+
if (p.getRed() > red)
26+
{
27+
red++;
28+
}
29+
if (p.getRed() < red)
30+
{
31+
red--;
32+
}
33+
// Get closer to green
34+
if (p.getGreen() > green)
35+
{
36+
green++;
37+
}
38+
if (p.getGreen() < green)
39+
{
40+
green--;
41+
}
42+
// Get closer to blue
43+
if (p.getBlue() > blue)
44+
{
45+
blue++;
46+
}
47+
if (p.getBlue() < blue)
48+
{
49+
blue--;
50+
}
1851

1952
}
2053
}

Pixelife.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,13 @@ public Pixelife(int w, int h, int n)
3535
height = h;
3636

3737
myGrid = new PixGrid(w, h, n);
38-
Spawner vline_spawner = new Spawner(DirectedPix.class, myGrid, 2, h/2);
39-
vline_spawner.spawn(5);
40-
Spawner hline_spawner = new Spawner(DirectedPix.class, myGrid, 0, h/2);
41-
hline_spawner.spawn(5);
42-
spawner = new Spawner(NonconformingPix.class, myGrid);
38+
// Spawner vline_spawner = new Spawner(DirectedPix.class, myGrid, 2, h/2);
39+
// vline_spawner.spawn(5);
40+
// Spawner hline_spawner = new Spawner(DirectedPix.class, myGrid, 0, h/2);
41+
// hline_spawner.spawn(5);
42+
// Spawner conformer = new Spawner(ConformingPix.class, myGrid);
43+
// conformer.spawn(10);
44+
spawner = new Spawner(ConformingPix.class, myGrid);
4345
spawner.spawn(10);
4446
}
4547

0 commit comments

Comments
 (0)