(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 60fde81..914f3a6 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -123,8 +123,8 @@ GLfloat angle = -150;   /* in degrees */
 GLfloat angle2 = 30;   /* in degrees */\r
 \r
 /* Near and far parameters */\r
-GLfloat near = -10;\r
-GLfloat far = 50;\r
+GLfloat near = -100;\r
+GLfloat far = 100;\r
 \r
 /* Zoom factor for mouse movements */\r
 GLfloat zoomFactor = 1.0;\r
@@ -137,9 +137,11 @@ int floorSize = 100;
 \r
 /* Light 0 parameters */\r
 GLfloat diffuse0[] = {1.0, 1.0, 1.0, 1.0};\r
-GLfloat ambient0[] = {1.0, 1.0, 1.0, 1.0};\r
+GLfloat ambient0[] = {0.0, 0.0, 0.0, 1.0};\r
 GLfloat specular0[] = {1.0, 1.0, 1.0, 1.0};\r
-GLfloat light0_pos[] ={ 1.0, 2.0, 3,0, 1.0};\r
+GLfloat emission0[] = {0.0, 0.0, 0.0, 0.0};\r
+GLfloat light0_pos[] ={1.0, 1.0, 0,0, 1.0};\r
+GLfloat glightmodel[] = {0.2,0.2,0.2,1};\r
 \r
 \r
 /**\r
@@ -498,7 +500,7 @@ void makeMenu() {
  */\r
 void windowReshape(int w, int h) {\r
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);\r
-  glMatrixMode(GL_PROJECTION);\r
+  /*glMatrixMode(GL_PROJECTION);\r
   glLoadIdentity();\r
   if (w <= h) \r
     glOrtho(near, far, near*(GLfloat)h/(GLfloat)w,\r
@@ -507,7 +509,7 @@ void windowReshape(int w, int h) {
     glOrtho(near*(GLfloat)w/(GLfloat)h,\r
              far*(GLfloat)w/(GLfloat)h, near, far, near, far);\r
    glMatrixMode(GL_MODELVIEW); \r
-   glLoadIdentity();\r
+   glLoadIdentity();*/\r
 }\r
 \r
 /**\r
@@ -611,14 +613,15 @@ void drawFloor() {
  * Draw x, z axis on floor\r
  */\r
 void drawLine() {\r
+    // **NOTE: fix function\r
     glDisable(GL_TEXTURE_2D);\r
     glEnable(GL_BLEND);\r
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);\r
-    glColor4ub( 0.0, 0.0, 0.0, 0.0 );\r
+    glColor4ub( 0.0, 0.0, 0.0, 0.5 );\r
 \r
     glBegin(GL_LINES);\r
-    glVertex3i( 10.0, 0, 0.0);\r
-    glVertex3i( -10.0, 0, 0.0);\r
+    glVertex3i( 10.0, 0.1, 10.0);\r
+    glVertex3i( -10.0, 0.1, -10.0);\r
     glEnd();\r
 \r
     glDisable(GL_BLEND);\r
@@ -632,11 +635,12 @@ void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\r
   glLoadIdentity();\r
   gluLookAt(\r
-    0.0, 0.0, 10.0,  /* eye is at (x,y,z) */\r
+    0.0, 10.0, 10.0,  /* eye is at (x,y,z) */\r
     0.0, 0.0,  0.0,  /* center is at (x,y,z) */\r
     0.0, 1.0,  0.0   /* up is in postivie Y direction */\r
     );\r
 \r
+\r
   // **NOTE: Currently this rotation function is all that moves the camera off\r
   //         the flat surface. Need to integrate function into gluLookAt\r
   glRotatef(30.0, 1.0, 0.0, 0.0);\r
@@ -657,11 +661,13 @@ void display() {
 \r
     drawFloor();\r
 \r
-\r
+    drawLine();\r
+    \r
     // Draw teapot for a test object\r
     glPushMatrix();\r
-      glTranslatef(0.0, 1.0, 0.0); // **NOTE: Teapot does not rest on surface\r
-      glutWireTeapot(1);\r
+      glTranslatef(0.0, 0.5, 0.0); // **NOTE: Teapot does not rest on surface\r
+      glColor3f(0.5, 0.5, 0.5);\r
+      glutSolidTeapot(1);\r
     glPopMatrix();\r
 \r
     // Draw a white ball over the light source\r
@@ -690,14 +696,22 @@ void init() {
      1.0,  /* aspect ratio */\r
     near,  /* Z near */\r
      far   /* Z far */\r
-    );    \r
+    );\r
 \r
-  glEnable(GL_LIGHT0);\r
+  \r
   glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);\r
   glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);\r
   glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);\r
   glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);\r
+  glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);\r
+  glEnable(GL_LIGHT0);\r
   glEnable(GL_LIGHTING);\r
+  glEnable(GL_COLOR_MATERIAL);\r
+  glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE );\r
+  glMaterialfv( GL_FRONT_AND_BACK, GL_SPECULAR, specular0);\r
+  glMaterialfv( GL_FRONT_AND_BACK, GL_EMISSION, emission0);\r
+\r
+  \r
 \r
   glMatrixMode(GL_MODELVIEW);\r
   glLoadIdentity();\r