added grid

4 files changed, 36 insertions, 12 deletions

diff --git a/Smoke/gtk_main.c b/Smoke/gtk_main.c
index 2cfd221..679ba12 100644
--- a/Smoke/gtk_main.c
+++ b/Smoke/gtk_main.c
@@ -20,7 +20,7 @@
 
 
 static gboolean select_render_grid(GtkWidget *button, gpointer data) {
-  renderer_set_grid(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
+  renderer_set_render_grid(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
 
   return TRUE;
 }
@@ -156,7 +156,7 @@ GtkWidget *create_main_page(void)
 
     box = gtk_vbox_new(FALSE, 0);
         button = gtk_check_button_new_with_label("Draw Grid");
-        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), renderer_get_grid());
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), renderer_get_render_grid());
         g_signal_connect (G_OBJECT(button), "clicked", G_CALLBACK(select_render_grid), NULL);
         gtk_box_pack_start (GTK_BOX(box), button, TRUE, TRUE, 0);
         gtk_widget_show(button);
diff --git a/Smoke/renderer_gl.c b/Smoke/renderer_gl.c
index 73454eb..75c1514 100644
--- a/Smoke/renderer_gl.c
+++ b/Smoke/renderer_gl.c
@@ -55,7 +55,7 @@ float x_pos = DEFAULT_X_POS;
 float y_pos = DEFAULT_Y_POS;
 float z_pos = DEFAULT_ZOOM;
 
-static int renderer_grid = FALSE;
+static int renderer_render_grid = FALSE;
 
 static int renderer_zoomspeed = DEFAULT_ZOOM_SPEED;
 
@@ -149,6 +149,30 @@ static void render_legend(void)
 
 static void render_grid(void)
 {
+  int i, DIM;
+
+
+  DIM = fluids_get_dim();
+
+  glColor3f(0.0f, 0.0f, 0.5f);
+
+  for (i = 0; i < winWidth; i += DIM) {
+    if (i) {
+      glBegin(GL_LINES);
+        glVertex2i(i, 0);
+        glVertex2i(i, winWidth);
+      glEnd();
+    }
+  }
+
+  for (i = 0; i < winHeight; i += DIM) {
+    if (i) {
+      glBegin(GL_LINES);
+        glVertex2i(0, i);
+        glVertex2i(winHeight, i);
+      glEnd();
+    }
+  }
 }
 
 static void render_normal(void)
@@ -306,10 +330,10 @@ GLuint LoadTextures(char *filename)
 /*    fseek(bitmap, BITMAP_HEIGHT, SEEK_SET); */
     fread(&height, 4, 1, bitmap);
 
-    imagedata = (unsigned char *)malloc((filesize -dataoffset) /* *(char *) */);
+    imagedata = (unsigned char *)malloc((size_t)(filesize -dataoffset) /* *(char *) */);
 
     fseek(bitmap, dataoffset, SEEK_SET);
-    fread(imagedata, (filesize -dataoffset), 1, bitmap);
+    fread(imagedata, (size_t)(filesize -dataoffset), 1, bitmap);
 
     glGenTextures(1, &texture);
     glBindTexture(GL_TEXTURE_2D, texture);
@@ -830,14 +854,14 @@ void renderer_init_gl(void)
 }
 
 
-void renderer_set_grid(grid)
+void renderer_set_render_grid(int render_grid)
 {
-  renderer_grid = grid;
+  renderer_render_grid = render_grid;
 }
 
-int renderer_get_grid(void)
+int renderer_get_render_grid(void)
 {
-  return renderer_grid;
+  return renderer_render_grid;
 }
 
 void renderer_set_zoomspeed(int zoomspeed)
@@ -904,7 +928,7 @@ void visualize(struct vis_data_arrays *vis_data)
   
   glTranslatef(-winWidth/2, -winHeight/2, 0.0f);
 
-  if (render_grid) {
+  if (renderer_render_grid) {
     render_grid();
   }
 
diff --git a/Smoke/renderer_gl.h b/Smoke/renderer_gl.h
index 361ff79..09587d8 100644
--- a/Smoke/renderer_gl.h
+++ b/Smoke/renderer_gl.h
@@ -9,8 +9,8 @@ void visualize(struct vis_data_arrays *vis_data);
 void renderer_set_zoomspeed(int zoomspeed);
 int renderer_get_zoomspeed(void);
 
-void renderer_set_grid(int grid);
-int renderer_get_grid(void);
+void renderer_set_render_grid(int render_grid);
+int renderer_get_render_grid(void);
 
 void renderer_zoom_in(void);
 void renderer_zoom_out(void);
diff --git a/Smoke/smoke.bin b/Smoke/smoke.bin
index 92bbf72..84bc838 100755
--- a/Smoke/smoke.bin
+++ b/Smoke/smoke.bin