diff --git a/Graphics/Draw.cpp b/Graphics/Draw.cpp index b88f2157474cf1dd1dbfe4b8443f57c7a46e863f..7eef57c33aaad2b88ee94dc57e702c0b3f7b5c4c 100644 --- a/Graphics/Draw.cpp +++ b/Graphics/Draw.cpp @@ -1,4 +1,4 @@ -// $Id: Draw.cpp,v 1.24 2001-04-17 06:55:47 geuzaine Exp $ +// $Id: Draw.cpp,v 1.25 2001-08-06 16:47:57 geuzaine Exp $ #include "Gmsh.h" #include "GmshUI.h" @@ -137,22 +137,11 @@ void Orthogonalize(int x, int y){ void InitRenderModel(void) { int i; - float ambient[] = {0.5, 0.5, 0.5}; - float diffuse[] = {0.4, 0.4, 0.4}; float specular[4]; - if(CTX.post.smooth){//temporaire - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, ambient); - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, diffuse); - } - for(i = 0 ; i < 6 ; i++){ if(CTX.light[i]){ glLightfv((GLenum)(GL_LIGHT0 + i), GL_POSITION, CTX.light_position[i]); - if(CTX.post.smooth){//temporaire - glLightfv((GLenum)(GL_LIGHT0 + i), GL_AMBIENT, ambient); - glLightfv((GLenum)(GL_LIGHT0 + i), GL_DIFFUSE, diffuse); - } glEnable((GLenum)(GL_LIGHT0 + i)); } } diff --git a/Graphics/Entity.cpp b/Graphics/Entity.cpp index 81372d92ccfc94938ee1ee811f6b8ae30da02724..6ea36391497c04c24ae19349bd7817f7f13ffb31 100644 --- a/Graphics/Entity.cpp +++ b/Graphics/Entity.cpp @@ -1,4 +1,4 @@ -// $Id: Entity.cpp,v 1.10 2001-08-03 21:27:20 geuzaine Exp $ +// $Id: Entity.cpp,v 1.11 2001-08-06 16:47:57 geuzaine Exp $ #include "Gmsh.h" #include "GmshUI.h" @@ -77,11 +77,6 @@ void Draw_Triangle (double *x, double *y, double *z, double *n, void Draw_Quadrangle (double *x, double *y, double *z, double *n, double Raise[3][5], int shade){ - - /* - I think this gives better results - */ - double x2[3]={x[2],x[3],x[0]}; double y2[3]={y[2],y[3],y[0]}; double z2[3]={z[2],z[3],z[0]};