X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=2bf72a3c2682013c0238c32df5a3f37227df68cc;hp=f4eb9fd273ea0e3f9771fcc6f9fc0b852aabf398;hb=d238df40acc4f9075c327032e9b9749823dc9b34;hpb=5041a20ca38735795d392c4481096ebb17bdd42d diff --git a/scene.c b/scene.c index f4eb9fd..2bf72a3 100644 --- a/scene.c +++ b/scene.c @@ -129,7 +129,8 @@ void processTextureEvents(int id) { * @param id ID of ground texture selected */ void processGTextureEvents(int id) { - + currentGroundTexture = id; + glutPostRedisplay(); } /** @@ -169,7 +170,7 @@ void makeMenu() { //glutAddMenuEntry("Rotation/Texture Scale", M_ROTATION_TEXTURE_SCALE); //glutAddSubMenu("Material", materialMenu); //glutAddSubMenu("Texture", textureMenu); - //glutAddSubMenu("Ground texture", gTextureMenu); + glutAddSubMenu("Ground texture", gTextureMenu); //glutAddSubMenu("Lights", lightMenu); glutAddMenuEntry("Exit", M_EXIT); @@ -318,7 +319,7 @@ void display() { 75.0, aspect, 0.1, - 400 + 300 ); glMatrixMode(GL_MODELVIEW); @@ -417,7 +418,7 @@ void init() { glMaterialf(GL_FRONT, GL_SHININESS, shine); glEnable(GL_LIGHT0); - glEnable(GL_LIGHT1); + //glEnable(GL_LIGHT1); glEnable(GL_LIGHTING); } @@ -453,7 +454,7 @@ int main(int argc, char **argv) { glEnable(GL_DEPTH_TEST); // Enables Depth Testing glDepthFunc(GL_LEQUAL); // the type glEnable(GL_TEXTURE_2D); - glEnable(GL_CULL_FACE); + //glEnable(GL_CULL_FACE); glEnable(GL_NORMALIZE); glLineWidth(2.0);