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

Some changes which make GRVT work better

Browse Source
This commit is contained in:
jacob1 2014-07-02 23:07:10 -04:00
parent 70676aba4a
commit 4b4eb1a68e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/simulation/Gravity.cpp
View File

@ -144,6 +144,7 @@ void Gravity::update_grav_async()
//memset(th_gravy, 0, XRES*YRES*sizeof(float)); //memset(th_gravy, 0, XRES*YRES*sizeof(float));
//memset(th_gravx, 0, XRES*YRES*sizeof(float)); //memset(th_gravx, 0, XRES*YRES*sizeof(float));
//memset(th_gravp, 0, XRES*YRES*sizeof(float)); //memset(th_gravp, 0, XRES*YRES*sizeof(float));
if (!grav_fft_status) grav_fft_init();
while(!thread_done){ while(!thread_done){
if(!done){ if(!done){
update_grav(); update_grav();
@ -301,7 +302,6 @@ void Gravity::update_grav()
if(changed) if(changed)
{ {
th_gravchanged = 1; th_gravchanged = 1;
if (!grav_fft_status) grav_fft_init();
//copy gravmap into padded gravmap array //copy gravmap into padded gravmap array
for (y=0; y<YRES/CELL; y++) for (y=0; y<YRES/CELL; y++)

2
src/simulation/Simulation.cpp
View File

@ -4236,7 +4236,7 @@ killed:
clear_y = (int)(clear_yf+0.5f); clear_y = (int)(clear_yf+0.5f);
break; break;
} }
if (fin_x<CELL || fin_y<CELL || fin_x>=XRES-CELL || fin_y>=YRES-CELL || pmap[fin_y][fin_x] || (bmap[fin_y/CELL][fin_x/CELL] && (bmap[fin_y/CELL][fin_x/CELL]==WL_DESTROYALL || !eval_move(t,fin_x,fin_y,NULL)))) if (!eval_move(t, fin_x, fin_y, NULL))
{ {
// found an obstacle // found an obstacle
clear_xf = fin_xf-dx; clear_xf = fin_xf-dx;