fix madness

6 files changed, 8 insertions, 28 deletions

diff --git a/Smoke/colormap.c b/Smoke/colormap.c
index e4a4901..5365183 100644
--- a/Smoke/colormap.c
+++ b/Smoke/colormap.c
@@ -184,13 +184,13 @@ struct color4f colormap_get_color(float value)
   return return_value;
 }
 
-void renderer_reset_scaling(void)
+void colormap_reset_scaling(void)
 {
   colormap_scale_min = 0.0f;
   colormap_scale_max = 1.0f;
 }
 
-void renderer_reset_clamping(void)
+void colormap_reset_clamping(void)
 {
   colormap_clamp_min = 0.0f;
   colormap_clamp_max = 1.0f;
diff --git a/Smoke/colormap.h b/Smoke/colormap.h
index 2b08fcc..6be6697 100644
--- a/Smoke/colormap.h
+++ b/Smoke/colormap.h
@@ -38,4 +38,7 @@ fftw_real *colormap_get_frame(void);
 

 struct color4f colormap_get_color(float value);

 

+void colormap_reset_scaling(void);

+void colormap_reset_clamping(void);

+

 #endif

diff --git a/Smoke/gtk_colormap.c b/Smoke/gtk_colormap.c
index 6a055eb..56ec810 100644
--- a/Smoke/gtk_colormap.c
+++ b/Smoke/gtk_colormap.c
@@ -39,13 +39,13 @@ static gboolean set_clamping(GtkToggleButton *button, gpointer data) {
 }
 
 static gboolean reset_scaling(GtkWidget *button, gpointer data) {
-  renderer_reset_scaling();
+  colormap_reset_scaling();
 
   return TRUE;
 }
 
 static gboolean reset_clamping(GtkWidget *button, gpointer data) {
-  renderer_reset_clamping();
+  colormap_reset_clamping();
 
   return TRUE;
 }
diff --git a/Smoke/gtk_divergence.c b/Smoke/gtk_divergence.c
index 80d57c0..07a306d 100644
--- a/Smoke/gtk_divergence.c
+++ b/Smoke/gtk_divergence.c
@@ -4,23 +4,6 @@
 #include "gtk_divergence.h"
 
 
-static gboolean select_colormap(GtkComboBox *combo, gpointer data)
-{
-  divergence_set_colormap(gtk_combo_box_get_active(combo));
-
-  return TRUE;
-}
-
-
-static gboolean select_num_colors(GtkRange *adjustment, gpointer data)
-{
-  divergence_set_num_colors((int)gtk_range_get_value(adjustment));
-
-  return TRUE;
-}
-
-
-
 GtkWidget *create_divergence_page(void)
 {
   /* in reality a page is really just a vbox filled with other widgets
diff --git a/Smoke/gtk_main.c b/Smoke/gtk_main.c
index 88a89b6..f006c62 100644
--- a/Smoke/gtk_main.c
+++ b/Smoke/gtk_main.c
@@ -8,6 +8,7 @@
 #include "gtk_main.h"
 #include "renderer_gl.h"
 #include "normals.h"
+#include "smoke.h"
 #include "colormap.h"
 #include "glyphs.h"
 #include "divergence.h"
@@ -32,13 +33,6 @@ static gboolean select_render_smoke(GtkWidget *button, gpointer data) {
 }
 
 
-static gboolean select_render_grid_smoke(GtkWidget *button, gpointer data) {
-  smoke_grid_set_render(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
-
-  return TRUE;
-}
-
-
 static gboolean select_render_glyphs(GtkWidget *button, gpointer data) {
   glyphs_set_render(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
 
diff --git a/Smoke/smoke.bin b/Smoke/smoke.bin
index 70aebaf..364abaa 100755
--- a/Smoke/smoke.bin
+++ b/Smoke/smoke.bin