diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-21 11:26:39 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-21 11:26:39 (GMT) |
| commit | 4b8ebe4abd98d65c97cf1dbd571d448f53669bc3 (patch) | |
| tree | 7e2781fe70c221b4d24416c85223737b8a11dc04 /src/simulation/Air.cpp | |
| parent | e54eeae8836b65debfdda242c7c39472b901bc70 (diff) | |
| download | powder-4b8ebe4abd98d65c97cf1dbd571d448f53669bc3.zip powder-4b8ebe4abd98d65c97cf1dbd571d448f53669bc3.tar.gz | |
Air heat simulation now knows about gravity mode. fixes #142
Diffstat (limited to 'src/simulation/Air.cpp')
| -rw-r--r-- | src/simulation/Air.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/simulation/Air.cpp b/src/simulation/Air.cpp index 2dfcae0..10c4569 100644 --- a/src/simulation/Air.cpp +++ b/src/simulation/Air.cpp @@ -2,6 +2,7 @@ #include <algorithm> #include "Config.h" #include "Air.h" +#include "Simulation.h" //#include <powder.h> //#include <defines.h> #include "Gravity.h" @@ -110,7 +111,7 @@ void Air::update_airh(void) dh += AIR_VADV*(1.0f-tx)*ty*(bmap_blockairh[j+1][i] ? odh : hv[j+1][i]); dh += AIR_VADV*tx*ty*(bmap_blockairh[j+1][i+1] ? odh : hv[j+1][i+1]); } - //if(!gravityMode) TODO: GET REAL VALUE + if(!sim.gravityMode) { //Vertical gravity only for the time being float airdiff = hv[y-1][x]-hv[y][x]; if(airdiff>0 && !bmap_blockairh[y-1][x]) @@ -309,9 +310,12 @@ void Air::Invert() } } -Air::Air(): - airMode(0) +Air::Air(Simulation & simulation): + airMode(0), + sim(simulation) { //Simulation should do this. make_kernel(); + + } |