Colour a*, b* and c* axes

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

1 files changed, 37 insertions, 8 deletions

diff --git a/src/glbits.c b/src/glbits.c
index 8a97925..cd9f51c 100644
--- a/src/glbits.c
+++ b/src/glbits.c
@@ -143,6 +143,7 @@ void glbits_prepare(DisplayWindow *dw) {
 
 	GLfloat bblue[] = { 0.0, 0.0, 1.0, 1.0 };
 	GLfloat blue[] = { 0.0, 0.0, 0.5, 1.0 };
+	GLfloat purple[] = { 0.7, 0.0, 1.0, 1.0 };
 	GLfloat red[] = { 1.0, 0.0, 0.0, 1.0 };
 	GLfloat green[] = { 0.0, 1.0, 0.0, 1.0 };
 	GLfloat yellow[] = { 1.0, 1.0, 0.0, 1.0 };
@@ -504,52 +505,80 @@ void glbits_prepare(DisplayWindow *dw) {
 	
 	/* Draw the reciprocal unit cell if one is available */
 	if ( ctx->cell && !dw->lines ) {
-		glBegin(GL_LINE_STRIP);
-			glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, red);
+	
+		glBegin(GL_LINES);
+			
 			glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, black);
 			glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, black);
 			glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 0.0);
 			glNormal3f(1.0, 0.0, 0.0);
+			
+			glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, red);
+			glVertex3f(0.0, 0.0, 0.0);
+			glVertex3f(ctx->cell->a.x/1e9, ctx->cell->a.y/1e9, ctx->cell->a.z/1e9);
+			
+			glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, green);
 			glVertex3f(0.0, 0.0, 0.0);
+			glVertex3f(ctx->cell->b.x/1e9, ctx->cell->b.y/1e9, ctx->cell->b.z/1e9);
+			
+			glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, bblue);
+			glVertex3f(0.0, 0.0, 0.0);
+			glVertex3f(ctx->cell->c.x/1e9, ctx->cell->c.y/1e9, ctx->cell->c.z/1e9);
+			
+			glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, purple);
 			glVertex3f(ctx->cell->a.x/1e9, ctx->cell->a.y/1e9, ctx->cell->a.z/1e9);
 			glVertex3f(ctx->cell->a.x/1e9 + ctx->cell->b.x/1e9,
 					ctx->cell->a.y/1e9 + ctx->cell->b.y/1e9,
 					ctx->cell->a.z/1e9 + ctx->cell->b.z/1e9);
+			
+			glVertex3f(ctx->cell->a.x/1e9 + ctx->cell->b.x/1e9,
+					ctx->cell->a.y/1e9 + ctx->cell->b.y/1e9,
+					ctx->cell->a.z/1e9 + ctx->cell->b.z/1e9);
 			glVertex3f(ctx->cell->b.x/1e9, ctx->cell->b.y/1e9, ctx->cell->b.z/1e9);
-			glVertex3f(0.0, 0.0, 0.0);
+			
 			glVertex3f(ctx->cell->c.x/1e9, ctx->cell->c.y/1e9, ctx->cell->c.z/1e9);
 			glVertex3f(ctx->cell->c.x/1e9 + ctx->cell->a.x/1e9,
 					ctx->cell->c.y/1e9 + ctx->cell->a.y/1e9,
 					ctx->cell->c.z/1e9 + ctx->cell->a.z/1e9);
+			
+			glVertex3f(ctx->cell->c.x/1e9 + ctx->cell->a.x/1e9,
+					ctx->cell->c.y/1e9 + ctx->cell->a.y/1e9,
+					ctx->cell->c.z/1e9 + ctx->cell->a.z/1e9);
+			glVertex3f(ctx->cell->c.x/1e9 + ctx->cell->a.x/1e9 + ctx->cell->b.x/1e9,
+					ctx->cell->c.y/1e9 + ctx->cell->a.y/1e9 + ctx->cell->b.y/1e9,
+					ctx->cell->c.z/1e9 + ctx->cell->a.z/1e9 + ctx->cell->b.z/1e9);
+			
 			glVertex3f(ctx->cell->c.x/1e9 + ctx->cell->a.x/1e9 + ctx->cell->b.x/1e9,
 					ctx->cell->c.y/1e9 + ctx->cell->a.y/1e9 + ctx->cell->b.y/1e9,
 					ctx->cell->c.z/1e9 + ctx->cell->a.z/1e9 + ctx->cell->b.z/1e9);
 			glVertex3f(ctx->cell->c.x/1e9 + ctx->cell->b.x/1e9,
 					ctx->cell->c.y/1e9 + ctx->cell->b.y/1e9,
 					ctx->cell->c.z/1e9 + ctx->cell->b.z/1e9);
-			glVertex3f(ctx->cell->c.x/1e9, ctx->cell->c.y/1e9, ctx->cell->c.z/1e9);
 			
 			glVertex3f(ctx->cell->c.x/1e9 + ctx->cell->b.x/1e9,
 					ctx->cell->c.y/1e9 + ctx->cell->b.y/1e9,
 					ctx->cell->c.z/1e9 + ctx->cell->b.z/1e9);
-			glVertex3f(ctx->cell->b.x/1e9, ctx->cell->b.y/1e9, ctx->cell->b.z/1e9);
+			glVertex3f(ctx->cell->c.x/1e9, ctx->cell->c.y/1e9, ctx->cell->c.z/1e9);
+			
 			glVertex3f(ctx->cell->c.x/1e9 + ctx->cell->b.x/1e9,
 					ctx->cell->c.y/1e9 + ctx->cell->b.y/1e9,
 					ctx->cell->c.z/1e9 + ctx->cell->b.z/1e9);
+			glVertex3f(ctx->cell->b.x/1e9, ctx->cell->b.y/1e9, ctx->cell->b.z/1e9);
+			
 			glVertex3f(ctx->cell->c.x/1e9 + ctx->cell->a.x/1e9 + ctx->cell->b.x/1e9,
 					ctx->cell->c.y/1e9 + ctx->cell->a.y/1e9 + ctx->cell->b.y/1e9,
 					ctx->cell->c.z/1e9 + ctx->cell->a.z/1e9 + ctx->cell->b.z/1e9);
 			glVertex3f(ctx->cell->a.x/1e9 + ctx->cell->b.x/1e9,
 					ctx->cell->a.y/1e9 + ctx->cell->b.y/1e9,
 					ctx->cell->a.z/1e9 + ctx->cell->b.z/1e9);
-			glVertex3f(ctx->cell->c.x/1e9 + ctx->cell->a.x/1e9 + ctx->cell->b.x/1e9,
-					ctx->cell->c.y/1e9 + ctx->cell->a.y/1e9 + ctx->cell->b.y/1e9,
-					ctx->cell->c.z/1e9 + ctx->cell->a.z/1e9 + ctx->cell->b.z/1e9);
+			
 			glVertex3f(ctx->cell->c.x/1e9 + ctx->cell->a.x/1e9,
 					ctx->cell->c.y/1e9 + ctx->cell->a.y/1e9,
 					ctx->cell->c.z/1e9 + ctx->cell->a.z/1e9);
 			glVertex3f(ctx->cell->a.x/1e9, ctx->cell->a.y/1e9, ctx->cell->a.z/1e9);
+						
 		glEnd();
+		
 	}
 
 	/* Tilt axis */