X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=b85ed9f38fd862c8df463e501286d0b3f15e0811;hb=688788bca476f49c2a198755204816f105267a14;hp=f55aa88b8246275d8a424387eb5b2b9f4b053d95;hpb=eaad3682302d31737d06068bc6471511ee3cbe59;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index f55aa88..b85ed9f 100644
--- a/scene.c
+++ b/scene.c
@@ -1,9 +1,7 @@
-// compile this program using:
-//   gcc -O3 -Wall -std=c99 -o scene scene.c bitmap.c -lglut
-// Or, with cygwin:        (-mno-cygwin is only so the executable runs from windows)
-//   gcc -mno-cygwin -O3 -Wall -std=c99 -o scene scene.c bitmap.c -lglut32 -lglu32 -lopengl32
-// Or, use make via the supplied Makefile:     (For cygwin, install the package for make)
-//   make
+/**
+ * CITS2231 Graphics Scene Editor
+ * @author Ashley Tyndall (20915779)
+ */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -466,7 +464,24 @@ void makeMenu() {
  * @param h New height
  */
 void windowReshape(int w, int h) {
-
+  glViewport(0, 0, w, h);                    // Reset The Current Viewport
+  glMatrixMode(GL_PROJECTION);               // Select The Projection Matrix
+  glLoadIdentity();                          // Reset The Projection Matrix
+
+  // Calculate The Aspect Ratio Of The Window
+  gluPerspective(45.0f,45.0f,0.1f,100.0f);
+
+  glMatrixMode(GL_MODELVIEW);                // Select The Modelview Matrix
+  glLoadIdentity();                          // Reset The Modelview Matrix
+
+      /*glViewport(0, 0, w, h);
+    glMatrixMode(GL_PROJECTION); /* switch matrix mode
+    glLoadIdentity();
+    if (w <= h)
+      gluOrtho2D(-2.0, 2.0, -2.0 * (GLfloat) h / (GLfloat) w, 2.0 * (GLfloat) h / (GLfloat) w);
+    else
+      gluOrtho2D(-2.0 * (GLfloat) w / (GLfloat) h, 2.0 * (GLfloat) w / (GLfloat) h, -2.0, 2.0);
+    glMatrixMode(GL_MODELVIEW); /* return to modelview mode */
 }
 
 /**
@@ -485,7 +500,19 @@ void mouse(int btn, int state, int x, int y) {
  */
 void display() {
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-   glFlush();
+   glLoadIdentity();
+
+   glTranslatef(-1.5f, 0.0f, -6.0f);
+
+   glBegin(GL_QUADS);
+     glColor3f(1.0f,0.0f,0.0f);     // Set The Color To Red
+     glVertex3f(-1.0f, 1.0f, 0.0f); // Top left
+     glVertex3f( 1.0f, 1.0f, 0.0f); // Top Right
+     glVertex3f( 1.0f,-1.0f, 0.0f); // Bottom Right
+     glVertex3f(-1.0f,-1.0f, 0.0f); // Bottom Left
+   glEnd();
+
+   glutSwapBuffers();
 }
 
 /**
@@ -512,10 +539,18 @@ int main(int argc, char **argv) {
     glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);
     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
+
+    glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);          // Really Nice Perspective Calculations
+
     glutReshapeFunc(windowReshape);
     glutDisplayFunc(display);
     glutMouseFunc(mouse);
-    glEnable(GL_DEPTH_TEST); // Enable hidden surface removal
 
     makeMenu();
     glutMainLoop();