summaryrefslogtreecommitdiffstats
Unidiff
-rw-r--r--src/Makefile.am14
-rw-r--r--src/controller/clear_selection.sqc2
-rw-r--r--src/controller/exp004processhits.c6
-rw-r--r--src/controller/exp004processhits.h2
-rw-r--r--src/controller/exp004reshape.c2
-rw-r--r--src/controller/selection_from_db.sqc2
-rw-r--r--src/model/exp004state.h3
-rw-r--r--src/model/geometry/density_legend_geometry.c (renamed from src/model/density_legend_geometry.c)4
-rw-r--r--src/model/geometry/density_legend_geometry.h (renamed from src/model/density_legend_geometry.h)0
-rw-r--r--src/model/geometry/map_geometry.c40
-rw-r--r--src/model/geometry/map_geometry.h (renamed from src/model/map_geometry.h)0
-rw-r--r--src/model/geometry/protein_geometry.c (renamed from src/model/protein_geometry.c)2
-rw-r--r--src/model/geometry/protein_geometry.h (renamed from src/model/protein_geometry.h)0
-rw-r--r--src/model/geometry/protein_selected_geometry.c30
-rw-r--r--src/model/geometry/protein_selected_geometry.h9
-rw-r--r--src/model/map_geometry.c27
-rw-r--r--src/model/selection_info_init.c2
-rw-r--r--src/view/exp004init.c8
18 files changed, 106 insertions, 47 deletions
diff --git a/src/controller/exp004processhits.c b/src/controller/exp004processhits.c
index 72daa2f..c9ae080 100644
--- a/src/controller/exp004processhits.c
+++ b/src/controller/exp004processhits.c
@@ -1,6 +1,6 @@
1#define GL_GLEXT_PROTOTYPES1#define GL_GLEXT_PROTOTYPES
2#include "../view/exp004state0.h"2#include "../view/exp004state0.h"
3#include "../model/map_geometry.h"3#include "../model/geometry/map_geometry.h"
4#include "exp004processhits.h"4#include "exp004processhits.h"
5#include "selsave.h"5#include "selsave.h"
66
@@ -14,7 +14,7 @@
14 * [Angel,2008,pp80-81].14 * [Angel,2008,pp80-81].
15 */15 */
16void16void
17exp004processhits (const GLint hits, const GLuint* hitlist)17exp004processhits (const GLint hits, const GLuint * hitlist)
18{18{
19 for (unsigned int i = 0; i < hits; i++)19 for (unsigned int i = 0; i < hits; i++)
20 {20 {
@@ -24,10 +24,12 @@ exp004processhits (const GLint hits, const GLuint* hitlist)
24 * Add the hits to the selection.24 * Add the hits to the selection.
25 */25 */
26 S.selection.set[*hitlist] = true;26 S.selection.set[*hitlist] = true;
27 /*
27 S.base_colors_data[*hitlist][0] = SELECT_COLOR_R;28 S.base_colors_data[*hitlist][0] = SELECT_COLOR_R;
28 S.base_colors_data[*hitlist][1] = SELECT_COLOR_G;29 S.base_colors_data[*hitlist][1] = SELECT_COLOR_G;
29 S.base_colors_data[*hitlist][2] = SELECT_COLOR_B;30 S.base_colors_data[*hitlist][2] = SELECT_COLOR_B;
30 S.base_colors_data[*hitlist][3] = SELECT_COLOR_A;31 S.base_colors_data[*hitlist][3] = SELECT_COLOR_A;
32 */
3133
32 hitlist++;34 hitlist++;
33 }35 }

Valid XHTML 1.0 Strict

Copyright © 2009 Don Pellegrino All Rights Reserved.