X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=3e0f34f5c2a708ad83b160c018af88a76d414f48;hb=023daaaaab63ad4475c5839c7218407903815958;hp=0590299f13fa14a160edcf60e973aa4c3aaf43e1;hpb=e65f41b7c98c848b5a30486d69dd474bb9463715;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index 0590299..3e0f34f 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,20 @@ void makeMenu() {
  * @param h New 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();
+  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();
 }
 
 /**
@@ -484,9 +495,39 @@ void mouse(int btn, int state, int x, int y) {
  * Display function
  */
 void display() {
-   // You probably want to change both of the following.
-   glClear(GL_COLOR_BUFFER_BIT);
-   glFlush();
+   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+   glLoadIdentity();
+
+   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();
+   glutSwapBuffers();
+}
+
+/**
+ * init function, sets OpenGL's starting state
+ */
+void init() {
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
+  gluPerspective( 60, 1, 0.1, 1000.0);
+  glMatrixMode(GL_MODELVIEW);
 }
 
 /**
@@ -513,11 +554,22 @@ 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
+
+    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();
+
+    init();
+
     glutMainLoop();
 }