X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=e2d17e682e7f50682271248993f76fd788b7d48b;hb=36e1679e77db07de3b54b6054b118607112c360e;hp=c68ae0472268342af38414459175cc37f6669df0;hpb=ca2d5ce66ddb17a4e5b04e9f1a28f8a14240143e;p=atyndall%2Fcits2231.git

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