diff options
author | Wilrik de Loose <wilrik@wilrik.nl> | 2008-01-10 19:14:14 (GMT) |
---|---|---|
committer | Wilrik de Loose <wilrik@wilrik.nl> | 2008-01-10 19:14:14 (GMT) |
commit | b7bad543e14945a84d58a205ff30038db0b87ca0 (patch) | |
tree | 2f31e826b26c3806594283cd10d40420b187b596 /Smoke/smoke.c | |
parent | 890f2eba8e594f345600b6e97de4d35d22b9b31f (diff) | |
download | 2iv35-b7bad543e14945a84d58a205ff30038db0b87ca0.zip 2iv35-b7bad543e14945a84d58a205ff30038db0b87ca0.tar.gz 2iv35-b7bad543e14945a84d58a205ff30038db0b87ca0.tar.bz2 |
gui voor grid-smoke, resetten van scaling en clamping and fixed the motha-focking rescaling bug
Diffstat (limited to 'Smoke/smoke.c')
-rw-r--r-- | Smoke/smoke.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/Smoke/smoke.c b/Smoke/smoke.c index cc21479..a8b9a68 100644 --- a/Smoke/smoke.c +++ b/Smoke/smoke.c @@ -6,11 +6,11 @@ #include <rfftw.h> #include "fluids.h" +#include "smoke.h" #include "funcs.h" - static int smoke_render_smoke = TRUE; -static int smoke_render_smoke_grid = FALSE; +static int smoke_sort = SMOKE_FLUID; static int smoke_dataset = DATASET_RHO; static fftw_real *smoke_frame; @@ -18,11 +18,6 @@ static fftw_real *smoke_frame; void smoke_set_render(int render_smoke) { smoke_render_smoke = render_smoke; - - if (smoke_render_smoke) - { - smoke_render_smoke_grid = FALSE; - } } int smoke_get_render(void) @@ -30,17 +25,14 @@ int smoke_get_render(void) return smoke_render_smoke; } -int smoke_grid_get_render(void) +int smoke_get_sort (void) { - return smoke_render_smoke_grid; + return smoke_sort; } -void smoke_grid_set_render(int render_grid) +void smoke_set_sort (int sort) { - if (!smoke_render_smoke) - { - smoke_render_smoke_grid = render_grid; - } + smoke_sort = sort; } void smoke_set_dataset(int dataset) |