summaryrefslogtreecommitdiffstats
Side-by-side diff
-rw-r--r--Makefile.am10
-rw-r--r--r/connect.R16
-rw-r--r--src/controller/exp004mouse.c51
-rw-r--r--src/controller/exp004processhits.c16
-rw-r--r--src/controller/exp004reshape.c26
-rw-r--r--src/controller/keyboard.c2
-rw-r--r--src/controller/selection_from_db.sqc9
-rw-r--r--src/controller/selsave.sqc4
-rw-r--r--src/controller/set_ortho.c11
-rw-r--r--src/controller/vis_sel_set.h3
-rw-r--r--src/model/coordinates.h3
-rw-r--r--src/model/exp004base.sqc30
-rw-r--r--src/model/exp004state.h30
-rw-r--r--src/model/selection_info.h11
-rw-r--r--src/model/selection_info_init.c2
-rw-r--r--src/model/selection_info_init.h2
-rw-r--r--src/model/selection_purposes.h22
-rw-r--r--src/model/zoom_info.h5
-rw-r--r--src/model/zoom_info_init.c2
-rw-r--r--src/model/zoom_info_init.h2
-rw-r--r--src/util/pick_convert.c7
-rw-r--r--src/util/sqlinfoprint.c2
-rw-r--r--src/util/sqlinfoprint.h7
-rw-r--r--src/view/exp004geometry.c6
-rw-r--r--src/view/exp004view.c7
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;
}

Valid XHTML 1.0 Strict

Copyright © 2009 Don Pellegrino All Rights Reserved.