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

Deleted whole repository due to weirdness with recognizing folder. From current source, added Cracker64's changes that make 1px pipe several times faster than thicker pipe. Doesn't break saves. :D

Browse Source
This commit is contained in:
Cate 2011-07-08 11:51:44 -04:00 committed by Simon Robertshaw
parent 6a6c5d03f6
commit d2eb6f1cb3
4 changed files with 127 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/powder.h
View File

@ -242,9 +242,9 @@
#define FLAG_STAGNANT 1
#define UPDATE_FUNC_ARGS int i, int x, int y, int surround_space
#define UPDATE_FUNC_ARGS int i, int x, int y, int surround_space, int nt
// to call another update function with same arguments:
#define UPDATE_FUNC_SUBCALL_ARGS i, x, y, surround_space
#define UPDATE_FUNC_SUBCALL_ARGS i, x, y, surround_space, nt
int update_ACID(UPDATE_FUNC_ARGS);
int update_ANAR(UPDATE_FUNC_ARGS);

144
src/elements/pipe.c
View File

@ -3,12 +3,82 @@
signed char pos_1_rx[] = {-1,-1,-1, 0, 0, 1, 1, 1};
signed char pos_1_ry[] = {-1, 0, 1,-1, 1,-1, 0, 1};
void pushParticle(int i, int count, int original)
{
int rndstore, rnd, rx, ry, r, x, y, np, q, notctype=(((parts[i].ctype)%3)+2);
if ((parts[i].tmp&0xFF) == 0 || count >= 2)//don't push if there is nothing there, max speed of 2 per frame
return;
x = (int)(parts[i].x+0.5f);
y = (int)(parts[i].y+0.5f);
if( !(parts[i].tmp&0x200) )
{
//normal random push
rndstore = rand();
// RAND_MAX is at least 32767 on all platforms i.e. pow(8,5)-1
// so can go 5 cycles without regenerating rndstore
for (q=0; q<3; q++)//try to push twice
{
rnd = rndstore&7;
rndstore = rndstore>>3;
rx = pos_1_rx[rnd];
ry = pos_1_ry[rnd];
if (x+rx>=0 && y+ry>=0 && x+rx<XRES && y+ry<YRES)
{
r = pmap[y+ry][x+rx];
if ((r>>8)>=NPART || !r)
continue;
else if ((r&0xFF)==PT_PIPE && parts[r>>8].ctype!=notctype && (parts[r>>8].tmp&0xFF)==0)
{
parts[r>>8].tmp = (parts[r>>8].tmp&~0xFF) | (parts[i].tmp&0xFF);
parts[r>>8].temp = parts[i].temp;
parts[r>>8].flags = parts[i].flags;
parts[r>>8].pavg[0] = parts[i].pavg[0];
parts[r>>8].pavg[1] = parts[i].pavg[1];
if (r>>8 > original)
parts[r>>8].tmp2 = 1;//skip particle push, normalizes speed
parts[i].tmp &= ~0xFF;
count++;
pushParticle(r>>8,count,original);
}
}
}
}
else //predefined 1 pixel thick pipe movement
{
int coords = 7 - (parts[i].tmp>>10);
r = pmap[y+ pos_1_ry[coords]][x+ pos_1_rx[coords]];
if ((r>>8)>=NPART || !r)
{
}
else if ((r&0xFF)==PT_PIPE && parts[r>>8].ctype!=notctype && (parts[r>>8].tmp&0xFF)==0)
{
parts[r>>8].tmp = (parts[r>>8].tmp&~0xFF) | (parts[i].tmp&0xFF);
parts[r>>8].temp = parts[i].temp;
parts[r>>8].flags = parts[i].flags;
parts[r>>8].pavg[0] = parts[i].pavg[0];
parts[r>>8].pavg[1] = parts[i].pavg[1];
if (r>>8 > original)
parts[r>>8].tmp2 = 1;//skip particle push, normalizes speed
parts[i].tmp &= ~0xFF;
count++;
pushParticle(r>>8,count,original);
}
}
return;
}
int update_PIPE(UPDATE_FUNC_ARGS) {
int r, rx, ry, np;
int rnd, rndstore;
if (parts[i].ctype>=2 && parts[i].ctype<=4)
{
if (parts[i].life==3)
{
int lastneighbor = -1;
int neighborcount = 0;
int count = 0;
// make automatic pipe pattern
for (rx=-1; rx<2; rx++)
for (ry=-1; ry<2; ry++)
@ -21,17 +91,38 @@ int update_PIPE(UPDATE_FUNC_ARGS) {
{
parts[r>>8].ctype = (((parts[i].ctype)%3)+2);//reverse
parts[r>>8].life = 6;
if ( parts[i].tmp&0x100)//is a single pixel pipe
{
parts[r>>8].tmp |= 0x200;//will transfer to a single pixel pipe
parts[r>>8].tmp |= count<<10;//coords of where it came from
}
neighborcount ++;
lastneighbor = r>>8;
}
else if ((r&0xFF)==PT_PIPE&&parts[r>>8].ctype!=(((parts[i].ctype-1)%3)+2))
{
neighborcount ++;
lastneighbor = r>>8;
}
count++;
}
if(neighborcount == 1)
parts[lastneighbor].tmp |= 0x100;
}
else
{
int rndstore, rnd, q, ctype=(((parts[i].ctype)%3)+2);
rndstore = rand();
// RAND_MAX is at least 32767 on all platforms i.e. pow(8,5)-1
// so can go 5 cycles without regenerating rndstore
for (q=0; q<3; q++)
if (parts[i].tmp2 == 1)//skip particle push to prevent particle number being higher causeing speed up
{
parts[i].tmp2 = 0 ;
}
else
{
pushParticle(i,0,i);
}
if (nt)//there is something besides PIPE around current particle
{
rndstore = rand();
rnd = rndstore&7;
rndstore = rndstore>>3;
rx = pos_1_rx[rnd];
@ -40,10 +131,10 @@ int update_PIPE(UPDATE_FUNC_ARGS) {
{
r = pmap[y+ry][x+rx];
if ((r>>8)>=NPART)
continue;
else if (!r&&parts[i].tmp!=0)
return 0;
if (surround_space && !r && (parts[i].tmp&0xFF)!=0) //creating at end
{
np = create_part(-1,x+rx,y+ry,parts[i].tmp);
np = create_part(-1,x+rx,y+ry,parts[i].tmp&0xFF);
if (np!=-1)
{
parts[np].temp = parts[i].temp;//pipe saves temp and life now
@ -51,29 +142,18 @@ int update_PIPE(UPDATE_FUNC_ARGS) {
parts[np].tmp = parts[i].pavg[0];
parts[np].ctype = parts[i].pavg[1];
}
parts[i].tmp = 0;
continue;
parts[i].tmp &= ~0xFF;
}
else if (!r)
continue;
else if (parts[i].tmp == 0 && (ptypes[r&0xFF].falldown!= 0 || ptypes[r&0xFF].state == ST_GAS))
//try eating particle at entrance
else if ((parts[i].tmp&0xFF) == 0 && (ptypes[r&0xFF].falldown!= 0 || ptypes[r&0xFF].state == ST_GAS))
{
parts[i].tmp = parts[r>>8].type;
parts[i].tmp = (parts[i].tmp&~0xFF) | parts[r>>8].type;
parts[i].temp = parts[r>>8].temp;
parts[i].flags = parts[r>>8].life;
parts[i].pavg[0] = parts[r>>8].tmp;
parts[i].pavg[1] = parts[r>>8].ctype;
kill_part(r>>8);
}
else if ((r&0xFF)==PT_PIPE && parts[r>>8].ctype!=ctype && parts[r>>8].tmp==0&&parts[i].tmp>0)
{
parts[r>>8].tmp = parts[i].tmp;
parts[r>>8].temp = parts[i].temp;
parts[r>>8].flags = parts[i].flags;
parts[r>>8].pavg[0] = parts[i].pavg[0];
parts[r>>8].pavg[1] = parts[i].pavg[1];
parts[i].tmp = 0;
}
}
}
}
@ -109,8 +189,8 @@ int update_PIPE(UPDATE_FUNC_ARGS) {
if (!r)
create_part(-1,x+rx,y+ry,PT_BRCK);//BRCK border, people didn't like DMND
}
if (parts[i].life==1)
parts[i].ctype = 1;
if (parts[i].life==1)
parts[i].ctype = 1;
}
}
else if (parts[i].ctype==1)//wait for empty space before starting to generate automatic pipe pattern
@ -125,6 +205,20 @@ int update_PIPE(UPDATE_FUNC_ARGS) {
parts[i].life=50;
}
}
else if (parts[i].life==5)//check for beginning of pipe single pixel
{
int issingle = 1;
for (rx=-1; rx<2; rx++)
for (ry=-1; ry<2; ry++)
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
{
r = pmap[y+ry][x+rx];
if ((r&0xFF)==PT_PIPE && parts[i].ctype==1 && parts[i].life )
issingle = 0;
}
if (issingle)
parts[i].tmp |= 0x100;
}
else if (parts[i].life==2)
{
parts[i].ctype = 2;

8
src/graphics.c
View File

@ -2377,11 +2377,11 @@ void draw_parts(pixel *vid)
cg = PIXG(ptypes[t].pcolors);
cb = PIXB(ptypes[t].pcolors);
}
if (parts[i].tmp>0 && parts[i].tmp<PT_NUM)
if ((parts[i].tmp&0xFF)>0 && (parts[i].tmp&0xFF)<PT_NUM)
{
cr = PIXR(ptypes[parts[i].tmp].pcolors);
cg = PIXG(ptypes[parts[i].tmp].pcolors);
cb = PIXB(ptypes[parts[i].tmp].pcolors);
cr = PIXR(ptypes[parts[i].tmp&0xFF].pcolors);
cg = PIXG(ptypes[parts[i].tmp&0xFF].pcolors);
cb = PIXB(ptypes[parts[i].tmp&0xFF].pcolors);
}
blendpixel(vid, nx, ny, cr, cg, cb, 255);

4
src/powder.c
View File

@ -1935,11 +1935,11 @@ void update_particles_i(pixel *vid, int start, int inc)
//call the particle update function, if there is one
if (ptypes[t].update_func)
{
if ((*(ptypes[t].update_func))(i,x,y,surround_space))
if ((*(ptypes[t].update_func))(i,x,y,surround_space,nt))
continue;
}
if (legacy_enable)//if heat sim is off
update_legacy_all(i,x,y,surround_space);
update_legacy_all(i,x,y,surround_space,nt);
killed:
if (parts[i].type == PT_NONE)//if its dead, skip to next particle