diff options
author | Oliver Schinagl <oliver@schinagl.nl> | 2008-01-08 15:45:18 (GMT) |
---|---|---|
committer | Oliver Schinagl <oliver@schinagl.nl> | 2008-01-08 15:45:18 (GMT) |
commit | effb3d7b3c795d3e59ebba01e97cff42bbc0ea86 (patch) | |
tree | 3a5a786095284840d887fb431c7b439b0946b7ee /Smoke/renderer_gl.c | |
parent | beaed58ebc3108ecbbeac72d52a11fe3707748c8 (diff) | |
download | 2iv35-effb3d7b3c795d3e59ebba01e97cff42bbc0ea86.zip 2iv35-effb3d7b3c795d3e59ebba01e97cff42bbc0ea86.tar.gz 2iv35-effb3d7b3c795d3e59ebba01e97cff42bbc0ea86.tar.bz2 |
added grid
Diffstat (limited to 'Smoke/renderer_gl.c')
-rw-r--r-- | Smoke/renderer_gl.c | 40 |
1 files changed, 32 insertions, 8 deletions
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(); } |