| -rw-r--r-- | src/model/exp004base.sqc | 11 | ||||
| -rw-r--r-- | src/model/exp004state.h | 35 | ||||
| -rw-r--r-- | src/view/exp004init.c | 5 | ||||
| -rw-r--r-- | src/view/exp004view.c | 4 |
4 files changed, 18 insertions, 37 deletions
diff --git a/src/model/exp004state.h b/src/model/exp004state.h index e3106ec..11e9ebd 100644 --- a/src/model/exp004state.h +++ b/src/model/exp004state.h @@ -1,7 +1,8 @@ #ifndef EXP004STATE_H #define EXP004STATE_H -#include <stdbool.h> +#include "selection_info.h" +#include "zoom_info.h" /* * Buffer object identifiers. @@ -9,11 +10,6 @@ #define BASE_VERTICES 0 #define BASE_COLORS 1 -/* - * Vertices in the graph. - */ -#define ROWS 83905 - #define DEFAULT_COLOR_R 0.5 #define DEFAULT_COLOR_G 0.5 #define DEFAULT_COLOR_B 0.5 @@ -88,31 +84,10 @@ typedef struct */ float base_colors_data[ROWS][4]; - /* - * Selection list. - */ - bool selection[ROWS]; - - /* - * Indicate if the user is currently defining a selection. - */ - bool selecting; - - /* - * X coordinate of mouse when selection mode initiated. - */ - int select_x; - - /* - * Y coordinate of mouse when selection mode initiated. - */ - int select_y; - - /* - * Indicate if a selection should be used for a new set or a zoom region. - */ - bool zoom; + SELECTION_INFO selection; + ZOOM_INFO zoom; + } EXP004STATE; #endif // EXP004STATE_H |
