glyphs and history now use 'new' structure.

1 files changed, 32 insertions, 29 deletions

diff --git a/Smoke/glyphs.h b/Smoke/glyphs.h
index 200d603..c2eb616 100644
--- a/Smoke/glyphs.h
+++ b/Smoke/glyphs.h
@@ -1,35 +1,38 @@
-#ifndef _GLYPHS_H

+#ifndef _GLYPHS_H
 #define _GLYPHS_H
 
 #define GLYPH_LINES        0
 #define GLYPH_TRIANGLES    1
 #define GLYPH_CONES        2
 #define GLYPH_ARROWS       3
-#define GLYPH_QUAKE        4

-

-void glyphs_set_render(int render_glyphs);

-int glyphs_get_render(void);

-

-void glyphs_set_num_colors(int num_colors);

-int glyphs_get_num_colors(void);

-

-void glyphs_set_colormap(int colormap);

-int glyphs_get_colormap(void);

-

-void glyphs_set_alpha(float alpha);

-float glyphs_get_alpha(void);

-

-void glyphs_set_dataset_color(int dataset);

-int glyphs_get_dataset_color(void);

-

-void glyphs_set_dataset_direction(int dataset);

-int glyphs_get_dataset_direction(void);

-

-void glyphs_set_sort(int sort);

-int glyphs_get_sort(void);

-

-void glyphs_set_frame(fftw_real *frame);

-fftw_real *glyphs_get_frame(void);

-

-struct color4f glyphs_get_color(float value);

-#endif

+#define GLYPH_QUAKE        4
+
+void glyphs_set_render(int render_glyphs);
+int glyphs_get_render(void);
+
+void glyphs_set_num_colors(int num_colors);
+int glyphs_get_num_colors(void);
+
+void glyphs_set_colormap(int colormap);
+int glyphs_get_colormap(void);
+
+void glyphs_set_alpha(float alpha);
+float glyphs_get_alpha(void);
+
+void glyphs_set_dataset_color(int dataset);
+int glyphs_get_dataset_color(void);
+
+void glyphs_set_dataset_direction(int dataset);
+int glyphs_get_dataset_direction(void);
+
+void glyphs_set_sort(int sort);
+int glyphs_get_sort(void);
+
+void glyphs_set_frame_color(fftw_real *frame);
+fftw_real *glyphs_get_frame_color(void);
+
+void glyphs_set_frames_direction(struct fftw_real_xy_p frame);
+struct fftw_real_xy_p glyphs_get_frames_direction(void);
+
+struct color4f glyphs_get_color(float value);
+#endif