-rw-r--r-- | r/connect.R | 2 | ||||
-rw-r--r-- | src/Makefile.am | 3 | ||||
-rw-r--r-- | src/controller/exp004reshape.c | 11 | ||||
-rw-r--r-- | src/model/density_legend_geometry.c | 81 | ||||
-rw-r--r-- | src/model/density_legend_geometry.h | 9 | ||||
-rw-r--r-- | src/model/display_list_index.h | 6 | ||||
-rw-r--r-- | src/model/exp004state.h | 14 | ||||
-rw-r--r-- | src/util/check_error.c | 6 | ||||
-rw-r--r-- | src/view/exp004geometry.c | 7 | ||||
-rw-r--r-- | src/view/exp004init.c | 8 | ||||
-rw-r--r-- | src/view/exp004view.c | 4 |
11 files changed, 124 insertions, 27 deletions
diff --git a/src/controller/exp004reshape.c b/src/controller/exp004reshape.c index 82f134d..891de08 100644 --- a/src/controller/exp004reshape.c +++ b/src/controller/exp004reshape.c | |||
@@ -1,6 +1,7 @@ | |||
1 | #include "exp004reshape.h" | 1 | #include "exp004reshape.h" |
2 | #include "set_ortho.h" | 2 | #include "set_ortho.h" |
3 | #include "../view/exp004state0.h" | 3 | #include "../view/exp004state0.h" |
4 | #include "../model/density_legend_geometry.h" | ||
4 | #include <GL/glut.h> | 5 | #include <GL/glut.h> |
5 | 6 | ||
6 | #define S exp004state0 | 7 | #define S exp004state0 |
@@ -22,13 +23,13 @@ exp004reshape (int w, int h) | |||
22 | { | 23 | { |
23 | S.ortho.min_x = S.ortho_min; | 24 | S.ortho.min_x = S.ortho_min; |
24 | S.ortho.max_x = S.ortho_max; | 25 | S.ortho.max_x = S.ortho_max; |
25 | S.ortho.min_y = S.ortho_min * (GLfloat) h / (GLfloat) w; | 26 | S.ortho.min_y = S.ortho_min * (double) h / (double) w; |
26 | S.ortho.max_y = S.ortho_max * (GLfloat) h / (GLfloat) w; | 27 | S.ortho.max_y = S.ortho_max * (double) h / (double) w; |
27 | } | 28 | } |
28 | else | 29 | else |
29 | { | 30 | { |
30 | S.ortho.min_x = S.ortho_min * (GLfloat) w / (GLfloat) h; | 31 | S.ortho.min_x = S.ortho_min * (double) w / (double) h; |
31 | S.ortho.max_x = S.ortho_max * (GLfloat) w / (GLfloat) h; | 32 | S.ortho.max_x = S.ortho_max * (double) w / (double) h; |
32 | S.ortho.min_y = S.ortho_min; | 33 | S.ortho.min_y = S.ortho_min; |
33 | S.ortho.max_y = S.ortho_max; | 34 | S.ortho.max_y = S.ortho_max; |
34 | } | 35 | } |
@@ -43,5 +44,7 @@ exp004reshape (int w, int h) | |||
43 | S.viewport.w = w; | 44 | S.viewport.w = w; |
44 | S.viewport.h = h; | 45 | S.viewport.h = h; |
45 | 46 | ||
47 | density_legend_geometry (); | ||
48 | |||
46 | return; | 49 | return; |
47 | } | 50 | } |