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

TPT: Move INST flood fill into a separate function 36de2f19f5

Browse Source
This commit is contained in:
Simon Robertshaw 2012-07-25 15:32:05 +01:00
parent fad383f392
commit 2189d298a7
8 changed files with 164 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

223
src/simulation/Simulation.cpp
View File

@ -363,6 +363,143 @@ SimulationSample Simulation::Get(int x, int y)
#define PMAP_CMP_CONDUCTIVE(pmap, t) (((pmap)&0xFF)==(t) || (((pmap)&0xFF)==PT_SPRK && parts[(pmap)>>8].ctype==(t))) #define PMAP_CMP_CONDUCTIVE(pmap, t) (((pmap)&0xFF)==(t) || (((pmap)&0xFF)==PT_SPRK && parts[(pmap)>>8].ctype==(t)))
int Simulation::FloodINST(int x, int y, int fullc, int cm)
{
int c = fullc&0xFF;
int x1, x2, dy = (c<PT_NUM)?1:CELL;
int co = c;
int coord_stack_limit = XRES*YRES;
unsigned short (*coord_stack)[2] = (short unsigned int (*)[2])malloc(sizeof(unsigned short)*2*coord_stack_limit);
int coord_stack_size = 0;
int created_something = 0;
if (c>=PT_NUM)
return 0;
if (cm==-1)
{
if (c==0)
{
cm = pmap[y][x]&0xFF;
if (!cm)
return 0;
}
else
cm = 0;
}
if ((pmap[y][x]&0xFF)!=cm)
return 1;
coord_stack[coord_stack_size][0] = x;
coord_stack[coord_stack_size][1] = y;
coord_stack_size++;
do
{
coord_stack_size--;
x = coord_stack[coord_stack_size][0];
y = coord_stack[coord_stack_size][1];
x1 = x2 = x;
// go left as far as possible
while (x1>=CELL)
{
if ((pmap[y][x1-1]&0xFF)!=cm)
{
break;
}
x1--;
}
// go right as far as possible
while (x2<XRES-CELL)
{
if ((pmap[y][x2+1]&0xFF)!=cm)
{
break;
}
x2++;
}
// fill span
for (x=x1; x<=x2; x++)
{
if (create_part(-1, x, y, fullc)>=0)
created_something = 1;
}
// add vertically adjacent pixels to stack
// (wire crossing for INST)
if (y>=CELL+1 && x1==x2 &&
PMAP_CMP_CONDUCTIVE(pmap[y-1][x1-1], cm) && PMAP_CMP_CONDUCTIVE(pmap[y-1][x1], cm) && PMAP_CMP_CONDUCTIVE(pmap[y-1][x1+1], cm) &&
!PMAP_CMP_CONDUCTIVE(pmap[y-2][x1-1], cm) && PMAP_CMP_CONDUCTIVE(pmap[y-2][x1], cm) && !PMAP_CMP_CONDUCTIVE(pmap[y-2][x1+1], cm))
{
// travelling vertically up, skipping a horizontal line
if ((pmap[y-2][x1]&0xFF)==cm)
{
coord_stack[coord_stack_size][0] = x1;
coord_stack[coord_stack_size][1] = y-2;
coord_stack_size++;
if (coord_stack_size>=coord_stack_limit)
return -1;
}
}
else if (y>=CELL+1)
{
for (x=x1; x<=x2; x++)
{
if ((pmap[y-1][x]&0xFF)==cm)
{
if (x==x1 || x==x2 || y>=YRES-CELL-1 || !PMAP_CMP_CONDUCTIVE(pmap[y+1][x], cm))
{
// if at the end of a horizontal section, or if it's a T junction
coord_stack[coord_stack_size][0] = x;
coord_stack[coord_stack_size][1] = y-1;
coord_stack_size++;
if (coord_stack_size>=coord_stack_limit)
return -1;
}
}
}
}
if (y<YRES-CELL-1 && x1==x2 &&
PMAP_CMP_CONDUCTIVE(pmap[y+1][x1-1], cm) && PMAP_CMP_CONDUCTIVE(pmap[y+1][x1], cm) && PMAP_CMP_CONDUCTIVE(pmap[y+1][x1+1], cm) &&
!PMAP_CMP_CONDUCTIVE(pmap[y+2][x1-1], cm) && PMAP_CMP_CONDUCTIVE(pmap[y+2][x1], cm) && !PMAP_CMP_CONDUCTIVE(pmap[y+2][x1+1], cm))
{
// travelling vertically down, skipping a horizontal line
if ((pmap[y+2][x1]&0xFF)==cm)
{
coord_stack[coord_stack_size][0] = x1;
coord_stack[coord_stack_size][1] = y+2;
coord_stack_size++;
if (coord_stack_size>=coord_stack_limit)
return -1;
}
}
else if (y<YRES-CELL-1)
{
for (x=x1; x<=x2; x++)
{
if ((pmap[y+1][x]&0xFF)==cm)
{
if (x==x1 || x==x2 || y<0 || !PMAP_CMP_CONDUCTIVE(pmap[y-1][x], cm))
{
// if at the end of a horizontal section, or if it's a T junction
coord_stack[coord_stack_size][0] = x;
coord_stack[coord_stack_size][1] = y+1;
coord_stack_size++;
if (coord_stack_size>=coord_stack_limit)
return -1;
}
}
}
}
} while (coord_stack_size>0);
free(coord_stack);
return created_something;
}
int Simulation::FloodParts(int x, int y, int fullc, int cm, int bm, int flags) int Simulation::FloodParts(int x, int y, int fullc, int cm, int bm, int flags)
{ {
int c = fullc&0xFF; int c = fullc&0xFF;
@ -375,9 +512,6 @@ int Simulation::FloodParts(int x, int y, int fullc, int cm, int bm, int flags)
if (c==SPC_PROP) if (c==SPC_PROP)
return 0; return 0;
if (cm==PT_INST&&co==PT_SPRK)
if ((pmap[y][x]&0xFF)==PT_SPRK)
return 0;
if (cm==-1) if (cm==-1)
{ {
if (c==0) if (c==0)
@ -436,92 +570,11 @@ int Simulation::FloodParts(int x, int y, int fullc, int cm, int bm, int flags)
} }
// fill span // fill span
for (x=x1; x<=x2; x++) for (x=x1; x<=x2; x++)
{
if (cm==PT_INST&&co==PT_SPRK)
{
if (create_part(-1, x, y, fullc)>=0)
created_something = 1;
}
else
{ {
if (CreateParts(x, y, 0, 0, fullc, flags)) if (CreateParts(x, y, 0, 0, fullc, flags))
created_something = 1; created_something = 1;
} }
}
// add vertically adjacent pixels to stack
if (cm==PT_INST&&co==PT_SPRK)
{
//wire crossing for INST
if (y>=CELL+1 && x1==x2 &&
PMAP_CMP_CONDUCTIVE(pmap[y-1][x1-1], PT_INST) && PMAP_CMP_CONDUCTIVE(pmap[y-1][x1], PT_INST) && PMAP_CMP_CONDUCTIVE(pmap[y-1][x1+1], PT_INST) &&
!PMAP_CMP_CONDUCTIVE(pmap[y-2][x1-1], PT_INST) && PMAP_CMP_CONDUCTIVE(pmap[y-2][x1], PT_INST) && !PMAP_CMP_CONDUCTIVE(pmap[y-2][x1+1], PT_INST))
{
// travelling vertically up, skipping a horizontal line
if ((pmap[y-2][x1]&0xFF)==PT_INST)
{
coord_stack[coord_stack_size][0] = x1;
coord_stack[coord_stack_size][1] = y-2;
coord_stack_size++;
if (coord_stack_size>=coord_stack_limit)
return -1;
}
}
else if (y>=CELL+1)
{
for (x=x1; x<=x2; x++)
{
if ((pmap[y-1][x]&0xFF)==PT_INST)
{
if (x==x1 || x==x2 || y>=YRES-CELL-1 || !PMAP_CMP_CONDUCTIVE(pmap[y+1][x], PT_INST))
{
// if at the end of a horizontal section, or if it's a T junction
coord_stack[coord_stack_size][0] = x;
coord_stack[coord_stack_size][1] = y-1;
coord_stack_size++;
if (coord_stack_size>=coord_stack_limit)
return -1;
}
}
}
}
if (y<YRES-CELL-1 && x1==x2 &&
PMAP_CMP_CONDUCTIVE(pmap[y+1][x1-1], PT_INST) && PMAP_CMP_CONDUCTIVE(pmap[y+1][x1], PT_INST) && PMAP_CMP_CONDUCTIVE(pmap[y+1][x1+1], PT_INST) &&
!PMAP_CMP_CONDUCTIVE(pmap[y+2][x1-1], PT_INST) && PMAP_CMP_CONDUCTIVE(pmap[y+2][x1], PT_INST) && !PMAP_CMP_CONDUCTIVE(pmap[y+2][x1+1], PT_INST))
{
// travelling vertically down, skipping a horizontal line
if ((pmap[y+2][x1]&0xFF)==PT_INST)
{
coord_stack[coord_stack_size][0] = x1;
coord_stack[coord_stack_size][1] = y+2;
coord_stack_size++;
if (coord_stack_size>=coord_stack_limit)
return -1;
}
}
else if (y<YRES-CELL-1)
{
for (x=x1; x<=x2; x++)
{
if ((pmap[y+1][x]&0xFF)==PT_INST)
{
if (x==x1 || x==x2 || y<0 || !PMAP_CMP_CONDUCTIVE(pmap[y-1][x], PT_INST))
{
// if at the end of a horizontal section, or if it's a T junction
coord_stack[coord_stack_size][0] = x;
coord_stack[coord_stack_size][1] = y+1;
coord_stack_size++;
if (coord_stack_size>=coord_stack_limit)
return -1;
}
}
}
}
}
else
{
if (y>=CELL+dy) if (y>=CELL+dy)
for (x=x1; x<=x2; x++) for (x=x1; x<=x2; x++)
if ((pmap[y-dy][x]&0xFF)==cm && bmap[(y-dy)/CELL][x/CELL]==bm) if ((pmap[y-dy][x]&0xFF)==cm && bmap[(y-dy)/CELL][x/CELL]==bm)
@ -532,6 +585,7 @@ int Simulation::FloodParts(int x, int y, int fullc, int cm, int bm, int flags)
if (coord_stack_size>=coord_stack_limit) if (coord_stack_size>=coord_stack_limit)
return -1; return -1;
} }
if (y<YRES-CELL-dy) if (y<YRES-CELL-dy)
for (x=x1; x<=x2; x++) for (x=x1; x<=x2; x++)
if ((pmap[y+dy][x]&0xFF)==cm && bmap[(y+dy)/CELL][x/CELL]==bm) if ((pmap[y+dy][x]&0xFF)==cm && bmap[(y+dy)/CELL][x/CELL]==bm)
@ -542,7 +596,6 @@ int Simulation::FloodParts(int x, int y, int fullc, int cm, int bm, int flags)
if (coord_stack_size>=coord_stack_limit) if (coord_stack_size>=coord_stack_limit)
return -1; return -1;
} }
}
} while (coord_stack_size>0); } while (coord_stack_size>0);
free(coord_stack); free(coord_stack);
return created_something; return created_something;

1
src/simulation/Simulation.h
View File

@ -160,6 +160,7 @@ public:
void ToolBox(int x1, int y1, int x2, int y2, int tool, Brush * cBrush); void ToolBox(int x1, int y1, int x2, int y2, int tool, Brush * cBrush);
void CreateBox(int x1, int y1, int x2, int y2, int c, int flags); void CreateBox(int x1, int y1, int x2, int y2, int c, int flags);
int FloodINST(int x, int y, int fullc, int cm);
int FloodParts(int x, int y, int c, int cm, int bm, int flags); int FloodParts(int x, int y, int c, int cm, int bm, int flags);
//Create particles from brush/mask //Create particles from brush/mask
int CreateParts(int positionX, int positionY, int c, Brush * cBrush); int CreateParts(int positionX, int positionY, int c, Brush * cBrush);

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

@ -28,7 +28,7 @@ Element_FRZW::Element_FRZW()
Temperature = 120.0f; Temperature = 120.0f;
HeatConduct = 29; HeatConduct = 29;
Description = "FREEZE WATER"; Description = "Freeze water. Hybrid liquid formed when Freeze powder melts.";
State = ST_LIQUID; State = ST_LIQUID;
Properties = TYPE_LIQUID||PROP_LIFE_DEC; Properties = TYPE_LIQUID||PROP_LIFE_DEC;

16
src/simulation/elements/FRZZ.cpp
View File

@ -26,21 +26,21 @@ Element_FRZZ::Element_FRZZ()
Weight = 50; Weight = 50;
Temperature = 90.0f; Temperature = 253.15f;
HeatConduct = 46; HeatConduct = 46;
Description = "FREEZE"; Description = "Freeze powder. When melted, forms ice that always cools. Spreads with regular water.";
State = ST_SOLID; State = ST_SOLID;
Properties = TYPE_PART; Properties = TYPE_PART;
LowPressure = IPL; LowPressure = IPL;
LowPressureTransition = NT; LowPressureTransition = NT;
HighPressure = IPH; HighPressure = 1.8f;
HighPressureTransition = NT; HighPressureTransition = PT_SNOW;
LowTemperature = ITL; LowTemperature = 50.0f;
LowTemperatureTransition = NT; LowTemperatureTransition = PT_ICEI;
HighTemperature = ITH; HighTemperature = 273.15;
HighTemperatureTransition = NT; HighTemperatureTransition = PT_WATR;
Update = &Element_FRZZ::update; Update = &Element_FRZZ::update;

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

@ -66,6 +66,8 @@ int Element_ICEI::update(UPDATE_FUNC_ARGS)
sim->part_change_type(i,x,y,PT_SLTW); sim->part_change_type(i,x,y,PT_SLTW);
sim->part_change_type(r>>8,x+rx,y+ry,PT_SLTW); sim->part_change_type(r>>8,x+rx,y+ry,PT_SLTW);
} }
if (((r&0xFF)==PT_FRZZ) && (parts[i].ctype=PT_FRZW) && 1>(rand()%1000))
sim->part_change_type(r>>8,x+rx,y+ry,PT_ICEI);
} }
return 0; return 0;
} }

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

@ -73,7 +73,7 @@ int Element_PLNT::update(UPDATE_FUNC_ARGS)
sim->kill_part(r>>8); sim->kill_part(r>>8);
parts[i].life = rand()%60 + 60; parts[i].life = rand()%60 + 60;
} }
else if ((r&0xFF)==PT_WOOD && (1>rand()%20) && abs(rx+ry)<=2 && sim->VINE_MODE) else if ( ((r&0xFF)==PT_WOOD) && (1>rand()%20) && (abs(rx+ry)<=2) && (sim->VINE_MODE || parts[i].tmp==1) )
{ {
int nnx = rand()%3 -1; int nnx = rand()%3 -1;
int nny = rand()%3 -1; int nny = rand()%3 -1;

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

@ -243,7 +243,7 @@ int Element_SPRK::update(UPDATE_FUNC_ARGS)
else if (rt==PT_INST) { else if (rt==PT_INST) {
if (parts[r>>8].life==0 && parts[i].life<4) if (parts[r>>8].life==0 && parts[i].life<4)
{ {
sim->FloodParts(x+rx,y+ry,PT_SPRK,PT_INST,-1, 0);//spark the wire sim->FloodINST(x+rx,y+ry,PT_SPRK,PT_INST);//spark the wire
} }
} }
else if (parts[r>>8].life==0 && parts[i].life<4) { else if (parts[r>>8].life==0 && parts[i].life<4) {

1
src/simulation/elements/VINE.cpp
View File

@ -60,6 +60,7 @@ int Element_VINE::update(UPDATE_FUNC_ARGS)
np = sim->create_part(-1,x+rx,y+ry,PT_VINE); np = sim->create_part(-1,x+rx,y+ry,PT_VINE);
if (np<0) return 0; if (np<0) return 0;
parts[np].temp = parts[i].temp; parts[np].temp = parts[i].temp;
parts[i].tmp = 1;
sim->part_change_type(i,x,y,PT_PLNT); sim->part_change_type(i,x,y,PT_PLNT);
} }
} }