Fix muppetry

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

1 files changed, 14 insertions, 12 deletions

diff --git a/src/displaywindow.h b/src/displaywindow.h
index f53e19f..fa49faf 100644
--- a/src/displaywindow.h
+++ b/src/displaywindow.h
@@ -24,7 +24,7 @@
 typedef struct dw_struct {
 
 	ControlContext	*ctx;
-
+	
 	GtkUIManager	*ui;
 	GtkActionGroup	*action_group;
 	GtkWidget	*window;
@@ -32,20 +32,12 @@ typedef struct dw_struct {
 	GtkWidget	*status_bar;
 	int 		view;
 	GtkWidget	*drawing_area;
-	
-	/* OpenGL stuff */
-	GLfloat		distance;
-	GLfloat		x_pos;
-	GLfloat		y_pos;
-	float		x_start;
-	float		y_start;
-	float		view_quat[4];
-	int		cube;
+	//int pad1;
+	/* Low-level OpenGL stuff */
 	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;
-	int		lines;
 	GLuint		gl_ref_normal_buffer;
 	GLfloat		*gl_ref_normal_array;
 	GLsizei		gl_ref_num_vertices;
@@ -59,7 +51,17 @@ typedef struct dw_struct {
 	GLfloat		*gl_gen_vertex_array;
 	GLfloat		*gl_gen_normal_array;
 	GLsizei		gl_gen_num_vertices;
-
+	
+	/* Display parameters */
+	GLfloat		distance;
+	GLfloat		x_pos;
+	GLfloat		y_pos;
+	float		view_quat[4];
+	int		cube;
+	int		lines;
+	float		x_start;
+	float		y_start;
+	
 } DisplayWindow;
 
 extern DisplayWindow *displaywindow_open(ControlContext *ctx);