summaryrefslogtreecommitdiffstats
path: root/Smoke/smoke.c
diff options
context:
space:
mode:
Diffstat (limited to 'Smoke/smoke.c')
-rw-r--r--Smoke/smoke.c20
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)