Commit 11f225fd authored by Charles Law's avatar Charles Law
Browse files

Corrected render ordering of polys and strips.

parent b82b2332
...@@ -2506,8 +2506,8 @@ void vtkOpenGLPolyDataMapper::Draw(vtkRenderer *aren, vtkActor *act) ...@@ -2506,8 +2506,8 @@ void vtkOpenGLPolyDataMapper::Draw(vtkRenderer *aren, vtkActor *act)
prims[0] = input->GetVerts(); prims[0] = input->GetVerts();
prims[1] = input->GetLines(); prims[1] = input->GetLines();
prims[2] = input->GetStrips(); prims[2] = input->GetPolys();
prims[3] = input->GetPolys(); prims[3] = input->GetStrips();
t = input->GetPointData()->GetTCoords(); t = input->GetPointData()->GetTCoords();
if ( t ) if ( t )
...@@ -2772,12 +2772,17 @@ void vtkOpenGLPolyDataMapper::Draw(vtkRenderer *aren, vtkActor *act) ...@@ -2772,12 +2772,17 @@ void vtkOpenGLPolyDataMapper::Draw(vtkRenderer *aren, vtkActor *act)
glDisable( GL_LIGHTING); glDisable( GL_LIGHTING);
} }
// do polys
aPrim = prims[2];
aGlFunction = glFunction[3];
draw3(aPrim, aGlFunction, cellNum, p, n, c, t, ren, noAbort);
// do tstrips // do tstrips
if ( zResolve ) if ( zResolve )
{ {
glDepthRange(2*zRes, 1.); glDepthRange(2*zRes, 1.);
} }
aPrim = prims[2]; aPrim = prims[3];
aGlFunction = glFunction[2]; aGlFunction = glFunction[2];
draw2(aPrim, aGlFunction, cellNum, p, n, c, t, ren, noAbort); draw2(aPrim, aGlFunction, cellNum, p, n, c, t, ren, noAbort);
if (rep == VTK_WIREFRAME) if (rep == VTK_WIREFRAME)
...@@ -2785,11 +2790,6 @@ void vtkOpenGLPolyDataMapper::Draw(vtkRenderer *aren, vtkActor *act) ...@@ -2785,11 +2790,6 @@ void vtkOpenGLPolyDataMapper::Draw(vtkRenderer *aren, vtkActor *act)
draw2W(aPrim, aGlFunction, cellNum, p, n, c, t, ren, noAbort); draw2W(aPrim, aGlFunction, cellNum, p, n, c, t, ren, noAbort);
} }
// do polys
aPrim = prims[3];
aGlFunction = glFunction[3];
draw3(aPrim, aGlFunction, cellNum, p, n, c, t, ren, noAbort);
// enable lighting again if necessary // enable lighting again if necessary
if (!n && rep == VTK_POINTS) if (!n && rep == VTK_POINTS)
{ {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment