Skip to content

Commit 0ebc59c

Browse files
committed
Added AvgPix and testing
1 parent 3ad9667 commit 0ebc59c

File tree

2 files changed

+37
-7
lines changed

2 files changed

+37
-7
lines changed

AvgPix.java

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/**
2+
* Class AvgPix
3+
* @author Nic Manoogian <[email protected]>
4+
*/
5+
public class AvgPix extends Pix
6+
{
7+
8+
/**
9+
* Default constructor
10+
* Calls Pix()
11+
*/
12+
public AvgPix()
13+
{
14+
super();
15+
}
16+
17+
/**
18+
* Changes colors of both Pix to the average of the two
19+
* Has a strange blurring effect
20+
*/
21+
public void interact(Pix p)
22+
{
23+
int newRed = (p.getRed() + getRed())/2;
24+
int newGreen = (p.getGreen() + getGreen())/2;
25+
int newBlue = (p.getBlue() + getBlue())/2;
26+
setPix(newRed,newGreen,newBlue);
27+
//p.setPix(newRed,newGreen,newBlue);
28+
}
29+
}

Pixelife.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,14 @@ public Pixelife(int w, int h, int n)
5353
// Spawner lines = new Spawner(ScaredPix.class, myGrid);
5454
// lines.spawn(10);
5555

56-
// spawner = new Spawner(DirectedPix.class, myGrid);
57-
// spawner.spawn(400);
58-
spawner = new Spawner(CombatPix.class, myGrid);
59-
spawner.spawn(2);
60-
// spawner = new Spawner(NonconformingPix.class, myGrid);
61-
// spawner.spawn(100);
62-
//spawner.spawnXY(SpiralPix.class, w/2, h/2);
56+
// spawner = new Spawner(SpiralPix.class, myGrid);
57+
// spawner.spawn(1);
58+
spawner = new Spawner(AvgPix.class, myGrid);
59+
spawner.spawn(5);
60+
spawner = new Spawner(NonconformingPix.class, myGrid);
61+
spawner.spawn(5);
62+
// spawner.spawnXY(SpiralPix.class, w/2, h/2);
63+
// spawner.spawnXY(RainbowPix.class, w/2, h/2+1);
6364
}
6465

6566
/**

0 commit comments

Comments
 (0)