X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=e58ec7ef29622ca42e941d6db0c845ecfcac3500;hp=99506e0a5122d2e6bbfbe23156550cb9fc5d8690;hb=59df816437507b6f42f8b949324d3a0799c0f195;hpb=e0726f60384f9ee752dbb78307e13be9a6ca7cf8

diff --git a/scene.c b/scene.c
index 99506e0..e58ec7e 100644
--- a/scene.c
+++ b/scene.c
@@ -293,8 +293,15 @@ void motion(int x, int y) {
  */
 void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
 
+  //gluLookAt(
+  //  -30.0,  -30.0, -30.0,  /* eye is at (x,y,z) */
+  ///  0.0,  0.0,  0.0,  /* center is at (x,y,z) */
+  //  0.0,  1.0,   0.0   /* up is in postivie Y direction */
+  //  );
+
   /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
   lightPosition[1] = lightHeight;
@@ -340,9 +347,6 @@ void display() {
  * init function; sets initial OpenGL state
  */
 void init() {
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
-
   glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);
   glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);
   glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);
@@ -398,22 +402,6 @@ int main(int argc, char **argv) {
   glEnable(GL_TEXTURE_2D);
   glLineWidth(1.0);
 
-  // **NOTE: Currently the perspective and look-at code is static, for testing purposes
-  //glMatrixMode(GL_PROJECTION);
-  //gluPerspective(
-  //   40.0, /* field of view in degree */
-  //    1.0, /* aspect ratio */
-  //    1.0, /* Z near */ // **NOTE: Seems to be issue with near < 0 causing invisible everything
-   // 100.0  /* Z far */
-  //  );
-
-  glMatrixMode(GL_MODELVIEW);
-  gluLookAt(
-    0.0,  8.0, 30.0,  /* eye is at (x,y,z) */
-    0.0,  0.0,  0.0,  /* center is at (x,y,z) */
-    0.0,  1.0,   0.0   /* up is in postivie Y direction */
-    );
-
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 
   glutReshapeFunc(windowReshape);