Formatting.

This commit is contained in:
Camilla Berglund 2010-10-24 15:02:59 +02:00
parent 8f78d5df3a
commit dfe67935cf

View File

@ -12,7 +12,6 @@
int main(void) int main(void)
{ {
int width, height, x; int width, height, x;
double t;
GLFWwindow window; GLFWwindow window;
// Initialise GLFW // Initialise GLFW
@ -27,8 +26,6 @@ int main( void )
if (!window) if (!window)
{ {
fprintf(stderr, "Failed to open GLFW window\n"); fprintf(stderr, "Failed to open GLFW window\n");
glfwTerminate();
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -40,7 +37,7 @@ int main( void )
do do
{ {
t = glfwGetTime(); double t = glfwGetTime();
glfwGetMousePos(window, &x, NULL); glfwGetMousePos(window, &x, NULL);
// Get window size (may be different than the requested size) // Get window size (may be different than the requested size)
@ -52,31 +49,32 @@ int main( void )
glViewport(0, 0, width, height); glViewport(0, 0, width, height);
// Clear color buffer to black // Clear color buffer to black
glClearColor( 0.0f, 0.0f, 0.0f, 0.0f ); glClearColor(0.f, 0.f, 0.f, 0.f);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
// Select and setup the projection matrix // Select and setup the projection matrix
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
gluPerspective( 65.0f, (GLfloat)width/(GLfloat)height, 1.0f, 100.0f ); gluPerspective(65.0f, (GLfloat)width/(GLfloat)height, 1.f, 100.0f);
// Select and setup the modelview matrix // Select and setup the modelview matrix
glMatrixMode( GL_MODELVIEW ); glMatrixMode( GL_MODELVIEW );
glLoadIdentity(); glLoadIdentity();
gluLookAt( 0.0f, 1.0f, 0.0f, // Eye-position gluLookAt(0.f, 1.f, 0.f, // Eye-position
0.0f, 20.0f, 0.0f, // View-point 0.f, 20.f, 0.f, // View-point
0.0f, 0.0f, 1.0f ); // Up-vector 0.f, 0.f, 1.f); // Up-vector
// Draw a rotating colorful triangle // Draw a rotating colorful triangle
glTranslatef( 0.0f, 14.0f, 0.0f ); glTranslatef(0.f, 14.f, 0.f);
glRotatef( 0.3f*(GLfloat)x + (GLfloat)t*100.0f, 0.0f, 0.0f, 1.0f ); glRotatef(0.3f * (GLfloat) x + (GLfloat) t * 100.f, 0.f, 0.f, 1.f);
glBegin(GL_TRIANGLES); glBegin(GL_TRIANGLES);
glColor3f( 1.0f, 0.0f, 0.0f ); glColor3f(1.f, 0.f, 0.f);
glVertex3f( -5.0f, 0.0f, -4.0f ); glVertex3f(-5.f, 0.f, -4.f);
glColor3f( 0.0f, 1.0f, 0.0f ); glColor3f(0.f, 1.f, 0.f);
glVertex3f( 5.0f, 0.0f, -4.0f ); glVertex3f(5.f, 0.f, -4.f);
glColor3f( 0.0f, 0.0f, 1.0f ); glColor3f(0.f, 0.f, 1.f);
glVertex3f( 0.0f, 0.0f, 6.0f ); glVertex3f(0.f, 0.f, 6.f);
glEnd(); glEnd();
// Swap buffers // Swap buffers