X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=progs%2Fdemos%2Fspaceball%2Fspaceball.c;h=52da93a7f43fd612589e918337027e834ad1ea73;hb=85fe5ac7b6efe580eab22820aa740a4b2dcafb0c;hp=ebdbc40f6872aa058baffb1b2fec0c6b602eb6bc;hpb=bb97ecab3add22cf774d3bb8bdb9d1be537cc524;p=freeglut

diff --git a/progs/demos/spaceball/spaceball.c b/progs/demos/spaceball/spaceball.c
index ebdbc40..52da93a 100644
--- a/progs/demos/spaceball/spaceball.c
+++ b/progs/demos/spaceball/spaceball.c
@@ -15,159 +15,163 @@
 #include <GL/freeglut.h>
 #include "vmath.h"
 
+#ifndef M_PI
+#define M_PI    3.14159265358979323846264338327950
+#endif
+
 void draw_cube(void);
 
 /* callbacks */
 void disp(void);
 void reshape(int x, int y);
 void keyb(unsigned char key, int x, int y);
-void sbmot(int x, int y, int z);	/* spaceball translation */
-void sbrot(int x, int y, int z);	/* spaceball rotation */
-void sbbut(int bn, int state);		/* spaceball button */
+void sbmot(int x, int y, int z);  /* spaceball translation */
+void sbrot(int x, int y, int z);  /* spaceball rotation */
+void sbbut(int bn, int state);    /* spaceball button */
 
 vec3_t pos = {0, 0, -6};
 quat_t rot = {0, 0, 0, 1};
 
 int main(int argc, char **argv)
 {
-	glutInit(&argc, argv);
-	glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE);
-	glutCreateWindow("spaceball demo");
+  glutInit(&argc, argv);
+  glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE);
+  glutCreateWindow("spaceball demo");
 
-	glutDisplayFunc(disp);
-	glutReshapeFunc(reshape);
-	glutKeyboardFunc(keyb);
-	glutSpaceballMotionFunc(sbmot);
-	glutSpaceballRotateFunc(sbrot);
-	glutSpaceballButtonFunc(sbbut);
+  glutDisplayFunc(disp);
+  glutReshapeFunc(reshape);
+  glutKeyboardFunc(keyb);
+  glutSpaceballMotionFunc(sbmot);
+  glutSpaceballRotateFunc(sbrot);
+  glutSpaceballButtonFunc(sbbut);
 
-	glEnable(GL_CULL_FACE);
+  glEnable(GL_CULL_FACE);
 
-	glutMainLoop();
-	return 0;
+  glutMainLoop();
+  return 0;
 }
 
 void disp(void)
 {
-	mat4_t xform;
+  mat4_t xform;
 
-	quat_to_mat(xform, rot);
+  quat_to_mat(xform, rot);
 
-	glClear(GL_COLOR_BUFFER_BIT);
+  glClear(GL_COLOR_BUFFER_BIT);
 
-	glMatrixMode(GL_MODELVIEW);
-	glLoadIdentity();
-	glTranslatef(pos.x, pos.y, pos.z);
-	glMultTransposeMatrixf((float*)xform);
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
+  glTranslatef(pos.x, pos.y, pos.z);
+  glMultMatrixf((float*)xform);
 
-	draw_cube();
+  draw_cube();
 
-	glutSwapBuffers();
+  glutSwapBuffers();
 }
 
 void draw_cube(void)
 {
-	glBegin(GL_QUADS);
-	/* face +Z */
-	glNormal3f(0, 0, 1);
-	glColor3f(1, 0, 0);
-	glVertex3f(-1, -1, 1);
-	glVertex3f(1, -1, 1);
-	glVertex3f(1, 1, 1);
-	glVertex3f(-1, 1, 1);
-	/* face +X */
-	glNormal3f(1, 0, 0);
-	glColor3f(0, 1, 0);
-	glVertex3f(1, -1, 1);
-	glVertex3f(1, -1, -1);
-	glVertex3f(1, 1, -1);
-	glVertex3f(1, 1, 1);
-	/* face -Z */
-	glNormal3f(0, 0, -1);
-	glColor3f(0, 0, 1);
-	glVertex3f(1, -1, -1);
-	glVertex3f(-1, -1, -1);
-	glVertex3f(-1, 1, -1);
-	glVertex3f(1, 1, -1);
-	/* face -X */
-	glNormal3f(-1, 0, 0);
-	glColor3f(1, 1, 0);
-	glVertex3f(-1, -1, -1);
-	glVertex3f(-1, -1, 1);
-	glVertex3f(-1, 1, 1);
-	glVertex3f(-1, 1, -1);
-	/* face +Y */
-	glNormal3f(0, 1, 0);
-	glColor3f(0, 1, 1);
-	glVertex3f(-1, 1, 1);
-	glVertex3f(1, 1, 1);
-	glVertex3f(1, 1, -1);
-	glVertex3f(-1, 1, -1);
-	/* face -Y */
-	glNormal3f(0, -1, 0);
-	glColor3f(1, 0, 1);
-	glVertex3f(-1, -1, -1);
-	glVertex3f(1, -1, -1);
-	glVertex3f(1, -1, 1);
-	glVertex3f(-1, -1, 1);
-	glEnd();
+  glBegin(GL_QUADS);
+  /* face +Z */
+  glNormal3f(0, 0, 1);
+  glColor3f(1, 0, 0);
+  glVertex3f(-1, -1, 1);
+  glVertex3f(1, -1, 1);
+  glVertex3f(1, 1, 1);
+  glVertex3f(-1, 1, 1);
+  /* face +X */
+  glNormal3f(1, 0, 0);
+  glColor3f(0, 1, 0);
+  glVertex3f(1, -1, 1);
+  glVertex3f(1, -1, -1);
+  glVertex3f(1, 1, -1);
+  glVertex3f(1, 1, 1);
+  /* face -Z */
+  glNormal3f(0, 0, -1);
+  glColor3f(0, 0, 1);
+  glVertex3f(1, -1, -1);
+  glVertex3f(-1, -1, -1);
+  glVertex3f(-1, 1, -1);
+  glVertex3f(1, 1, -1);
+  /* face -X */
+  glNormal3f(-1, 0, 0);
+  glColor3f(1, 1, 0);
+  glVertex3f(-1, -1, -1);
+  glVertex3f(-1, -1, 1);
+  glVertex3f(-1, 1, 1);
+  glVertex3f(-1, 1, -1);
+  /* face +Y */
+  glNormal3f(0, 1, 0);
+  glColor3f(0, 1, 1);
+  glVertex3f(-1, 1, 1);
+  glVertex3f(1, 1, 1);
+  glVertex3f(1, 1, -1);
+  glVertex3f(-1, 1, -1);
+  /* face -Y */
+  glNormal3f(0, -1, 0);
+  glColor3f(1, 0, 1);
+  glVertex3f(-1, -1, -1);
+  glVertex3f(1, -1, -1);
+  glVertex3f(1, -1, 1);
+  glVertex3f(-1, -1, 1);
+  glEnd();
 }
 
 /* 45deg fov */
-#define FOV		(M_PI / 4.0)
+#define FOV    (M_PI / 4.0)
 
 void reshape(int x, int y)
 {
-	float aspect = (float)x / (float)y;
-	float halfy = tan(FOV / 2.0);
-	float halfx = halfy * aspect;
+  float aspect = (float)x / (float)y;
+  float halfy = (float)tan(FOV / 2.0);
+  float halfx = halfy * aspect;
 
-	glViewport(0, 0, x, y);
+  glViewport(0, 0, x, y);
 
-	glMatrixMode(GL_PROJECTION);
-	glLoadIdentity();
-	glFrustum(-halfx, halfx, -halfy, halfy, 1.0, 1000.0);
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
+  glFrustum(-halfx, halfx, -halfy, halfy, 1.0, 1000.0);
 }
 
 void keyb(unsigned char key, int x, int y)
 {
-	switch(key) {
-	case 'q':
-	case 'Q':
-	case 27:
-		exit(0);
-
-	case ' ':
-		/* reset initial view */
-		pos = v3_cons(0, 0, -6);
-		rot = quat_cons(1, 0, 0, 0);
-		glutPostRedisplay();
-
-	default:
-		break;
-	}
+  switch(key) {
+  case 'q':
+  case 'Q':
+  case 27:
+    exit(0);
+
+  case ' ':
+    /* reset initial view */
+    pos = v3_cons(0, 0, -6);
+    rot = quat_cons(1, 0, 0, 0);
+    glutPostRedisplay();
+
+  default:
+    break;
+  }
 }
 
 void sbmot(int x, int y, int z)
 {
-	pos.x += x * 0.001;
-	pos.y += y * 0.001;
-	pos.z -= z * 0.001;
-	glutPostRedisplay();
+  pos.x += x * 0.001f;
+  pos.y += y * 0.001f;
+  pos.z -= z * 0.001f;
+  glutPostRedisplay();
 }
 
 void sbrot(int x, int y, int z)
 {
-	float axis_len = sqrt(x * x + y * y + z * z);
-	rot = quat_rotate(rot, axis_len * 0.001, -x / axis_len, -y / axis_len, z / axis_len);
-	glutPostRedisplay();
+  float axis_len = (float)sqrt(x * x + y * y + z * z);
+  rot = quat_rotate(rot, axis_len * 0.001f, -x / axis_len, -y / axis_len, z / axis_len);
+  glutPostRedisplay();
 }
 
 void sbbut(int bn, int state)
 {
-	if(state == GLUT_DOWN) {
-		pos = v3_cons(0, 0, -6);
-		rot = quat_cons(1, 0, 0, 0);
-		glutPostRedisplay();
-	}
+  if(state == GLUT_DOWN) {
+    pos = v3_cons(0, 0, -6);
+    rot = quat_cons(1, 0, 0, 0);
+    glutPostRedisplay();
+  }
 }