#include "types.h"\r
#include "scene.h"\r
\r
-\r
/**\r
* Event hander for main menu events\r
* @param id ID of menu item selected\r
glViewport(0, 0, (GLsizei) w, (GLsizei) h);\r
glMatrixMode(GL_PROJECTION);\r
glLoadIdentity();\r
- if (w <= h) \r
+ gluPerspective(\r
+ 60.0, /* field of view in degree */\r
+ 1.0, /* aspect ratio */\r
+ nearClip, /* Z near */\r
+ farClip /* Z far */\r
+ );\r
+ /*if (w <= h)\r
glOrtho(near, far, near*(GLfloat)h/(GLfloat)w,\r
- far*(GLfloat)h/(GLfloat)w, near, far);\r
+ far*(GLfloat)h/(GLfloat)w, -100, 100);\r
else\r
glOrtho(near*(GLfloat)w/(GLfloat)h,\r
- far*(GLfloat)w/(GLfloat)h, near, far, near, far);\r
- glMatrixMode(GL_MODELVIEW); \r
+ far*(GLfloat)w/(GLfloat)h, near, far, nearClip, farClip);\r
+ glMatrixMode(GL_MODELVIEW); */\r
glLoadIdentity();\r
}\r
\r
\r
// Draw teapot for a test object\r
glPushMatrix();\r
- glTranslatef(0.0, 0.5, 0.0); // **NOTE: Teapot does not rest on surface\r
+ glTranslatef(0.0, 1.0, 0.0); // **NOTE: Teapot does not rest on surface\r
glColor3f(0.5, 0.5, 0.5);\r
glutSolidTeapot(1);\r
glPopMatrix();\r
glMatrixMode(GL_PROJECTION);\r
glLoadIdentity();\r
\r
- gluPerspective(\r
- 60.0, /* field of view in degree */\r
- 1.0, /* aspect ratio */\r
- near, /* Z near */\r
- far /* Z far */\r
- );\r
-\r
\r
glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);\r
glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);\r