X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=c6ef084cdaf2b73bbc9b41a99a6d22b777cdae81;hp=d37b0f052796558ac5ac682cbc5f4ffe29f9b8eb;hb=86cadef4c5a94d3eeecd3f18b70b6a2e1cae555e;hpb=9621f7294b73aa8f7d8e6ca9227810cb79be1c92

diff --git a/scene.c b/scene.c
index d37b0f0..c6ef084 100644
--- a/scene.c
+++ b/scene.c
@@ -129,6 +129,11 @@ static float lightAngle = 0.0, lightHeight = 5;
 GLfloat angle = -150;   /* in degrees */
 GLfloat angle2 = 30;   /* in degrees */
 
+GLfloat near = -10;
+GLfloat far = 10;
+
+static float zoomFactor = 1.0;
+
 /**
  * Prints out error message when file cannot be read
  * @param fileName Name of file that could not be read
@@ -484,18 +489,15 @@ void makeMenu() {
  * @param h New height
  */
 void windowReshape(int w, int h) {
-  GLdouble near = -100.0;
-  GLdouble far = 100.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);
+    glOrtho(zoomFactor*near, zoomFactor*far, zoomFactor*near*(GLfloat)h/(GLfloat)w,
+             zoomFactor*far*(GLfloat)h/(GLfloat)w, near, far);
   else
-    glOrtho(near*(GLfloat)w/(GLfloat)h,
-             far*(GLfloat)w/(GLfloat)h, near, far, near, far);
+    glOrtho(zoomFactor*near*(GLfloat)w/(GLfloat)h,
+             zoomFactor*far*(GLfloat)w/(GLfloat)h, zoomFactor*near, zoomFactor*far, near, far);
    glMatrixMode(GL_MODELVIEW); 
    glLoadIdentity();
 }
@@ -594,7 +596,7 @@ void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
  */
 void drawFloor() {
  
-drawSquare(0, -1000.0, -1000.0, 1000.0, 1000.0);
+drawSquare(0, -100.0, -100.0, 100.0, 100.0);
 
   /*if (useTexture) {
     glDisable(GL_TEXTURE_2D);
@@ -640,7 +642,7 @@ void display() {
 
     glPushMatrix();
     
-      //glTranslatef(0.0, 0.0, 0.0);
+      glTranslatef(0.0, 1.0, 0.0);
       glutWireTeapot(1); // Draw teapot for test
     glPopMatrix();
 
@@ -650,7 +652,7 @@ void display() {
 
       /* Draw a yellow ball at the light source. */
       glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]);
-      glutSolidSphere(1.0, 5, 5);
+      glutSolidSphere(1.0, 50, 50);
 
       glEnable(GL_LIGHTING);
     glPopMatrix();
@@ -670,15 +672,21 @@ void init() {
   gluPerspective(
        60.0,  /* field of view in degree */
         1.0,  /* aspect ratio */
-    -1000.0,  /* Z near */
-     1000.0   /* Z far */
+     near,  /* Z near */
+     far   /* Z far */
     );    
 
-  glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1);
-  glLightfv(GL_LIGHT0, GL_DIFFUSE, lightColor);
-  glLightf(GL_LIGHT0, GL_CONSTANT_ATTENUATION, 0.1);
-  glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);
-  glEnable(GL_LIGHT0);
+
+GLfloat diffuse0[] = {1.0, 1.0, 1.0, 1.0};
+GLfloat ambient0[] = {1.0, 1.0, 1.0, 1.0};
+GLfloat specular0[] = {1.0, 1.0, 1.0, 1.0};
+GLfloat light0_pos[] ={ 1.0, 2.0, 3,0, 1.0};
+
+glEnable(GL_LIGHT0);
+glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);
+glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);
+glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);
+glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);
   glEnable(GL_LIGHTING);
 
   glMatrixMode(GL_MODELVIEW);