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;
 }

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 @@
1	/* I seem to need this for glGenBuffers as per
2	http://www.gamedev.net/community/forums/topic.asp?topic_id=422358 */
3	#define GL_GLEXT_PROTOTYPES	1	#define GL_GLEXT_PROTOTYPES
4		2	#include "../view/exp004state0.h"
5	#include "exp004processhits.h"	3	#include "exp004processhits.h"
6	#include "selsave.h"	4	#include "selsave.h"
7	#include "../view/exp004state0.h"
8	#include <stdio.h>	5	#include <stdio.h>
9		6
10	/*	7	/*
@@ -19,20 +16,13 @@
19	void	16	void
20	exp004processhits (GLint hits, GLuint buffer[])	17	exp004processhits (GLint hits, GLuint buffer[])
21	{	18	{
22	printf ("Hits: %d\n", hits);
23
24	GLuint *hitlist = buffer;	19	GLuint *hitlist = buffer;
25		20
26	for (int i = 0; i < hits; i++)	21	for (int i = 0; i < hits; i++)
27	{	22	{
28	hitlist += 3;	23	hitlist += 3;
29		24
30	/*	25	/*
31	* Report the hit to the terminal.
32	*/
33	printf ("Hit %i: %s\n", i + 1, S.gi_data[*hitlist]);
34
35	/*
36	* Add the hits to the selection.	26	* Add the hits to the selection.
37	*/	27	*/
38	S.selection.set[*hitlist] = true;	28	S.selection.set[*hitlist] = true;
@@ -51,8 +41,6 @@ exp004processhits (GLint hits, GLuint buffer[])
51	glBufferData (GL_ARRAY_BUFFER,	41	glBufferData (GL_ARRAY_BUFFER,
52	sizeof (S.base_colors_data), S.base_colors_data,	42	sizeof (S.base_colors_data), S.base_colors_data,
53	GL_STATIC_DRAW);	43	GL_STATIC_DRAW);
54
55	printf ("\n");
56		44
57	return;	45	return;
58	}	46	}