(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index c68ae04..e2d17e6 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -460,16 +460,24 @@ void makeMenu() {
 \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(500 * 60 / height, (GLfloat)width / (GLfloat)height, 0.1, 1000.0);\r
-  glMatrixMode(GL_MODELVIEW);\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
@@ -483,6 +491,42 @@ void mouse(int btn, int state, int x, int y) {
   \r
 }\r
 \r
+static GLfloat floorVertices[4][3] = {\r
+  { -20.0, 0.0, 20.0 },\r
+  { 20.0, 0.0, 20.0 },\r
+  { 20.0, 0.0, -20.0 },\r
+  { -20.0, 0.0, -20.0 },\r
+};\r
+\r
+/* Draw a floor (possibly textured). */\r
+static void\r
+drawFloor(void)\r
+{\r
+  glDisable(GL_LIGHTING);\r
+\r
+  //if (useTexture) {\r
+  //  glEnable(GL_TEXTURE_2D);\r
+  //}\r
+\r
+  glBegin(GL_QUADS);\r
+    glTexCoord2f(0.0, 0.0);\r
+    glVertex3fv(floorVertices[0]);\r
+    glTexCoord2f(0.0, 16.0);\r
+    glVertex3fv(floorVertices[1]);\r
+    glTexCoord2f(16.0, 16.0);\r
+    glVertex3fv(floorVertices[2]);\r
+    glTexCoord2f(16.0, 0.0);\r
+    glVertex3fv(floorVertices[3]);\r
+  glEnd();\r
+\r
+  /*if (useTexture) {\r
+    glDisable(GL_TEXTURE_2D);\r
+  }*/\r
+\r
+  glEnable(GL_LIGHTING);\r
+}\r
+\r
+\r
 /**\r
  * Display function\r
  */\r
@@ -490,13 +534,39 @@ void display() {
    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,  0.0f);\r
+   glBegin(GL_QUADS);\r
+     glVertex3f( 0.0f,  1.0f, -1.0f);\r
+     glVertex3f( 0.0f,  1.0f,  1.0f);\r
+     glVertex3f( 0.0f, -1.0f,  1.0f);\r
+     glVertex3f( 0.0f, -1.0f, -1.0f);\r
+   glEnd();\r
+\r
 \r
+   glTranslatef( 0.0f, 0.0f, -5.0f); // Move into the Screen 10.0\r
    glutSolidTeapot(1);\r
 \r
+   /*glMatrixMode(GL_MODELVIEW);\r
+   glLoadIdentity();\r
+   gluLookAt(0.7f, 0.4f, 0.9f, -2.0f, -1.0f, -7.0f, 1.0f, 10.0f, 1.0f);\r
+\r
+\r
+   glMatrixMode(GL_PROJECTION);\r
+  glLoadIdentity();*/\r
+   drawFloor();\r
    glutSwapBuffers();\r
 }\r
 \r
+/**\r
+ * init function, sets OpenGL's starting state\r
+ */\r
+void init() {\r
+  glMatrixMode(GL_PROJECTION);\r
+  glLoadIdentity();\r
+  gluPerspective( 60, 1, 0.1, 1000.0);\r
+  glMatrixMode(GL_MODELVIEW);\r
+}\r
+\r
 /**\r
  * Main function\r
  * @param argc Number of arguments\r
@@ -522,11 +592,11 @@ int main(int argc, char **argv) {
     glutInitWindowSize(500, 500);\r
     glutCreateWindow("Scene Editor");\r
 \r
-    glShadeModel(GL_SMOOTH);                        // Enables Smooth Shading\r
-    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);                   // Black Background\r
-    glClearDepth(1.0f);                         // Depth Buffer Setup\r
-    glEnable(GL_DEPTH_TEST);                        // Enables Depth Testing\r
-    glDepthFunc(GL_LEQUAL);                         // The Type Of Depth Test To Do\r
+    glShadeModel(GL_SMOOTH); // Enables Smooth Shading\r
+    glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // Black Background\r
+    glClearDepth(1.0f); // Depth Buffer Setup\r
+    glEnable(GL_DEPTH_TEST); // Enables Depth Testing\r
+    glDepthFunc(GL_LEQUAL);  // the type\r
 \r
     glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);          // Really Nice Perspective Calculations\r
 \r
@@ -535,5 +605,8 @@ int main(int argc, char **argv) {
     glutMouseFunc(mouse);\r
 \r
     makeMenu();\r
+\r
+    init();\r
+\r
     glutMainLoop();\r
 }\r