X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=f3c4d2c8e0388c9e9dd562310be07de9ad104b6c;hp=78ac064e9e2188f93f4e0f59ced12139865c1b0c;hb=55097a45c4add91cd839f9d86d2255f2de5a9ab0;hpb=80eec6fadf0959fc87376028a8fd0ab9c5b8cb89

diff --git a/scene.c b/scene.c
index 78ac064..f3c4d2c 100644
--- a/scene.c
+++ b/scene.c
@@ -124,7 +124,7 @@ GLfloat angle2 = 30;   /* in degrees */
 
 /* Near and far parameters */
 GLfloat near = -10;
-GLfloat far = 50;
+GLfloat far = 10;
 
 /* Zoom factor for mouse movements */
 GLfloat zoomFactor = 1.0;
@@ -137,9 +137,10 @@ int floorSize = 100;
 
 /* Light 0 parameters */
 GLfloat diffuse0[] = {1.0, 1.0, 1.0, 1.0};
-GLfloat ambient0[] = {1.0, 1.0, 1.0, 1.0};
+GLfloat ambient0[] = {0.0, 0.0, 0.0, 1.0};
 GLfloat specular0[] = {1.0, 1.0, 1.0, 1.0};
-GLfloat light0_pos[] ={ 1.0, 2.0, 3,0, 1.0};
+GLfloat emission0[] = {0.0, 0.0, 0.0, 1.0};
+GLfloat light0_pos[] ={ 1.0, 1.0, 0,0, 1.0};
 
 
 /**
@@ -611,14 +612,15 @@ void drawFloor() {
  * Draw x, z axis on floor
  */
 void drawLine() {
+    // **NOTE: fix function
     glDisable(GL_TEXTURE_2D);
     glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    glColor4ub( 0.0, 0.0, 0.0, 0.0 );
+    glColor4ub( 0.0, 0.0, 0.0, 0.5 );
 
     glBegin(GL_LINES);
-    glVertex3i( 10.0, 0, 0.0);
-    glVertex3i( -10.0, 0, 0.0);
+    glVertex3i( 10.0, 0.1, 10.0);
+    glVertex3i( -10.0, 0.1, -10.0);
     glEnd();
 
     glDisable(GL_BLEND);
@@ -637,6 +639,7 @@ void display() {
     0.0, 1.0,  0.0   /* up is in postivie Y direction */
     );
 
+
   // **NOTE: Currently this rotation function is all that moves the camera off
   //         the flat surface. Need to integrate function into gluLookAt
   glRotatef(30.0, 1.0, 0.0, 0.0);
@@ -698,6 +701,11 @@ void init() {
   glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);
   glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);
   glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);
+  glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE );
+  glMaterialfv( GL_FRONT_AND_BACK, GL_SPECULAR, specular0);
+  glMaterialfv( GL_FRONT_AND_BACK, GL_EMISSION, emission0);
+  glEnable(GL_COLOR_MATERIAL);
+
   glEnable(GL_LIGHTING);
 
   glMatrixMode(GL_MODELVIEW);