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

fix crash with high speed photons in loop edge mode

Browse Source
This commit is contained in:
jacob1 2015-05-10 21:48:09 -04:00
parent dd102c1f11
commit b1fc134204
1 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/simulation/Simulation.cpp
View File

@ -3220,7 +3220,7 @@ void Simulation::delete_part(int x, int y)//calls kill_part with the particle lo
void Simulation::UpdateParticles(int start, int end) void Simulation::UpdateParticles(int start, int end)
{ {
int i, j, x, y, t, nx, ny, r, surround_space, s, lt, rt, nt; int i, j, x, y, t, nx, ny, r, surround_space, s, rt, nt;
float mv, dx, dy, nrx, nry, dp, ctemph, ctempl, gravtot; float mv, dx, dy, nrx, nry, dp, ctemph, ctempl, gravtot;
int fin_x, fin_y, clear_x, clear_y, stagnant; int fin_x, fin_y, clear_x, clear_y, stagnant;
float fin_xf, fin_yf, clear_xf, clear_yf; float fin_xf, fin_yf, clear_xf, clear_yf;
@ -4012,51 +4012,54 @@ killed:
} }
else if (elements[t].Properties & TYPE_ENERGY) else if (elements[t].Properties & TYPE_ENERGY)
{ {
if (t == PT_PHOT) { if (t == PT_PHOT)
{
if (parts[i].flags&FLAG_SKIPMOVE) if (parts[i].flags&FLAG_SKIPMOVE)
{ {
parts[i].flags &= ~FLAG_SKIPMOVE; parts[i].flags &= ~FLAG_SKIPMOVE;
continue; continue;
} }
rt = pmap[fin_y][fin_x] & 0xFF; if (eval_move(PT_PHOT, fin_x, fin_y, NULL))
lt = pmap[y][x] & 0xFF; {
int rt = pmap[fin_y][fin_x] & 0xFF;
r = eval_move(PT_PHOT, fin_x, fin_y, NULL); int lt = pmap[y][x] & 0xFF;
if (((rt==PT_GLAS && lt!=PT_GLAS) || (rt!=PT_GLAS && lt==PT_GLAS)) && r) { if ((rt==PT_GLAS && lt!=PT_GLAS) || (rt!=PT_GLAS && lt==PT_GLAS))
if (!get_normal_interp(REFRACT|t, parts[i].x, parts[i].y, parts[i].vx, parts[i].vy, &nrx, &nry)) {
kill_part(i);
continue;
}
r = get_wavelength_bin(&parts[i].ctype);
if (r == -1 || !(parts[i].ctype&0x3FFFFFFF))
{ {
kill_part(i); if (!get_normal_interp(REFRACT|t, parts[i].x, parts[i].y, parts[i].vx, parts[i].vy, &nrx, &nry)) {
continue; kill_part(i);
} continue;
nn = GLASS_IOR - GLASS_DISP*(r-15)/15.0f; }
nn *= nn;
nrx = -nrx; r = get_wavelength_bin(&parts[i].ctype);
nry = -nry; if (r == -1 || !(parts[i].ctype&0x3FFFFFFF))
if (rt==PT_GLAS && lt!=PT_GLAS) {
nn = 1.0f/nn; kill_part(i);
ct1 = parts[i].vx*nrx + parts[i].vy*nry; continue;
ct2 = 1.0f - (nn*nn)*(1.0f-(ct1*ct1)); }
if (ct2 < 0.0f) { nn = GLASS_IOR - GLASS_DISP*(r-15)/15.0f;
// total internal reflection nn *= nn;
parts[i].vx -= 2.0f*ct1*nrx; nrx = -nrx;
parts[i].vy -= 2.0f*ct1*nry; nry = -nry;
fin_xf = parts[i].x; if (rt==PT_GLAS && lt!=PT_GLAS)
fin_yf = parts[i].y; nn = 1.0f/nn;
fin_x = x; ct1 = parts[i].vx*nrx + parts[i].vy*nry;
fin_y = y; ct2 = 1.0f - (nn*nn)*(1.0f-(ct1*ct1));
} else { if (ct2 < 0.0f) {
// refraction // total internal reflection
ct2 = sqrtf(ct2); parts[i].vx -= 2.0f*ct1*nrx;
ct2 = ct2 - nn*ct1; parts[i].vy -= 2.0f*ct1*nry;
parts[i].vx = nn*parts[i].vx + ct2*nrx; fin_xf = parts[i].x;
parts[i].vy = nn*parts[i].vy + ct2*nry; fin_yf = parts[i].y;
fin_x = x;
fin_y = y;
} else {
// refraction
ct2 = sqrtf(ct2);
ct2 = ct2 - nn*ct1;
parts[i].vx = nn*parts[i].vx + ct2*nrx;
parts[i].vy = nn*parts[i].vy + ct2*nry;
}
} }
} }
} }