From 120b234068acc69155a0e7bc30aa6b78ad3b7f22 Mon Sep 17 00:00:00 2001 From: Oliver Schinagl Date: Thu, 10 Jan 2008 12:21:34 +0000 Subject: oops --- Smoke/fluids.c | 2 ++ Smoke/fluids.h | 2 +- Smoke/renderer_gl.c | 1 - Smoke/smoke.bin | Bin 651564 -> 651630 bytes 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Smoke/fluids.c b/Smoke/fluids.c index cce2c38..83764ac 100644 --- a/Smoke/fluids.c +++ b/Smoke/fluids.c @@ -83,6 +83,7 @@ void fluids_init_simulation(int n, struct vis_data_arrays *vis_data) { vis_data->history[i] = (fftw_real *)malloc(dim1); } + printf("frame 0: %p\n", vis_data->history[0]); fluids_reset_simulation(); @@ -498,6 +499,7 @@ void fluids_calculate_one_simulation_step(struct vis_data_arrays *vis_data) heightplots_set_frame(vis_data->height); normals_set_frame(vis_data->normals); + streamlines_set_history(vis_data->history); } //------ VISUALIZATION CODE STARTS HERE ----------------------------------------------------------------- diff --git a/Smoke/fluids.h b/Smoke/fluids.h index 589ee42..e495222 100644 --- a/Smoke/fluids.h +++ b/Smoke/fluids.h @@ -29,7 +29,7 @@ extern int frame_index; #define VECTOR_VEL 0 #define VECTOR_FORCE 1 -#define HISTORY_SIZE 4 +#define HISTORY_SIZE 80 extern int winWidth, winHeight; //size of the graphics window, in pixels extern int color_dir; //use direction color-coding or not diff --git a/Smoke/renderer_gl.c b/Smoke/renderer_gl.c index b483272..8b81d46 100644 --- a/Smoke/renderer_gl.c +++ b/Smoke/renderer_gl.c @@ -748,7 +748,6 @@ static void render_flowvis(void) history = streamlines_get_history(hisdex); glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); - for (j = 0; j < DIM - 1; j++) //draw smoke { glBegin(GL_TRIANGLE_STRIP); diff --git a/Smoke/smoke.bin b/Smoke/smoke.bin index 44ccf31..be3b34f 100755 Binary files a/Smoke/smoke.bin and b/Smoke/smoke.bin differ -- cgit v0.12