diff options
Diffstat (limited to 'Smoke/fluids.c')
| -rw-r--r-- | Smoke/fluids.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Smoke/fluids.c b/Smoke/fluids.c index a6c0a03..04d28d8 100644 --- a/Smoke/fluids.c +++ b/Smoke/fluids.c @@ -26,6 +26,7 @@ #include "streamlines.h" #include "normals.h" #include "isolines.h" +#include "flowvis.h" //--- SIMULATION PARAMETERS ------------------------------------------------------------------------ int var_dims = 25; @@ -247,10 +248,6 @@ struct point vector_normal(struct point vert1, struct point vert2, struct point return_value.y /= length; return_value.z /= length; - if (return_value.x == return_value.y == return_value.z == 0.0f) - { - return_value.z = 1.0f; - } return return_value; } @@ -293,7 +290,6 @@ void calculate_normal_vectors(void) struct point calculate_normal_vector(fftw_real *height, int index, int i, int j) { - int idx; float px, py; struct point p1, p2, p3, rv; @@ -525,7 +521,8 @@ void fluids_calculate_one_simulation_step(struct vis_data_arrays *vis_data) frame = get_vector_frame(vis_data, dataset); isolines_set_frame(frame); - streamlines_set_history(vis_data->history_frame); + flowvis_set_history(vis_data->history_frame); + streamlines_set_history_scalars(vis_data->history_scalars); } |