-rw-r--r-- | Makefile.am | 10 | ||||
-rw-r--r-- | r/connect.R | 16 | ||||
-rw-r--r-- | src/controller/exp004mouse.c | 51 | ||||
-rw-r--r-- | src/controller/exp004processhits.c | 16 | ||||
-rw-r--r-- | src/controller/exp004reshape.c | 26 | ||||
-rw-r--r-- | src/controller/keyboard.c | 2 | ||||
-rw-r--r-- | src/controller/selection_from_db.sqc | 9 | ||||
-rw-r--r-- | src/controller/selsave.sqc | 4 | ||||
-rw-r--r-- | src/controller/set_ortho.c | 11 | ||||
-rw-r--r-- | src/controller/vis_sel_set.h | 3 | ||||
-rw-r--r-- | src/model/coordinates.h | 3 | ||||
-rw-r--r-- | src/model/exp004base.sqc | 30 | ||||
-rw-r--r-- | src/model/exp004state.h | 30 | ||||
-rw-r--r-- | src/model/selection_info.h | 11 | ||||
-rw-r--r-- | src/model/selection_info_init.c | 2 | ||||
-rw-r--r-- | src/model/selection_info_init.h | 2 | ||||
-rw-r--r-- | src/model/selection_purposes.h | 22 | ||||
-rw-r--r-- | src/model/zoom_info.h | 5 | ||||
-rw-r--r-- | src/model/zoom_info_init.c | 2 | ||||
-rw-r--r-- | src/model/zoom_info_init.h | 2 | ||||
-rw-r--r-- | src/util/pick_convert.c | 7 | ||||
-rw-r--r-- | src/util/sqlinfoprint.c | 2 | ||||
-rw-r--r-- | src/util/sqlinfoprint.h | 7 | ||||
-rw-r--r-- | src/view/exp004geometry.c | 6 | ||||
-rw-r--r-- | src/view/exp004view.c | 7 |
25 files changed, 140 insertions, 146 deletions
diff --git a/src/controller/exp004processhits.c b/src/controller/exp004processhits.c index 84f8b8d..264bd46 100644 --- a/src/controller/exp004processhits.c +++ b/src/controller/exp004processhits.c @@ -1,10 +1,7 @@ -/* I seem to need this for glGenBuffers as per - http://www.gamedev.net/community/forums/topic.asp?topic_id=422358 */ #define GL_GLEXT_PROTOTYPES - +#include "../view/exp004state0.h" #include "exp004processhits.h" #include "selsave.h" -#include "../view/exp004state0.h" #include <stdio.h> /* @@ -19,20 +16,13 @@ void exp004processhits (GLint hits, GLuint buffer[]) { - printf ("Hits: %d\n", hits); - GLuint *hitlist = buffer; - + for (int i = 0; i < hits; i++) { hitlist += 3; /* - * Report the hit to the terminal. - */ - printf ("Hit %i: %s\n", i + 1, S.gi_data[*hitlist]); - - /* * Add the hits to the selection. */ S.selection.set[*hitlist] = true; @@ -51,8 +41,6 @@ exp004processhits (GLint hits, GLuint buffer[]) glBufferData (GL_ARRAY_BUFFER, sizeof (S.base_colors_data), S.base_colors_data, GL_STATIC_DRAW); - - printf ("\n"); return; } |