replaced int type with float

16 files changed, 42 insertions, 35 deletions

diff --git a/Smoke/colormap.c b/Smoke/colormap.c
index b8097ee..565b815 100644
--- a/Smoke/colormap.c
+++ b/Smoke/colormap.c
@@ -6,7 +6,7 @@
 #include <math.h>
 
 
-#include <fftw.h>
+#include <rfftw.h>
 
 #include "funcs.h"
 #include "palette.h"
@@ -18,7 +18,7 @@ static int colormap_colormap = PALETTE_BLACKWHITE;
 
 static int colormap_num_colors = PALETTE_MAXCOLORS;
 
-static int colormap_alpha = 1.0f;
+static float colormap_alpha = 1.0f;
 
 static int colormap_scaling = FALSE;
 
@@ -55,12 +55,12 @@ int colormap_get_colormap(void)
   return colormap_colormap;
 }
 
-void colormap_set_alpha(int alpha)
+void colormap_set_alpha(float alpha)
 {
   colormap_alpha = alpha;
 }
 
-int colormap_get_alpha(void)
+float colormap_get_alpha(void)
 {
   return colormap_alpha;
 }
diff --git a/Smoke/colormap.h b/Smoke/colormap.h
index cd9df14..ef6de52 100644
--- a/Smoke/colormap.h
+++ b/Smoke/colormap.h
@@ -7,8 +7,8 @@ int colormap_get_num_colors(void);
 void colormap_set_colormap(int colormap);

 int colormap_get_colormap(void);

 

-void colormap_set_alpha(int alpha);

-int colormap_get_alpha(void);

+void colormap_set_alpha(float alpha);

+float colormap_get_alpha(void);

 

 void colormap_set_scaling(int scaling);

 int colormap_get_scaling(void);

diff --git a/Smoke/divergence.c b/Smoke/divergence.c
index 516aa8d..39162cb 100644
--- a/Smoke/divergence.c
+++ b/Smoke/divergence.c
@@ -18,7 +18,7 @@ static int divergence_num_colors = PALETTE_MAXCOLORS;
 
 static int divergence_colormap = PALETTE_BLACKWHITE;
 
-static int divergence_alpha = 1.0f;
+static float divergence_alpha = 1.0f;
 
 static fftw_real *divergence_frame;
 
@@ -54,12 +54,12 @@ int divergence_get_colormap(void)
   return divergence_colormap;
 }
 
-void divergence_set_alpha(int alpha)
+void divergence_set_alpha(float alpha)
 {
   divergence_alpha = alpha;
 }
 
-int divergence_get_alpha(void)
+float divergence_get_alpha(void)
 {
   return divergence_alpha;
 }
diff --git a/Smoke/divergence.h b/Smoke/divergence.h
index 383fc54..4d7c199 100644
--- a/Smoke/divergence.h
+++ b/Smoke/divergence.h
@@ -10,8 +10,8 @@ int divergence_get_num_colors(void);
 void divergence_set_colormap(int colormap);
 int divergence_get_colormap(void);
 
-void divergence_set_alpha(int alpha);
-int divergence_get_alpha(void);
+void divergence_set_alpha(float alpha);
+float divergence_get_alpha(void);
 
 void divergence_set_frame(fftw_real *frame);
 fftw_real *divergence_get_frame(void);
diff --git a/Smoke/flowvis.c b/Smoke/flowvis.c
index b6d5c77..151d80b 100644
--- a/Smoke/flowvis.c
+++ b/Smoke/flowvis.c
@@ -18,7 +18,7 @@ static int flowvis_num_colors = PALETTE_MAXCOLORS;
 
 static int flowvis_colormap = PALETTE_BLACKWHITE;
 
-static int flowvis_alpha = 1.0f;
+static float flowvis_alpha = 1.0f;
 
 static fftw_real *flowvis_frame;
 
@@ -53,12 +53,12 @@ int flowvis_get_colormap(void)
   return flowvis_colormap;
 }
 
-void flowvis_set_alpha(int alpha)
+void flowvis_set_alpha(float alpha)
 {
   flowvis_alpha = alpha;
 }
 
-int flowvis_get_alpha(void)
+float flowvis_get_alpha(void)
 {
   return flowvis_alpha;
 }
diff --git a/Smoke/flowvis.h b/Smoke/flowvis.h
index 204904a..3f46856 100644
--- a/Smoke/flowvis.h
+++ b/Smoke/flowvis.h
@@ -10,8 +10,8 @@ int flowvi_get_num_colors(void);
 void flowvi_set_colormap(int colormap);
 int flowvi_get_colormap(void);
 
-void flowvis_set_alpha(int alpha);
-int flowvis_get_alpha(void);
+void flowvis_set_alpha(float alpha);
+float flowvis_get_alpha(void);
 
 void flowvis_set_frame(fftw_real *frame);
 fftw_real *flowvis_get_frame(void);
diff --git a/Smoke/glyphs.c b/Smoke/glyphs.c
index 2480a8a..792c776 100644
--- a/Smoke/glyphs.c
+++ b/Smoke/glyphs.c
@@ -18,7 +18,7 @@ static int glyphs_num_colors = PALETTE_MAXCOLORS;
 

 static int glyphs_colormap = PALETTE_BLACKWHITE;

 

-static int glyphs_alpha = 1.0f;

+static float glyphs_alpha = 1.0f;

 

 static fftw_real *glyphs_frame;

 

@@ -53,12 +53,12 @@ int glyphs_get_colormap(void)
   return glyphs_colormap;

 }

 

-void glyphs_set_alpha(int alpha)

+void glyphs_set_alpha(float alpha)

 {

   glyphs_alpha = alpha;

 }

 

-int glyphs_get_alpha(void)

+float glyphs_get_alpha(void)

 {

   return glyphs_alpha;

 }

diff --git a/Smoke/glyphs.h b/Smoke/glyphs.h
index 74436a0..4f080f2 100644
--- a/Smoke/glyphs.h
+++ b/Smoke/glyphs.h
@@ -10,8 +10,8 @@ int glyphs_get_num_colors(void);
 void glyphs_set_map(int colormap);

 int glyphs_get_map(void);

 

-void glyphs_set_alpha(int alpha);

-int glyphs_get_alpha(void);

+void glyphs_set_alpha(float alpha);

+float glyphs_get_alpha(void);

 

 void glyphs_set_frame(fftw_real *frame);

 fftw_real *glyphs_get_frame(void);

diff --git a/Smoke/gtk_colormap.c b/Smoke/gtk_colormap.c
index 5a1894d..1e60dd1 100644
--- a/Smoke/gtk_colormap.c
+++ b/Smoke/gtk_colormap.c
@@ -1,6 +1,8 @@
 #include <gtk/gtk.h>
 
 
+#include <rfftw.h>
+
 #include "palette.h"
 #include "colormap.h"
 
diff --git a/Smoke/heightplots.c b/Smoke/heightplots.c
index 57fee1d..c4546df 100644
--- a/Smoke/heightplots.c
+++ b/Smoke/heightplots.c
@@ -18,7 +18,7 @@ static int heightplots_num_colors = PALETTE_MAXCOLORS;
 
 static int heightplots_colormap = PALETTE_BLACKWHITE;
 
-static int heightplots_alpha = 1.0f;
+static float heightplots_alpha = 1.0f;
 
 static fftw_real *heightplots_frame;
 
@@ -53,7 +53,12 @@ int heightplots_get_colormap(void)
   return heightplots_colormap;
 }
 
-int heightplots_get_alpha(void)
+void heightplots_set_alpha(float alpha)
+{
+  heightplots_alpha = alpha;
+}
+
+float heightplots_get_alpha(void)
 {
   return heightplots_alpha;
 }
diff --git a/Smoke/heightplots.h b/Smoke/heightplots.h
index 36a625a..856a701 100644
--- a/Smoke/heightplots.h
+++ b/Smoke/heightplots.h
@@ -10,8 +10,8 @@ int heightplots_get_num_colors(void);
 void heightplots_set_colormap(int colormap);
 int heightplots_get_colormap(void);
 
-void heightplots_set_alpha(int alpha);
-int heightplots_get_alpha(void);
+void heightplots_set_alpha(float alpha);
+float heightplots_get_alpha(void);
 
 void heightplots_set_frame(fftw_real *frame);
 fftw_real *heightplots_get_frame(void);
diff --git a/Smoke/isolines.c b/Smoke/isolines.c
index d2f3530..f29345b 100644
--- a/Smoke/isolines.c
+++ b/Smoke/isolines.c
@@ -18,7 +18,7 @@ static int isolines_num_colors = PALETTE_MAXCOLORS;
 
 static int isolines_colormap = PALETTE_BLACKWHITE;
 
-static int isolines_alpha = 1.0f;
+static float isolines_alpha = 1.0f;
 
 static fftw_real *isolines_frame;
 
@@ -53,12 +53,12 @@ int isolines_get_colormap(void)
   return isolines_colormap;
 }
 
-void isolines_set_alpha(int alpha)
+void isolines_set_alpha(float alpha)
 {
   isolines_alpha = alpha;
 }
 
-int isolines_get_alpha(void)
+float isolines_get_alpha(void)
 {
   return isolines_alpha;
 }
diff --git a/Smoke/isolines.h b/Smoke/isolines.h
index c22e047..830f4f1 100644
--- a/Smoke/isolines.h
+++ b/Smoke/isolines.h
@@ -10,8 +10,8 @@ int isolines_get_num_colors(void);
 void isolines_set_colormap(int colormap);
 int isolines_get_colormap(void);
 
-void isolines_set_alpha(int alpha);
-int isolines_get_alpha(void);
+void isolines_set_alpha(float alpha);
+float isolines_get_alpha(void);
 
 void isolines_set_frame(fftw_real *frame);
 fftw_real *isolines_get_frame(void);
diff --git a/Smoke/smoke.bin b/Smoke/smoke.bin
index a277367..c9d646e 100755
--- a/Smoke/smoke.bin
+++ b/Smoke/smoke.bin
diff --git a/Smoke/streamlines.c b/Smoke/streamlines.c
index 2d3072b..9be9c38 100644
--- a/Smoke/streamlines.c
+++ b/Smoke/streamlines.c
@@ -18,7 +18,7 @@ static int streamlines_num_colors = PALETTE_MAXCOLORS;
 
 static int streamlines_colormap = PALETTE_BLACKWHITE;
 
-static int streamlines_alpha = 1.0f;
+static float streamlines_alpha = 1.0f;
 
 static fftw_real *streamlines_frame;
 
@@ -53,12 +53,12 @@ int streamlines_get_colormap(void)
   return streamlines_colormap;
 }
 
-void streamlines_set_alpha(int alpha)
+void streamlines_set_alpha(float alpha)
 {
   streamlines_alpha = alpha;
 }
 
-int streamlines_get_alpha(void)
+float streamlines_get_alpha(void)
 {
   return streamlines_alpha;
 }
diff --git a/Smoke/streamlines.h b/Smoke/streamlines.h
index fe06222..166e6e6 100644
--- a/Smoke/streamlines.h
+++ b/Smoke/streamlines.h
@@ -10,8 +10,8 @@ int streamlines_get_num_colors(void);
 void streamlines_set_colormap(int colormap);
 int streamlines_get_colormap(void);
 
-void streamlines_set_alpha(int alpha);
-int streamlines_get_alpha(void);
+void streamlines_set_alpha(float alpha);
+float streamlines_get_alpha(void);
 
 void streamlines_set_frame(fftw_real *frame);
 fftw_real *streamlines_get_frame(void);