X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=0488bceb17f533a26441be127dead4286df13158;hb=acad09733179bca04aa9c2c74e6092b072d1ae43;hp=46feed95687f57a04caf7bc41609f15f680fcee9;hpb=cc8905b3046ee82dd92d40cbda048eb43ad5aa7e;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index 46feed9..0488bce 100644
--- a/scene.c
+++ b/scene.c
@@ -527,7 +527,7 @@ drawFloor(void)
 }
 
 
-static GLfloat lightColor[] = {0.8, 1.0, 0.8, 1.0}; /* green-tinted */
+static GLfloat lightColor[] = {1.0, 1.0, 1.0, 1.0}; /* green-tinted */
 static GLfloat lightPosition[4];
 static float lightAngle = 0.0, lightHeight = 20;
 
@@ -536,41 +536,16 @@ static float lightAngle = 0.0, lightHeight = 20;
  * Display function
  */
 void display() {
-   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();*/
-
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  glLoadIdentity();
 
-   /* Reposition the light source. */
+  /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
   lightPosition[1] = lightHeight;
   lightPosition[2] = 12*sin(lightAngle);
-  //if (directionalLight) {
-    lightPosition[3] = 0.0;
-  //} else {
-  //  lightPosition[3] = 1.0;
-  //}
+  lightPosition[3] = 0.0;
 
-   glPushMatrix();
+  glPushMatrix();
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
 
     glEnable(GL_BLEND);
@@ -578,23 +553,55 @@ void display() {
     drawFloor();
     glDisable(GL_BLEND);
 
-    glutSolidTeapot(1);
+    glutSolidTeapot(1); // Draw teapot for test
 
-        glPushMatrix();
-    glDisable(GL_LIGHTING);
+    glPushMatrix();
+      glDisable(GL_LIGHTING);
+      glColor3f(1.0, 1.0, 0.0);
 
-     /* Draw a yellow ball at the light source. */
+      /* Draw a yellow ball at the light source. */
       glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]);
       glutSolidSphere(1.0, 5, 5);
 
-         glEnable(GL_LIGHTING);
+      glEnable(GL_LIGHTING);
     glPopMatrix();
 
   glPopMatrix();
 
-    glutSwapBuffers();
+  glutSwapBuffers();
 }
 
+/**
+ * init function; sets initial OpenGL state
+ */
+void init() {
+  glEnable(GL_CULL_FACE);
+  glEnable(GL_DEPTH_TEST);
+  glEnable(GL_TEXTURE_2D);
+  glLineWidth(3.0);
+
+  glMatrixMode(GL_PROJECTION);
+  gluPerspective(
+     40.0,  /* field of view in degree */ 
+      1.0,  /* aspect ratio */ 
+      0.0,  /* Z near */
+    900.0   /* Z far */
+    );
+  
+  glMatrixMode(GL_MODELVIEW);
+  gluLookAt(
+    0.0, 8.0, 60.0,  /* eye is at (0,8,60) */
+    0.0, 8.0,  0.0,  /* center is at (0,8,0) */
+    0.0, 1.0,  0.0   /* up is in postivie Y direction */
+    );      
+
+  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);
+  glEnable(GL_LIGHTING);
+}
 
 /**
  * Main function
@@ -603,64 +610,39 @@ void display() {
  * @return Program exit code
  */
 int main(int argc, char **argv) {
+  if(argc>1)
+    strcpy(dataDir, argv[1]);
+  else if(opendir(dirDefault1))
+    strcpy(dataDir, dirDefault1);
+  else if(opendir(dirDefault2))
+    strcpy(dataDir, dirDefault2);
+  else fileErr(dirDefault1);
 
-    if(argc>1)
-	  strcpy(dataDir, argv[1]);
-    else if(opendir(dirDefault1))
-	  strcpy(dataDir, dirDefault1);
-    else if(opendir(dirDefault2))
-      strcpy(dataDir, dirDefault2);
-    else fileErr(dirDefault1);
+  for(int i=0; i<NMESH; i++) meshes[i]=NULL;
+  for(int i=0; i<NTEXTURE; i++) textures[i]=NULL;
 
-    for(int i=0; i<NMESH; i++) meshes[i]=NULL;
-    for(int i=0; i<NTEXTURE; i++) textures[i]=NULL;
+  glutInit(&argc, argv);
 
-    glutInit(&argc, argv);
+  glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);
 
-    //glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);
+  glutInitWindowSize(500, 500);
+  glutCreateWindow("Scene Editor");
 
-  glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_STENCIL | GLUT_MULTISAMPLE);
+  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
 
-    glutInitWindowSize(500, 500);
-    glutCreateWindow("Scene Editor");
+  glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);          // Really Nice Perspective Calculations
 
-    //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
+  glutReshapeFunc(windowReshape);
+  glutDisplayFunc(display);
+  glutMouseFunc(mouse);
 
-   // glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);          // Really Nice Perspective Calculations
+  makeMenu();
 
-    glutReshapeFunc(windowReshape);
-    glutDisplayFunc(display);
-    glutMouseFunc(mouse);
-
-    makeMenu();
-
-    //init();
-
-
-  glEnable(GL_CULL_FACE);
-  glEnable(GL_DEPTH_TEST);
-  glEnable(GL_TEXTURE_2D);
-  glLineWidth(3.0);
-
-glMatrixMode(GL_PROJECTION);
-  gluPerspective( /* field of view in degree */ 40.0,
-  /* aspect ratio */ 1.0,
-    /* Z near */ 20.0, /* Z far */ 100.0);
-  glMatrixMode(GL_MODELVIEW);
-  gluLookAt(0.0, 8.0, 60.0,  /* eye is at (0,8,60) */
-    0.0, 8.0, 0.0,      /* center is at (0,8,0) */
-    0.0, 1.0, 0.);      /* up is in postivie Y direction */
-
-  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);
-  glEnable(GL_LIGHTING);
+  init();
 
-    glutMainLoop();
+  glutMainLoop();
 }