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

Small fixes for liquids in radial/Newtonian gravity

Browse Source
This commit is contained in:
jacksonmj 2011-06-18 16:47:47 +01:00 committed by Simon Robertshaw
parent 636b1db4d2
commit 4043dba74c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/powder.c
View File

@ -2154,7 +2154,7 @@ killed:
parts[i].vx *= ptypes[t].collision; parts[i].vx *= ptypes[t].collision;
parts[i].vy *= ptypes[t].collision; parts[i].vy *= ptypes[t].collision;
} }
else if (ptypes[t].falldown>1 && fabsf(pGravX*parts[i].vx+pGravY*parts[i].vy)>fabsf(pGravY*parts[i].vx+pGravX*parts[i].vy)) else if (ptypes[t].falldown>1 && fabsf(pGravX*parts[i].vx+pGravY*parts[i].vy)>fabsf(pGravY*parts[i].vx-pGravX*parts[i].vy))
{ {
float nxf, nyf, ptGrav = ptypes[t].gravity; float nxf, nyf, ptGrav = ptypes[t].gravity;
s = 0; s = 0;
@ -2191,8 +2191,8 @@ killed:
if (mv<0.0001f) break; if (mv<0.0001f) break;
pGravX /= mv; pGravX /= mv;
pGravY /= mv; pGravY /= mv;
nxf += r*pGravY; nxf += r*pGravY + 0.1f*pGravX;
nyf -= r*pGravX; nyf += -r*pGravX + 0.1f*pGravY;
nx = (int)(nxf+0.5f); nx = (int)(nxf+0.5f);
ny = (int)(nyf+0.5f); ny = (int)(nyf+0.5f);
if (nx<0 || ny<0 || nx>=XRES || ny >=YRES) if (nx<0 || ny<0 || nx>=XRES || ny >=YRES)
@ -2200,7 +2200,13 @@ killed:
if ((pmap[ny][nx]&0xFF)!=t || bmap[ny/CELL][nx/CELL]) if ((pmap[ny][nx]&0xFF)!=t || bmap[ny/CELL][nx/CELL])
{ {
s = do_move(i, x, y, nxf, nyf); s = do_move(i, x, y, nxf, nyf);
if (s || bmap[ny/CELL][nx/CELL]!=WL_STREAM) if (s)
{
nx = (int)(parts[i].x+0.5f);
ny = (int)(parts[i].y+0.5f);
break;
}
if (bmap[ny/CELL][nx/CELL]!=WL_STREAM)
break; break;
} }
} }