-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 @@ | |||
1 | #ifndef EXP004STATE_H | 1 | #ifndef EXP004STATE_H |
2 | #define EXP004STATE_H | 2 | #define EXP004STATE_H |
3 | 3 | ||
4 | #include <stdbool.h> | 4 | #include "selection_info.h" |
5 | #include "zoom_info.h" | ||
5 | 6 | ||
6 | /* | 7 | /* |
7 | * Buffer object identifiers. | 8 | * Buffer object identifiers. |
@@ -9,11 +10,6 @@ | |||
9 | #define BASE_VERTICES 0 | 10 | #define BASE_VERTICES 0 |
10 | #define BASE_COLORS 1 | 11 | #define BASE_COLORS 1 |
11 | 12 | ||
12 | /* | ||
13 | * Vertices in the graph. | ||
14 | */ | ||
15 | #define ROWS 83905 | ||
16 | |||
17 | #define DEFAULT_COLOR_R 0.5 | 13 | #define DEFAULT_COLOR_R 0.5 |
18 | #define DEFAULT_COLOR_G 0.5 | 14 | #define DEFAULT_COLOR_G 0.5 |
19 | #define DEFAULT_COLOR_B 0.5 | 15 | #define DEFAULT_COLOR_B 0.5 |
@@ -88,31 +84,10 @@ typedef struct | |||
88 | */ | 84 | */ |
89 | float base_colors_data[ROWS][4]; | 85 | float base_colors_data[ROWS][4]; |
90 | 86 | ||
91 | /* | 87 | SELECTION_INFO selection; |
92 | * Selection list. | ||
93 | */ | ||
94 | bool selection[ROWS]; | ||
95 | |||
96 | /* | ||
97 | * Indicate if the user is currently defining a selection. | ||
98 | */ | ||
99 | bool selecting; | ||
100 | |||
101 | /* | ||
102 | * X coordinate of mouse when selection mode initiated. | ||
103 | */ | ||
104 | int select_x; | ||
105 | |||
106 | /* | ||
107 | * Y coordinate of mouse when selection mode initiated. | ||
108 | */ | ||
109 | int select_y; | ||
110 | |||
111 | /* | ||
112 | * Indicate if a selection should be used for a new set or a zoom region. | ||
113 | */ | ||
114 | bool zoom; | ||
115 | 88 | ||
89 | ZOOM_INFO zoom; | ||
90 | |||
116 | } EXP004STATE; | 91 | } EXP004STATE; |
117 | 92 | ||
118 | #endif // EXP004STATE_H | 93 | #endif // EXP004STATE_H |