From 844b6a08114ee206964fa9387ba1acc98af23bc2 Mon Sep 17 00:00:00 2001 From: Oliver Schinagl Date: Fri, 11 Jan 2008 02:35:48 +0000 Subject: remove fucking \r and replaced 16 with height multi --- Smoke/renderer_gl.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Smoke/renderer_gl.c b/Smoke/renderer_gl.c index c519882..a6ab0c8 100644 --- a/Smoke/renderer_gl.c +++ b/Smoke/renderer_gl.c @@ -294,7 +294,7 @@ static void render_normals(void) idx = (j * DIM) + i; px = wn + (fftw_real)i * wn; py = hn + (fftw_real)(j + 1) * hn; - pz = height[idx] * 16; + pz = height[idx] * height_multiplier; glVertex3f(px, py, pz); glVertex3f(px +(normal[idx].x * NORMAL_SCALE), @@ -764,14 +764,14 @@ static void render_streamlines(void) struct point p; struct fftw_real_xy *frame_history; fftw_real cell_x, cell_y; - float scale = 10.0f; - GLUquadricObj *qobj = gluNewQuadric(); - struct color4f color; - - gluQuadricDrawStyle(qobj, GLU_FILL); - gluQuadricNormals(qobj, GLU_FLAT); - gluQuadricOrientation(qobj, GLU_OUTSIDE); - + float scale = 10.0f; + GLUquadricObj *qobj = gluNewQuadric(); + struct color4f color; + + gluQuadricDrawStyle(qobj, GLU_FILL); + gluQuadricNormals(qobj, GLU_FLAT); + gluQuadricOrientation(qobj, GLU_OUTSIDE); + glLineWidth(2.5f); if (streamlines_get_alpha() < 1.0f) { @@ -821,16 +821,16 @@ static void render_streamlines(void) break; case STREAMLINES_SORT_TUBES: - glPushMatrix(); - glTranslatef(p.x, p.y, j * cell_x); - gluCylinder(qobj, 8.0, 8.0, 16.0, 6, 6); + glPushMatrix(); + glTranslatef(p.x, p.y, j * cell_x); + gluCylinder(qobj, 8.0, 8.0, 16.0, 6, 6); glPopMatrix(); break; case STREAMLINES_SORT_SPHERES: - glPushMatrix(); - glTranslatef(p.x, p.y, j * cell_x); - gluSphere(qobj, 8.0f, 6, 6); + glPushMatrix(); + glTranslatef(p.x, p.y, j * cell_x); + gluSphere(qobj, 8.0f, 6, 6); glPopMatrix(); break; } -- cgit v0.12