\r
/**\r
* Called when window is resized\r
- * @param width New width\r
- * @param height New height\r
+ * @param w New width\r
+ * @param h New height\r
*/\r
-void windowReshape(int width, int height) {\r
- /*glViewport(0, 0, (GLsizei)width, (GLsizei)height);\r
- printf("Width: %d, height: %d\n", width, height);\r
+void windowReshape(int w, int h) {\r
+ GLdouble near = -10.0;\r
+ GLdouble far = 10.0;\r
+\r
+ glViewport(0, 0, (GLsizei) w, (GLsizei) h);\r
glMatrixMode(GL_PROJECTION);\r
glLoadIdentity();\r
- gluPerspective( 60 * ((GLfloat)height/(GLfloat)width), (GLfloat)width/(GLfloat)height, 0.1, 1000.0);\r
- glMatrixMode(GL_MODELVIEW);\r
-\r
- GLdouble near = 0.1;\r
- GLdouble far = 1000.0;\r
- GLdouble a = (GLfloat)height/(GLfloat)width;\r
- GLdouble fov = 60;\r
- glFrustum( -a*near*tan(fov/2), a*near*tan(fov/2), -a*near*tan(fov/2), a*near*tan(fov/2), near, far )*/\r
+ if (w <= h) \r
+ glOrtho(near, far, near*(GLfloat)h/(GLfloat)w,\r
+ far*(GLfloat)h/(GLfloat)w, near, far);\r
+ else\r
+ glOrtho(near*(GLfloat)w/(GLfloat)h,\r
+ far*(GLfloat)w/(GLfloat)h, near, far, near, far);\r
+ glMatrixMode(GL_MODELVIEW); \r
+ glLoadIdentity();\r
}\r
\r
/**\r
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\r
glLoadIdentity();\r
\r
- glTranslatef(0.0f,0.0f,-10.0f); // Move into the Screen 10.0\r
+ glTranslatef(0.0f,0.0f,-5.0f); // Move into the Screen 10.0\r
\r
glutSolidTeapot(1);\r
\r
glutMouseFunc(mouse);\r
\r
makeMenu();\r
+\r
+ glMatrixMode(GL_PROJECTION);\r
+ glLoadIdentity();\r
+ gluPerspective( 60, 1, 0.1, 1000.0);\r
+ glMatrixMode(GL_MODELVIEW);\r
+\r
glutMainLoop();\r
}\r