diff options
Diffstat (limited to 'Smoke/gtk.c')
| -rw-r--r-- | Smoke/gtk.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Smoke/gtk.c b/Smoke/gtk.c index bd1ab4b..bd04a8b 100644 --- a/Smoke/gtk.c +++ b/Smoke/gtk.c @@ -103,7 +103,7 @@ static void timeout_remove (GtkWidget *widget); static GdkGLConfig *configure_gl (void); //static GtkWidget *create_popup_menu (GtkWidget *drawing_area); -static GtkWidget *create_window (GdkGLConfig *glconfig, fftw_real *field); +static GtkWidget *create_window (GdkGLConfig *glconfig, struct vis_data_arrays *vis_data); /************************************************************************** @@ -187,7 +187,7 @@ expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer data) { - fftw_real *field = (gpointer)data; + struct vis_data_arrays *vis_data = (struct vis_data_arrays *)data; GdkGLContext *glcontext = gtk_widget_get_gl_context (widget); GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable (widget); @@ -203,8 +203,8 @@ expose_event (GtkWidget *widget, // fluids glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - calculate_one_simulation_step(field); - visualize(field); + calculate_one_simulation_step(vis_data); + visualize(vis_data); // endf /* Swap buffers */ @@ -623,7 +623,7 @@ create_popup_menu (GtkWidget *drawing_area) *** drawing area that has an OpenGL-capable visual. ***/ static GtkWidget * -create_window (GdkGLConfig *glconfig, fftw_real *field) +create_window (GdkGLConfig *glconfig, struct vis_data_arrays *vis_data) { GtkWidget *window; GtkWidget *hbox; @@ -678,7 +678,7 @@ create_window (GdkGLConfig *glconfig, fftw_real *field) g_signal_connect (G_OBJECT (drawing_area), "configure_event", G_CALLBACK (configure_event), NULL); g_signal_connect (G_OBJECT (drawing_area), "expose_event", - G_CALLBACK (expose_event), (gpointer)field); + G_CALLBACK (expose_event), (gpointer)vis_data); g_signal_connect (G_OBJECT (drawing_area), "unrealize", G_CALLBACK (unrealize), NULL); @@ -873,11 +873,10 @@ main (int argc, { GtkWidget *window; GdkGLConfig *glconfig; - fftw_real *field; + struct vis_data_arrays vis_data; /* Initialize the simulation */ - field = init_simulation(DIM); - fluids_init(DIM); + init_simulation(50, &vis_data); /* Initialize GTK. */ gtk_init (&argc, &argv); @@ -889,7 +888,7 @@ main (int argc, glconfig = configure_gl (); /* Create and show the application window. */ - window = create_window (glconfig, field); + window = create_window (glconfig, &vis_data); gtk_widget_show (window); gtk_main(); |