diff options
| author | cracker64 <cracker642@gmail.com> | 2012-07-08 04:00:47 (GMT) |
|---|---|---|
| committer | cracker64 <cracker642@gmail.com> | 2012-07-08 04:00:47 (GMT) |
| commit | e7035233fd6fda5599512a6c588e32ace134024b (patch) | |
| tree | eafc8542e1382822aac06862a855bd8265662678 /src/powder.c | |
| parent | 5f3c10a6844aa2196258aa52448c8f753edb8439 (diff) | |
| download | powder-e7035233fd6fda5599512a6c588e32ace134024b.zip powder-e7035233fd6fda5599512a6c588e32ace134024b.tar.gz | |
Optimization for GoL, Added brush size and mouse wheel to lua!
Diffstat (limited to 'src/powder.c')
| -rw-r--r-- | src/powder.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/powder.c b/src/powder.c index 6ce9ab2..8170ab2 100644 --- a/src/powder.c +++ b/src/powder.c @@ -1791,14 +1791,14 @@ void update_particles_i(pixel *vid, int start, int inc) int createdsomething = 0; CGOL=0; ISGOL=0; - for (nx=CELL; nx<XRES-CELL; nx++) + for (ny=CELL; ny<YRES-CELL; ny++) {//go through every particle and set neighbor map - for (ny=CELL; ny<YRES-CELL; ny++) + for (nx=CELL; nx<XRES-CELL; nx++) { r = pmap[ny][nx]; if (!r) { - gol[nx][ny] = 0; + gol[ny][nx] = 0; continue; } else @@ -1813,7 +1813,7 @@ void update_particles_i(pixel *vid, int start, int inc) continue; } if (parts[r>>8].tmp == grule[golnum][9]-1) { - gol[nx][ny] = golnum; + gol[ny][nx] = golnum; for ( nnx=-1; nnx<2; nnx++) { for ( nny=-1; nny<2; nny++)//it will count itself as its own neighbor, which is needed, but will have 1 extra for delete check @@ -1821,8 +1821,8 @@ void update_particles_i(pixel *vid, int start, int inc) rt = pmap[((ny+nny+YRES-3*CELL)%(YRES-2*CELL))+CELL][((nx+nnx+XRES-3*CELL)%(XRES-2*CELL))+CELL]; if (!rt || (rt&0xFF)==PT_LIFE) { - gol2[((nx+nnx+XRES-3*CELL)%(XRES-2*CELL))+CELL][((ny+nny+YRES-3*CELL)%(YRES-2*CELL))+CELL][golnum] ++; - gol2[((nx+nnx+XRES-3*CELL)%(XRES-2*CELL))+CELL][((ny+nny+YRES-3*CELL)%(YRES-2*CELL))+CELL][0] ++; + gol2[((ny+nny+YRES-3*CELL)%(YRES-2*CELL))+CELL][((nx+nnx+XRES-3*CELL)%(XRES-2*CELL))+CELL][golnum] ++; + gol2[((ny+nny+YRES-3*CELL)%(YRES-2*CELL))+CELL][((nx+nnx+XRES-3*CELL)%(XRES-2*CELL))+CELL][0] ++; } } } @@ -1836,23 +1836,23 @@ void update_particles_i(pixel *vid, int start, int inc) } } } - for (nx=CELL; nx<XRES-CELL; nx++) + for (ny=CELL; ny<YRES-CELL; ny++) { //go through every particle again, but check neighbor map, then update particles - for (ny=CELL; ny<YRES-CELL; ny++) + for (nx=CELL; nx<XRES-CELL; nx++) { r = pmap[ny][nx]; - neighbors = gol2[nx][ny][0]; + neighbors = gol2[ny][nx][0]; if (neighbors==0 || !((r&0xFF)==PT_LIFE || !(r&0xFF))) continue; for ( golnum = 1; golnum<=NGOL; golnum++) { goldelete = neighbors; - if (gol[nx][ny]==0&&grule[golnum][goldelete]>=2&&gol2[nx][ny][golnum]>=(goldelete%2)+goldelete/2) + if (gol[ny][nx]==0&&grule[golnum][goldelete]>=2&&gol2[ny][nx][golnum]>=(goldelete%2)+goldelete/2) { if (create_part(-1, nx, ny, PT_LIFE|((golnum-1)<<8))) createdsomething = 1; } - else if (gol[nx][ny]==golnum&&(grule[golnum][goldelete-1]==0||grule[golnum][goldelete-1]==2))//subtract 1 because it counted itself + else if (gol[ny][nx]==golnum&&(grule[golnum][goldelete-1]==0||grule[golnum][goldelete-1]==2))//subtract 1 because it counted itself { if (parts[r>>8].tmp==grule[golnum][9]-1) parts[r>>8].tmp --; @@ -1861,7 +1861,7 @@ void update_particles_i(pixel *vid, int start, int inc) parts[r>>8].type = PT_NONE;//using kill_part makes it not work } for ( z = 0; z<=NGOL; z++) - gol2[nx][ny][z] = 0;//this improves performance A LOT compared to the memset, i was getting ~23 more fps with this. + gol2[ny][nx][z] = 0;//this improves performance A LOT compared to the memset, i was getting ~23 more fps with this. } } if (createdsomething) |