mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-30 19:29:52 +02:00
Code Issues Projects Releases Wiki Activity

Fix liquids in vertical gravity when Newtonian gravity is turned on

Browse Source
This commit is contained in:
jacksonmj
2011-07-13 19:48:00 +08:00
committed by Simon Robertshaw
parent 38c920714c
commit c35a8e45ee
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/powder.c
View File

@@ -2249,7 +2249,7 @@ killed:
} }
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, prev_pGravX, prev_pGravY, ptGrav = ptypes[t].gravity;
s = 0; s = 0;
// stagnant is true if FLAG_STAGNANT was set for this particle in previous frame // stagnant is true if FLAG_STAGNANT was set for this particle in previous frame
if (!stagnant || nt) //nt is if there is an something else besides the current particle type, around the particle if (!stagnant || nt) //nt is if there is an something else besides the current particle type, around the particle
@@ -2284,8 +2284,18 @@ killed:
if (mv<0.0001f) break; if (mv<0.0001f) break;
pGravX /= mv; pGravX /= mv;
pGravY /= mv; pGravY /= mv;
nxf += r*pGravY + 0.1f*pGravX; if (j)
nyf += -r*pGravX + 0.1f*pGravY; {
nxf += r*(pGravY*2.0f-prev_pGravY);
nyf += -r*(pGravX*2.0f-prev_pGravX);
}
else
{
nxf += r*pGravY;
nyf += -r*pGravX;
}
prev_pGravX = pGravX;
prev_pGravY = 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)