Skip to content
Snippets Groups Projects
Commit 8cece18d authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

only use POLYGON_OFFSET_FILL when it's really necessary (when we draw
edges)
parent caa345af
No related branches found
No related tags found
No related merge requests found
// $Id: Mesh.cpp,v 1.99 2004-07-01 19:07:43 geuzaine Exp $ // $Id: Mesh.cpp,v 1.100 2004-07-09 18:26:56 geuzaine Exp $
// //
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
// //
...@@ -634,7 +634,7 @@ void Draw_Mesh_Triangle(void *a, void *b) ...@@ -634,7 +634,7 @@ void Draw_Mesh_Triangle(void *a, void *b)
if(CTX.mesh.surfaces_faces) { if(CTX.mesh.surfaces_faces) {
glColor4ubv((GLubyte *) & col); glColor4ubv((GLubyte *) & col);
if(CTX.mesh.light) glEnable(GL_LIGHTING); if(CTX.mesh.light) glEnable(GL_LIGHTING);
glEnable(GL_POLYGON_OFFSET_FILL); if(CTX.mesh.surfaces_edges) glEnable(GL_POLYGON_OFFSET_FILL);
if(!s->VSUP) { if(!s->VSUP) {
glBegin(GL_TRIANGLES); glBegin(GL_TRIANGLES);
glVertex3d(X[0], Y[0], Z[0]); glVertex3d(X[0], Y[0], Z[0]);
...@@ -776,7 +776,7 @@ void Draw_Mesh_Quadrangle(void *a, void *b) ...@@ -776,7 +776,7 @@ void Draw_Mesh_Quadrangle(void *a, void *b)
if(CTX.mesh.surfaces_faces) { if(CTX.mesh.surfaces_faces) {
glColor4ubv((GLubyte *) & col); glColor4ubv((GLubyte *) & col);
if(CTX.mesh.light) glEnable(GL_LIGHTING); if(CTX.mesh.light) glEnable(GL_LIGHTING);
glEnable(GL_POLYGON_OFFSET_FILL); if(CTX.mesh.surfaces_edges) glEnable(GL_POLYGON_OFFSET_FILL);
if(!q->VSUP) { if(!q->VSUP) {
glBegin(GL_QUADS); glBegin(GL_QUADS);
glVertex3d(X[0], Y[0], Z[0]); glVertex3d(X[0], Y[0], Z[0]);
......
// $Id: Post.cpp,v 1.70 2004-06-23 19:53:52 geuzaine Exp $ // $Id: Post.cpp,v 1.71 2004-07-09 18:26:56 geuzaine Exp $
// //
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
// //
...@@ -560,7 +560,7 @@ void Draw_Post(void) ...@@ -560,7 +560,7 @@ void Draw_Post(void)
glEnable(GL_LIGHTING); glEnable(GL_LIGHTING);
else else
glDisableClientState(GL_NORMAL_ARRAY); glDisableClientState(GL_NORMAL_ARRAY);
glEnable(GL_POLYGON_OFFSET_FILL); if(v->ShowElement) glEnable(GL_POLYGON_OFFSET_FILL);
glDrawArrays(GL_TRIANGLES, 0, 3 * v->TriVertexArray->num); glDrawArrays(GL_TRIANGLES, 0, 3 * v->TriVertexArray->num);
glDisable(GL_POLYGON_OFFSET_FILL); glDisable(GL_POLYGON_OFFSET_FILL);
glDisable(GL_LIGHTING); glDisable(GL_LIGHTING);
......
// $Id: PostElement.cpp,v 1.37 2004-07-02 23:15:04 geuzaine Exp $ // $Id: PostElement.cpp,v 1.38 2004-07-09 18:26:56 geuzaine Exp $
// //
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
// //
...@@ -460,7 +460,7 @@ void Draw_ScalarTriangle(Post_View * View, int preproNormals, ...@@ -460,7 +460,7 @@ void Draw_ScalarTriangle(Post_View * View, int preproNormals,
} }
else{ else{
if(View->Light) glEnable(GL_LIGHTING); if(View->Light) glEnable(GL_LIGHTING);
glEnable(GL_POLYGON_OFFSET_FILL); if(View->ShowElement) glEnable(GL_POLYGON_OFFSET_FILL);
glBegin(GL_TRIANGLES); glBegin(GL_TRIANGLES);
for(int i = 0; i < 3; i++){ for(int i = 0; i < 3; i++){
PaletteContinuous(View, ValMin, ValMax, Val[i]); PaletteContinuous(View, ValMin, ValMax, Val[i]);
...@@ -511,7 +511,7 @@ void Draw_ScalarTriangle(Post_View * View, int preproNormals, ...@@ -511,7 +511,7 @@ void Draw_ScalarTriangle(Post_View * View, int preproNormals,
} }
else{ else{
if(View->Light) glEnable(GL_LIGHTING); if(View->Light) glEnable(GL_LIGHTING);
glEnable(GL_POLYGON_OFFSET_FILL); if(View->ShowElement) glEnable(GL_POLYGON_OFFSET_FILL);
glBegin(GL_POLYGON); glBegin(GL_POLYGON);
for(int i = 0; i < nb; i++) { for(int i = 0; i < nb; i++) {
PaletteContinuous(View, ValMin, ValMax, Vp[i]); PaletteContinuous(View, ValMin, ValMax, Vp[i]);
...@@ -568,7 +568,7 @@ void Draw_ScalarTriangle(Post_View * View, int preproNormals, ...@@ -568,7 +568,7 @@ void Draw_ScalarTriangle(Post_View * View, int preproNormals,
} }
else{ else{
if(View->Light) glEnable(GL_LIGHTING); if(View->Light) glEnable(GL_LIGHTING);
glEnable(GL_POLYGON_OFFSET_FILL); if(View->ShowElement) glEnable(GL_POLYGON_OFFSET_FILL);
glBegin(GL_POLYGON); glBegin(GL_POLYGON);
for(int i = 0; i < nb; i++){ for(int i = 0; i < nb; i++){
if(View->Light) glNormal3dv(&norms[3*i]); if(View->Light) glNormal3dv(&norms[3*i]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment