more datstructures

1 files changed, 13 insertions, 7 deletions

diff --git a/Smoke/fluids.h b/Smoke/fluids.h
index 2e79fd5..43ca4bc 100644
--- a/Smoke/fluids.h
+++ b/Smoke/fluids.h
@@ -53,21 +53,30 @@ struct point {
   float z;
 };
 
+struct scalar_frame {
+  fftw_real *x;
+  fftw_real *y;
+};
+
+struct scalar_history {
+  fftw_real *x[HISTORY_SIZE];
+  fftw_real *y[HISTORY_SIZE];
+};
+
 struct vis_data_arrays {
   fftw_real *rho;
   fftw_real *vel;
   fftw_real *force;
+  struct scalar_frame frame;
   fftw_real *div_vel;
   fftw_real *div_force;
   fftw_real *height;
   struct point *normals;
-  fftw_real *history[HISTORY_SIZE];
+  fftw_real *frame_history[HISTORY_SIZE];
+  struct scalar_history history;
 };
 
 
-extern int isolines_nr;
-extern float threshold1;
-extern float threshold2;
 extern int active_slider;
 
 
@@ -85,7 +94,4 @@ void fluids_reset_simulation(void);
 void fluids_calculate_one_simulation_step(struct vis_data_arrays *vis_data);
 
 int fluids_get_hisdex(void);
-
-float get_dataset(int index);
-void set_autoscaling(void);
 #endif