Make "blobs" work properly

git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@105 bf6ca9ba-c028-0410-8290-897cf20841d1

1 files changed, 13 insertions, 15 deletions

diff --git a/src/control.h b/src/control.h
index 6fab72d..dbeda36 100644
--- a/src/control.h
+++ b/src/control.h
@@ -116,24 +116,22 @@ typedef struct cctx_struct {
 	GtkWidget		*combo_peaksearch;
 	GtkWidget		*checkbox_prealign;
 	GtkWidget		*checkbox_savecache;
-	GLuint			gl_list_id;
 
-	GLuint			gl_ref_vertex_buffer;
-	GLuint			gl_ref_element_buffer;
-//	GLfloat			*gl_ref_vertex_array;
-//	GLuint			*gl_ref_element_array;
+	/* OpenGL bits */
+	GLuint			gl_list_id;			/* Display list for "everything else" */
+	int			gl_use_buffers;			/* 0=use vertex arrays only, otherwise use VBOs */
+	GLuint			gl_ref_vertex_buffer;		/* "Measured reflection" stuff */
+	GLfloat			*gl_ref_vertex_array;
 	GLsizei			gl_ref_num_vertices;
-	
-	GLuint			gl_marker_vertex_buffer;
-	GLuint			gl_marker_element_buffer;
-//	GLfloat			*gl_marker_vertex_array;
-//	GLuint			*gl_marker_element_array;
+	GLuint			gl_marker_vertex_buffer;	/* Marker "reflection" stuff */
+	GLuint			gl_marker_normal_buffer;
+	GLfloat			*gl_marker_vertex_array;
+	GLfloat			*gl_marker_normal_array;
 	GLsizei			gl_marker_num_vertices;
-
-	GLuint			gl_gen_vertex_buffer;
-	GLuint			gl_gen_element_buffer;
-//	GLfloat			*gl_gen_vertex_array;
-//	GLuint			*gl_gen_element_array;
+	GLuint			gl_gen_vertex_buffer;		/* Generated reflection stuff */
+	GLuint			gl_gen_normal_buffer;
+	GLfloat			*gl_gen_vertex_array;
+	GLfloat			*gl_gen_normal_array;
 	GLsizei			gl_gen_num_vertices;
 
 } ControlContext;