(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 0590299..2f97ea1 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -1,9 +1,7 @@
-// compile this program using:\r
-//   gcc -O3 -Wall -std=c99 -o scene scene.c bitmap.c -lglut\r
-// Or, with cygwin:        (-mno-cygwin is only so the executable runs from windows)\r
-//   gcc -mno-cygwin -O3 -Wall -std=c99 -o scene scene.c bitmap.c -lglut32 -lglu32 -lopengl32\r
-// Or, use make via the supplied Makefile:     (For cygwin, install the package for make)\r
-//   make\r
+/**\r
+ * CITS2231 Graphics Scene Editor\r
+ * @author Ashley Tyndall (20915779)\r
+ */\r
 \r
 #include <stdlib.h>\r
 #include <stdio.h>\r
@@ -462,10 +460,16 @@ void makeMenu() {
 \r
 /**\r
  * Called when window is resized\r
- * @param w New width\r
- * @param h New height\r
+ * @param width New width\r
+ * @param height New height\r
  */\r
-void windowReshape(int w, int h) {\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
+  glMatrixMode(GL_PROJECTION);\r
+  glLoadIdentity();\r
+  gluPerspective( (60.0/500.0) * width, 1, 0.1, 1000.0);\r
+  glMatrixMode(GL_MODELVIEW);\r
 \r
 }\r
 \r
@@ -484,9 +488,14 @@ void mouse(int btn, int state, int x, int y) {
  * Display function\r
  */\r
 void display() {\r
-   // You probably want to change both of the following.\r
-   glClear(GL_COLOR_BUFFER_BIT);\r
-   glFlush();\r
+   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
+\r
+   glutSolidTeapot(1);\r
+\r
+   glutSwapBuffers();\r
 }\r
 \r
 /**\r
@@ -513,10 +522,18 @@ int main(int argc, char **argv) {
     glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);\r
     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
+\r
+    glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);          // Really Nice Perspective Calculations\r
+\r
     glutReshapeFunc(windowReshape);\r
     glutDisplayFunc(display);\r
     glutMouseFunc(mouse);\r
-    glEnable(GL_DEPTH_TEST); // Enable hidden surface removal\r
 \r
     makeMenu();\r
     glutMainLoop();\r