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

TPT: Prevent ambient heat going through walls ccb88b6b3b

Browse Source
This commit is contained in:
Simon Robertshaw 2012-04-17 17:32:06 +01:00
parent e68d14a5bf
commit fd09db2345
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/simulation/Air.cpp
View File

@ -39,7 +39,12 @@ void Air::make_kernel(void) //used for velocity
void Air::update_airh(void) void Air::update_airh(void)
{ {
int x, y, i, j; int x, y, i, j;
float dh, dx, dy, f, tx, ty; float odh, dh, dx, dy, f, tx, ty;
for (y=0; y<YRES/CELL; y++)
for (x=0; x<XRES/CELL; x++)
{
bmap_blockairh[y][x] = (bmap[y][x]==WL_WALL || bmap[y][x]==WL_WALLELEC || bmap[y][x]==WL_GRAV || (bmap[y][x]==WL_EWALL && !emap[y][x]));
}
for (i=0; i<YRES/CELL; i++) //reduces pressure/velocity on the edges every frame for (i=0; i<YRES/CELL; i++) //reduces pressure/velocity on the edges every frame
{ {
hv[i][0] = 295.15f; hv[i][0] = 295.15f;
@ -69,10 +74,7 @@ void Air::update_airh(void)
{ {
if (y+j>0 && y+j<YRES/CELL-2 && if (y+j>0 && y+j<YRES/CELL-2 &&
x+i>0 && x+i<XRES/CELL-2 && x+i>0 && x+i<XRES/CELL-2 &&
bmap[y+j][x+i]!=WL_WALL && !bmap_blockairh[y+j][x+i])
bmap[y+j][x+i]!=WL_WALLELEC &&
bmap[y+j][x+i]!=WL_GRAV &&
(bmap[y+j][x+i]!=WL_EWALL || emap[y+j][x+i]))
{ {
f = kernel[i+1+(j+1)*3]; f = kernel[i+1+(j+1)*3];
dh += hv[y+j][x+i]*f; dh += hv[y+j][x+i]*f;
@ -96,11 +98,12 @@ void Air::update_airh(void)
ty -= j; ty -= j;
if (i>=2 && i<XRES/CELL-3 && j>=2 && j<YRES/CELL-3) if (i>=2 && i<XRES/CELL-3 && j>=2 && j<YRES/CELL-3)
{ {
odh = dh;
dh *= 1.0f - AIR_VADV; dh *= 1.0f - AIR_VADV;
dh += AIR_VADV*(1.0f-tx)*(1.0f-ty)*hv[j][i]; dh += AIR_VADV*(1.0f-tx)*(1.0f-ty)*(bmap_blockairh[j][i] ? odh : hv[j][i]);
dh += AIR_VADV*tx*(1.0f-ty)*hv[j][i+1]; dh += AIR_VADV*tx*(1.0f-ty)*(bmap_blockairh[j][i+1] ? odh : hv[j][i+1]);
dh += AIR_VADV*(1.0f-tx)*ty*hv[j+1][i]; dh += AIR_VADV*(1.0f-tx)*ty*(bmap_blockairh[j+1][i] ? odh : hv[j+1][i]);
dh += AIR_VADV*tx*ty*hv[j+1][i+1]; dh += AIR_VADV*tx*ty*(bmap_blockairh[j+1][i+1] ? odh : hv[j+1][i+1]);
} }
//if(!gravityMode) TODO: GET REAL VALUE //if(!gravityMode) TODO: GET REAL VALUE
{ //Vertical gravity only for the time being { //Vertical gravity only for the time being

1
src/simulation/Air.h
View File

@ -23,6 +23,7 @@ public:
float hv[YRES/CELL][XRES/CELL]; float hv[YRES/CELL][XRES/CELL];
float ohv[YRES/CELL][XRES/CELL]; // Ambient Heat float ohv[YRES/CELL][XRES/CELL]; // Ambient Heat
unsigned char bmap_blockair[YRES/CELL][XRES/CELL]; unsigned char bmap_blockair[YRES/CELL][XRES/CELL];
unsigned char bmap_blockairh[YRES/CELL][XRES/CELL];
float kernel[9]; float kernel[9];
void make_kernel(void); void make_kernel(void);
void update_airh(void); void update_airh(void);