laatste wijzigingen streamtubes, lines, spheres, dingen

3 files changed, 10 insertions, 3 deletions

diff --git a/Smoke/Week 2.suo b/Smoke/Week 2.suo
index 2d2341b..96d77fb 100644
--- a/Smoke/Week 2.suo
+++ b/Smoke/Week 2.suo
diff --git a/Smoke/renderer_gl.c b/Smoke/renderer_gl.c
index 67ebc55..c519882 100644
--- a/Smoke/renderer_gl.c
+++ b/Smoke/renderer_gl.c
@@ -773,6 +773,13 @@ static void render_streamlines(void)
   gluQuadricOrientation(qobj, GLU_OUTSIDE);

 

   glLineWidth(2.5f);
+  
+  if (streamlines_get_alpha() < 1.0f) {
+    glEnable(GL_BLEND);
+  }
+  else {
+    glDisable(GL_BLEND);
+  }
 
   i = j = k = l = 0;
   DIM = fluids_get_dim();
@@ -816,14 +823,14 @@ static void render_streamlines(void)
         case STREAMLINES_SORT_TUBES:
           glPushMatrix();

             glTranslatef(p.x, p.y, j * cell_x);

-            gluCylinder(qobj, 8.0, 8.0, 16.0, 8, 8);

+            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, 10.0f, 8, 8);

+            gluSphere(qobj, 8.0f, 6, 6);

           glPopMatrix();
           break;
       }
diff --git a/Smoke/streamlines.c b/Smoke/streamlines.c
index 1edfe7d..e28be9f 100644
--- a/Smoke/streamlines.c
+++ b/Smoke/streamlines.c
@@ -15,7 +15,7 @@
 
 static int streamlines_render     = FALSE;
 static int streamlines_num_colors = PALETTE_MAXCOLORS;
-static int streamlines_colormap   = PALETTE_BLACKWHITE;
+static int streamlines_colormap   = PALETTE_RAINBOW;
 static int streamlines_dataset    = DATASET_RHO;
 static float streamlines_alpha    = 1.0f;
 static int streamlines_sort       = STREAMLINES_SORT_LINES;