Tidy-up

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

1 files changed, 39 insertions, 34 deletions

diff --git a/src/displaywindow.h b/src/displaywindow.h
index ab9298b..555cb5b 100644
--- a/src/displaywindow.h
+++ b/src/displaywindow.h
@@ -21,47 +21,52 @@
 
 #include "control.h"
 
+typedef enum {
+	DW_ORTHO,
+	DW_PERSPECTIVE
+} DisplayWindowView;
+
 typedef struct dw_struct {
 
-	ControlContext	*ctx;
+	ControlContext		*ctx;
 	
-	GtkUIManager	*ui;
-	GtkActionGroup	*action_group;
-	GtkWidget	*window;
-	GtkWidget	*bigvbox;
-	GtkWidget	*status_bar;
-	int 		view;
-	GtkWidget	*drawing_area;
-	GtkWidget	*savecache_window;
+	GtkUIManager		*ui;
+	GtkActionGroup		*action_group;
+	GtkWidget		*window;
+	GtkWidget		*bigvbox;
+	GtkWidget		*status_bar;
+	DisplayWindowView	view;
+	GtkWidget		*drawing_area;
+	GtkWidget		*savecache_window;
 	
 	/* 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;
-	GLuint		gl_ref_normal_buffer;
-	GLfloat		*gl_ref_normal_array;
-	GLsizei		gl_ref_num_vertices;
-	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;		/* Generated reflection stuff */
-	GLuint		gl_gen_normal_buffer;
-	GLfloat		*gl_gen_vertex_array;
-	GLfloat		*gl_gen_normal_array;
-	GLsizei		gl_gen_num_vertices;
+	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;
+	GLuint			gl_ref_normal_buffer;
+	GLfloat			*gl_ref_normal_array;
+	GLsizei			gl_ref_num_vertices;
+	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;		/* Generated reflection stuff */
+	GLuint			gl_gen_normal_buffer;
+	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;
+	GLfloat			distance;
+	GLfloat			x_pos;
+	GLfloat			y_pos;
+	float			view_quat[4];
+	int			cube;
+	int			lines;
+	float			x_start;
+	float			y_start;
 	
 } DisplayWindow;