More cleaning up, seperating modules etc

1 files changed, 46 insertions, 42 deletions

diff --git a/Smoke/streamlines.c b/Smoke/streamlines.c
index fb580fc..59f9b33 100644
--- a/Smoke/streamlines.c
+++ b/Smoke/streamlines.c
@@ -1,43 +1,47 @@
-// Includes

-

-#ifdef G_OS_WIN32

-#define WIN32_LEAN_AND_MEAN 1

-#include <windows.h>

-#endif

-

-#include "fluids.h"

-#include "streamlines.h"

-#include "seedpoint.h"

-#include "funcs.h"

-

-void render_streamlines(void)

-{

-  int i, j, k, l, idx;

-  float v;

-  struct point p;

-  int *frame_history;

-  fftw_real cell_x, cell_y;

-

-  i = j = k = l = 0;

-

-  for (i = 0; i < get_cur_seedpoint(); i++)

-  {

-    p = get_seedpoint(i);

-

-    while (j < DIM)

-    {

-      frame_history = frame_hist[j];

-

+// Includes
+
+#ifdef G_OS_WIN32
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#include <rfftw.h>
+#include <GL/gl.h>
+#include <GL/glu.h>
+
+#include "fluids.h"
+#include "streamlines.h"
+#include "seedpoint.h"
+#include "funcs.h"
+
+void render_streamlines(void)
+{
+  int i, j, k, l, idx;
+  float v;
+  struct point p;
+  int *frame_history;
+  fftw_real cell_x, cell_y;
+
+  i = j = k = l = 0;
+
+  for (i = 0; i < get_cur_seedpoint(); i++)
+  {
+    p = get_seedpoint(i);
+
+    while (j < DIM)
+    {
+      frame_history = frame_hist[j];
+
       cell_x = (fftw_real)winWidth  / (fftw_real)(DIM + 1); // Grid cell width
-	    cell_y = (fftw_real)winHeight / (fftw_real)(DIM + 1); // Grid cell heigh

-

-      cell_x = round(p.x / cell_x);

-      cell_y = round(p.y / cell_y);

-

-      idx = cell_x + (cell_y * DIM) + (j * DIM * DIM);

-      //v = frame_history[idx];

-

-      j++;

-    }

-  }

-}

+	    cell_y = (fftw_real)winHeight / (fftw_real)(DIM + 1); // Grid cell heigh
+
+      cell_x = round(p.x / cell_x);
+      cell_y = round(p.y / cell_y);
+
+      idx = cell_x + (cell_y * DIM) + (j * DIM * DIM);
+      //v = frame_history[idx];
+
+      j++;
+    }
+  }
+}