(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 23f37ed..042d0db 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -570,18 +570,9 @@ void display() {
   //  lightPosition[3] = 1.0;\r
   //}\r
 \r
-    glPushMatrix();\r
-\r
-    /* Tell GL new light source position. */\r
+   glPushMatrix();\r
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);\r
 \r
-       /* Draw "bottom" of floor in blue. */\r
-    glFrontFace(GL_CW);  /* Switch face orientation. */\r
-    glColor4f(0.1, 0.1, 0.7, 1.0);\r
-    drawFloor();\r
-    glFrontFace(GL_CCW);\r
-\r
-        /* Draw "top" of floor.  Use blending to blend in reflection. */\r
     glEnable(GL_BLEND);\r
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);\r
     glColor4f(0.7, 0.0, 0.0, 0.3);\r
@@ -589,36 +580,22 @@ void display() {
     drawFloor();\r
     glDisable(GL_BLEND);\r
 \r
+    glutSolidTeapot(1);\r
+\r
         glPushMatrix();\r
     glDisable(GL_LIGHTING);\r
+    glColor3f(1.0, 1.0, 0.0);\r
 \r
      /* Draw a yellow ball at the light source. */\r
       glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]);\r
       glutSolidSphere(1.0, 5, 5);\r
 \r
-          glEnable(GL_LIGHTING);\r
+         glEnable(GL_LIGHTING);\r
     glPopMatrix();\r
 \r
-   drawFloor();\r
-   glutSwapBuffers();\r
-}\r
+  glPopMatrix();\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
-  gluPerspective( /* field of view in degree */ 40.0,\r
-  /* aspect ratio */ 1.0,\r
-    /* Z near */ 20.0, /* Z far */ 100.0);\r
-  glMatrixMode(GL_MODELVIEW);\r
-  gluLookAt(0.0, 8.0, 60.0,  /* eye is at (0,8,60) */\r
-    0.0, 8.0, 0.0,      /* center is at (0,8,0) */\r
-    0.0, 1.0, 0.);      /* up is in postivie Y direction */\r
-\r
-  glMatrixMode(GL_MODELVIEW);\r
+    glutSwapBuffers();\r
 }\r
 \r
 \r
@@ -643,15 +620,18 @@ int main(int argc, char **argv) {
 \r
     glutInit(&argc, argv);\r
 \r
-    glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);\r
+    //glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);\r
+\r
+  glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_STENCIL | GLUT_MULTISAMPLE);\r
+\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\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
@@ -661,18 +641,24 @@ int main(int argc, char **argv) {
 \r
     makeMenu();\r
 \r
-    init();\r
+    //init();\r
+\r
+\r
+  glEnable(GL_CULL_FACE);\r
+  glEnable(GL_DEPTH_TEST);\r
+  glEnable(GL_TEXTURE_2D);\r
+  glLineWidth(3.0);\r
 \r
-     glMatrixMode(GL_PROJECTION);\r
+glMatrixMode(GL_PROJECTION);\r
   gluPerspective( /* field of view in degree */ 40.0,\r
   /* aspect ratio */ 1.0,\r
     /* Z near */ 20.0, /* Z far */ 100.0);\r
   glMatrixMode(GL_MODELVIEW);\r
-  gluLookAt(0.0, 8.0, 60.0,  /* eye is at (0,8,60) */\r
+  gluLookAt(0.0, 8.0, 80.0,  /* eye is at (0,8,60) */\r
     0.0, 8.0, 0.0,      /* center is at (0,8,0) */\r
     0.0, 1.0, 0.);      /* up is in postivie Y direction */\r
 \r
-    glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1);\r
+  glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1);\r
   glLightfv(GL_LIGHT0, GL_DIFFUSE, lightColor);\r
   glLightf(GL_LIGHT0, GL_CONSTANT_ATTENUATION, 0.1);\r
   glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);\r