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

Fix piston retraction

Browse Source
This commit is contained in:
Simon Robertshaw 2013-01-23 19:52:45 +00:00
parent 6c89c63a44
commit 7475a49e0b
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,13 +54,14 @@ int Element_PSTN::tempParts[128];
#define PISTON_RETRACT 0x01 #define PISTON_RETRACT 0x01
#define PISTON_EXTEND 0x02 #define PISTON_EXTEND 0x02
#define MAX_FRAME 0x0F #define MAX_FRAME 0x0F
#define DEFAULT_LIMIT 0x1F
//#TPT-Directive ElementHeader Element_PSTN static int update(UPDATE_FUNC_ARGS) //#TPT-Directive ElementHeader Element_PSTN static int update(UPDATE_FUNC_ARGS)
int Element_PSTN::update(UPDATE_FUNC_ARGS) int Element_PSTN::update(UPDATE_FUNC_ARGS)
{ {
if(parts[i].ctype) if(parts[i].ctype)
return 0; return 0;
int maxSize = parts[i].tmp ? parts[i].tmp : 15; int maxSize = parts[i].tmp ? parts[i].tmp : DEFAULT_LIMIT;
int state = parts[i].tmp2; int state = parts[i].tmp2;
int r, nxx, nyy, nxi, nyi, rx, ry; int r, nxx, nyy, nxi, nyi, rx, ry;
int directionX = 0, directionY = 0; int directionX = 0, directionY = 0;
@ -190,32 +191,27 @@ int Element_PSTN::MoveStack(Simulation * sim, int stackX, int stackY, int direct
return biggestMove; return biggestMove;
} }
if(retract){ if(retract){
//Warning: retraction does not scan to see if it has space
for(posX = stackX, posY = stackY; currentPos < size; posX += directionX, posY += directionY) { for(posX = stackX, posY = stackY; currentPos < size; posX += directionX, posY += directionY) {
if (!(posX < XRES && posY < YRES && posX >= 0 && posY >= 0)) { if (!(posX < XRES && posY < YRES && posX >= 0 && posY >= 0)) {
break; break;
} }
r = sim->pmap[posY][posX]; r = sim->pmap[posY][posX];
if(!r) { if(!r) {
spaces++; break;
foundEnd = true;
if(spaces >= amount)
break;
} else { } else {
foundParts = true; foundParts = true;
tempParts[currentPos++] = r>>8; tempParts[currentPos++] = r>>8;
} }
} }
if(amount > spaces) if(foundParts) {
amount = spaces;
if(foundParts && foundEnd) {
//Move particles //Move particles
for(int j = 0; j < currentPos; j++) { for(int j = 0; j < currentPos; j++) {
int jP = tempParts[j]; int jP = tempParts[j];
sim->pmap[(int)(sim->parts[jP].y + 0.5f)][(int)(sim->parts[jP].x + 0.5f)] = 0;
sim->parts[jP].x += (float)((-directionX)*amount); sim->parts[jP].x += (float)((-directionX)*amount);
sim->parts[jP].y += (float)((-directionY)*amount); sim->parts[jP].y += (float)((-directionY)*amount);
int nPx = (int)(sim->parts[jP].x + 0.5f); sim->pmap[(int)(sim->parts[jP].y + 0.5f)][(int)(sim->parts[jP].x + 0.5f)] = sim->parts[jP].type|(jP<<8);
int nPy = (int)(sim->parts[jP].y + 0.5f);
sim->pmap[nPy][nPx] = sim->parts[jP].type|(jP<<8);
} }
return amount; return amount;
} }
@ -243,11 +239,10 @@ int Element_PSTN::MoveStack(Simulation * sim, int stackX, int stackY, int direct
//Move particles //Move particles
for(int j = 0; j < currentPos; j++) { for(int j = 0; j < currentPos; j++) {
int jP = tempParts[j]; int jP = tempParts[j];
sim->pmap[(int)(sim->parts[jP].y + 0.5f)][(int)(sim->parts[jP].x + 0.5f)] = 0;
sim->parts[jP].x += (float)(directionX*amount); sim->parts[jP].x += (float)(directionX*amount);
sim->parts[jP].y += (float)(directionY*amount); sim->parts[jP].y += (float)(directionY*amount);
int nPx = (int)(sim->parts[jP].x + 0.5f); sim->pmap[(int)(sim->parts[jP].y + 0.5f)][(int)(sim->parts[jP].x + 0.5f)] = sim->parts[jP].type|(jP<<8);
int nPy = (int)(sim->parts[jP].y + 0.5f);
sim->pmap[nPy][nPx] = sim->parts[jP].type|(jP<<8);
} }
return amount; return amount;
} }