(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 2746652..8ce005b 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -182,19 +182,19 @@ void makeMenu() {
  * @param w New width\r
  * @param h New height\r
  */\r
-void windowReshape(int w, int h) {\r
+/*void windowReshape(int w, int h) {\r
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);\r
   glMatrixMode(GL_PROJECTION);\r
   glLoadIdentity();\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
 /**\r
  * Called when mouse event occurs\r
@@ -226,6 +226,30 @@ void mouse(int button, int state, int x, int y) {
   }\r
 }\r
 \r
+void keyboard(unsigned char key, int x1, int y1) {\r
+  switch(key) {\r
+    case 'w':\r
+      z = z - 1;\r
+      break;\r
+    case 'a':\r
+      x = x - 1;\r
+      break;\r
+    case 's':\r
+      z = z + 1;\r
+      break;\r
+    case 'd':\r
+      x = x + 1;\r
+      break;\r
+    case 'q':\r
+      y = y + 1;\r
+      break;\r
+    case 'e':\r
+      y = y - 1;\r
+      break;\r
+  }\r
+  printf("Camera is now at (%f, %f, %f)\n", x, y, z);\r
+}\r
+\r
 /**\r
  * Called when motion event occurs\r
  * @param x Mouse x position\r
@@ -260,7 +284,8 @@ void display() {
     0.0, 1.0,  0.0   /* up is in postivie Y direction */\r
     );\r
 \r
-\r
+  glTranslatef(x, y, z);\r
+  \r
   // **NOTE: Currently this rotation function is all that moves the camera off\r
   //         the flat surface. Need to integrate function into gluLookAt\r
   glRotatef(30.0, 1.0, 0.0, 0.0);\r
@@ -285,7 +310,7 @@ void display() {
     \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
@@ -311,14 +336,16 @@ void init() {
   glMatrixMode(GL_PROJECTION);\r
   glLoadIdentity();\r
 \r
-  gluPerspective(\r
+   gluPerspective(\r
     60.0,  /* field of view in degree */\r
      1.0,  /* aspect ratio */\r
-    near,  /* Z near */\r
-     far   /* Z far */\r
+    nearClip,  /* Z near */\r
+     farClip   /* Z far */\r
     );\r
-\r
   \r
+  glMatrixMode(GL_MODELVIEW);\r
+  glLoadIdentity();\r
+\r
   glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);\r
   glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);\r
   glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);\r
@@ -333,8 +360,6 @@ void init() {
 \r
   \r
 \r
-  glMatrixMode(GL_MODELVIEW);\r
-  glLoadIdentity();\r
 }\r
 \r
 /**\r
@@ -373,9 +398,10 @@ int main(int argc, char **argv) {
 \r
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);\r
 \r
-  glutReshapeFunc(windowReshape);\r
+  //glutReshapeFunc(windowReshape);\r
   glutDisplayFunc(display);\r
   glutMouseFunc(mouse);\r
+  glutKeyboardFunc(keyboard);\r
   glutMotionFunc(motion);\r
 \r
   makeMenu();\r