corrected wrong test on the use of faux edges when drawing in wireframe
This commit is contained in:
parent
f5126d7ffe
commit
2d3d9bd13f
|
@ -614,7 +614,6 @@ void DrawWirePolygonal()
|
||||||
typename FACE_POINTER_CONTAINER::iterator fp;
|
typename FACE_POINTER_CONTAINER::iterator fp;
|
||||||
|
|
||||||
typename std::vector<typename MESH_TYPE::FaceType*>::iterator fip;
|
typename std::vector<typename MESH_TYPE::FaceType*>::iterator fip;
|
||||||
short curtexname=-1;
|
|
||||||
|
|
||||||
if(cm == CMPerMesh)
|
if(cm == CMPerMesh)
|
||||||
glColor(m->C());
|
glColor(m->C());
|
||||||
|
@ -879,16 +878,16 @@ template <NormalMode nm, ColorMode cm>
|
||||||
void DrawWire()
|
void DrawWire()
|
||||||
{
|
{
|
||||||
//if(!(curr_hints & (HNUseEdgeStrip | HNUseLazyEdgeStrip) ) )
|
//if(!(curr_hints & (HNUseEdgeStrip | HNUseLazyEdgeStrip) ) )
|
||||||
if ( curr_hints & !HNIsPolygonal )
|
if ( (curr_hints & HNIsPolygonal) )
|
||||||
|
{
|
||||||
|
DrawWirePolygonal<nm,cm>();
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
glPushAttrib(GL_POLYGON_BIT);
|
glPushAttrib(GL_POLYGON_BIT);
|
||||||
glPolygonMode(GL_FRONT_AND_BACK ,GL_LINE);
|
glPolygonMode(GL_FRONT_AND_BACK ,GL_LINE);
|
||||||
DrawFill<nm,cm,TMNone>();
|
DrawFill<nm,cm,TMNone>();
|
||||||
glPopAttrib();
|
glPopAttrib();
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
DrawWirePolygonal<nm,cm>();
|
|
||||||
}
|
}
|
||||||
// {
|
// {
|
||||||
// if(!HasEdges()) ComputeEdges();
|
// if(!HasEdges()) ComputeEdges();
|
||||||
|
|
Loading…
Reference in New Issue