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

Revert "Heat simulation improvement."

Browse Source 
This reverts commit 5e43bb0510.
This commit is contained in:
Simon Robertshaw 2011-06-15 13:11:29 +01:00
parent 5a8c52aeee
commit 8f97f6c5c7
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/powder.c
View File

@ -1638,7 +1638,6 @@ void update_particles_i(pixel *vid, int start, int inc)
hv[y/CELL][x/CELL] -= c_heat; hv[y/CELL][x/CELL] -= c_heat;
} }
c_heat = 0.0f; c_heat = 0.0f;
float c_Cm = 0.0f;
for (j=0; j<8; j++) for (j=0; j<8; j++)
{ {
surround_hconduct[j] = i; surround_hconduct[j] = i;
@ -1651,14 +1650,12 @@ void update_particles_i(pixel *vid, int start, int inc)
&&(rt!=PT_FILT||(t!=PT_BRAY&&t!=PT_PHOT&&t!=PT_BIZR&&t!=PT_BIZRG))) &&(rt!=PT_FILT||(t!=PT_BRAY&&t!=PT_PHOT&&t!=PT_BIZR&&t!=PT_BIZRG)))
{ {
surround_hconduct[j] = r>>8; surround_hconduct[j] = r>>8;
c_heat += parts[r>>8].temp*96.645/ptypes[rt].hconduct*ptypes[rt].weight; c_heat += parts[r>>8].temp;
c_Cm += 96.645/ptypes[rt].hconduct*ptypes[rt].weight;
h_count++; h_count++;
} }
} }
pt = parts[i].temp = (c_heat+parts[i].temp*96.645/ptypes[t].hconduct*ptypes[t].weight) pt = parts[i].temp = (c_heat+parts[i].temp)/(h_count+1);
/(c_Cm+96.645/ptypes[t].hconduct*ptypes[t].weight);
for (j=0; j<8; j++) for (j=0; j<8; j++)
{ {
parts[surround_hconduct[j]].temp = pt; parts[surround_hconduct[j]].temp = pt;