matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix LIFE

Browse Source
This commit is contained in:
jacob1 2013-03-03 19:07:15 -05:00
parent 8b83ae9f95
commit f951e5cda9
3 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/simulation/Simulation.cpp
View File

@ -3549,36 +3549,31 @@ void Simulation::update_particles_i(int start, int inc)
} }
else else
{ {
//for ( golnum=1; golnum<=NGOL; golnum++) //This shouldn't be necessary any more. if (parts[r>>8].type==PT_LIFE)
//{ {
if (parts[r>>8].type==PT_LIFE/* && parts[r>>8].ctype==golnum-1*/) golnum = parts[r>>8].ctype+1;
{ if (golnum<=0 || golnum>NGOLALT) {
golnum = parts[r>>8].ctype+1; kill_part(r>>8);
if (golnum<=0 || golnum>NGOLALT) { continue;
kill_part(r>>8); }
continue; if (parts[r>>8].tmp == grule[golnum][9]-1) {
} gol[ny][nx] = golnum;
if (parts[r>>8].tmp == grule[golnum][9]-1) { for ( nnx=-1; nnx<2; nnx++)
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
{ {
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 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)
{ {
rt = pmap[((ny+nny+YRES-3*CELL)%(YRES-2*CELL))+CELL][((nx+nnx+XRES-3*CELL)%(XRES-2*CELL))+CELL]; gol2[((ny+nny+YRES-3*CELL)%(YRES-2*CELL))+CELL][((nx+nnx+XRES-3*CELL)%(XRES-2*CELL))+CELL][golnum] ++;
if (!rt || (rt&0xFF)==PT_LIFE) gol2[((ny+nny+YRES-3*CELL)%(YRES-2*CELL))+CELL][((nx+nnx+XRES-3*CELL)%(XRES-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] ++;
}
} }
} }
} else {
parts[r>>8].tmp --;
if (parts[r>>8].tmp<=0)
kill_part(r>>8);
} }
} else {
parts[r>>8].tmp --;
} }
//} }
} }
} }
} }
@ -3590,7 +3585,7 @@ void Simulation::update_particles_i(int start, int inc)
neighbors = gol2[ny][nx][0]; neighbors = gol2[ny][nx][0];
if (neighbors==0 || !((r&0xFF)==PT_LIFE || !(r&0xFF))) if (neighbors==0 || !((r&0xFF)==PT_LIFE || !(r&0xFF)))
continue; continue;
for ( golnum = 1; golnum<=NGOL; golnum++) for (golnum = 1; golnum<=NGOL; golnum++)
{ {
goldelete = neighbors; goldelete = neighbors;
if (gol[ny][nx]==0&&grule[golnum][goldelete]>=2&&gol2[ny][nx][golnum]>=(goldelete%2)+goldelete/2) if (gol[ny][nx]==0&&grule[golnum][goldelete]>=2&&gol2[ny][nx][golnum]>=(goldelete%2)+goldelete/2)
@ -3603,8 +3598,6 @@ void Simulation::update_particles_i(int start, int inc)
if (parts[r>>8].tmp==grule[golnum][9]-1) if (parts[r>>8].tmp==grule[golnum][9]-1)
parts[r>>8].tmp --; parts[r>>8].tmp --;
} }
if (r && parts[r>>8].tmp<=0)
kill_part(r>>8);
} }
for ( z = 0; z<=NGOL; z++) for ( z = 0; z<=NGOL; z++)
gol2[ny][nx][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.

9
src/simulation/elements/LIFE.cpp
View File

@ -46,7 +46,7 @@ Element_LIFE::Element_LIFE()
HighTemperature = ITH; HighTemperature = ITH;
HighTemperatureTransition = NT; HighTemperatureTransition = NT;
Update = NULL; Update = &Element_LIFE::update;
Graphics = &Element_LIFE::graphics; Graphics = &Element_LIFE::graphics;
if(!Element_GOL_colourInit) if(!Element_GOL_colourInit)
@ -64,6 +64,13 @@ Element_LIFE::Element_LIFE()
} }
} }
//#TPT-Directive ElementHeader Element_LIFE static int update(UPDATE_FUNC_ARGS)
int Element_LIFE::update(UPDATE_FUNC_ARGS)
{
if (parts[i].tmp <= 0)
sim->kill_part(i);
return 0;
}
//#TPT-Directive ElementHeader Element_LIFE static int graphics(GRAPHICS_FUNC_ARGS) //#TPT-Directive ElementHeader Element_LIFE static int graphics(GRAPHICS_FUNC_ARGS)
int Element_LIFE::graphics(GRAPHICS_FUNC_ARGS) int Element_LIFE::graphics(GRAPHICS_FUNC_ARGS)

2
src/simulation/elements/PSTN.cpp
View File

@ -49,8 +49,6 @@ Element_PSTN::Element_PSTN()
//#TPT-Directive ElementHeader Element_PSTN static int tempParts[128]; //#TPT-Directive ElementHeader Element_PSTN static int tempParts[128];
int Element_PSTN::tempParts[128]; int Element_PSTN::tempParts[128];
//#TPT-Directive ElementHeader Element_PSTN static int tempPartAmount[128];
int Element_PSTN::tempPartAmount[128];
#define PISTON_INACTIVE 0x00 #define PISTON_INACTIVE 0x00
#define PISTON_RETRACT 0x01 #define PISTON_RETRACT 0x01