X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=6a9399260d853c9e3a0d74e984e85adb05130ee7;hb=a4bfff194cb2440cbab29c871a03130877cdad19;hp=c13268c2695ad0cfd18241a9c70324013e1bc342;hpb=759c8b323c9020bde9a1006db2029413cbc3f99f;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index c13268c..6a93992 100644
--- a/scene.c
+++ b/scene.c
@@ -529,7 +529,7 @@ drawFloor(void)
 
 static GLfloat lightColor[] = {1.0, 1.0, 1.0, 1.0}; /* green-tinted */
 static GLfloat lightPosition[4];
-static float lightAngle = 0.0, lightHeight = 20;
+static float lightAngle = 10.0, lightHeight = 20;
 
 
 /**
@@ -557,7 +557,7 @@ void display() {
 
     glPushMatrix();
       glDisable(GL_LIGHTING);
-      glColor3f(1.0, 1.0, 0.0);
+      glColor3f(1.0, 1.0, 1.0);
 
       /* Draw a yellow ball at the light source. */
       glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]);
@@ -571,6 +571,37 @@ void display() {
   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(
+     60.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,  999.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
@@ -579,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);
 
-    //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();
 }