manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- various bugs fixed

This commit is contained in:
Guido Ranzuglia 2016-09-12 08:58:29 +02:00
parent 01787cad96
commit cb4f24383f
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vcg/complex/algorithms/update/texture.h
View File

@ -111,6 +111,7 @@ static void WedgeTexFromVertexTex(ComputeMeshType &m)
{ {
(*fi).WT(i).U() = (*fi).V(i)->T().U(); (*fi).WT(i).U() = (*fi).V(i)->T().U();
(*fi).WT(i).V() = (*fi).V(i)->T().V(); (*fi).WT(i).V() = (*fi).V(i)->T().V();
(*fi).WT(i).N() = 0;
} }
} }
} }

19
wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h
View File

@ -1307,14 +1307,21 @@ namespace vcg
} }
bool solidtoo = dt.isPrimitiveActive(PR_SOLID); bool solidtoo = dt.isPrimitiveActive(PR_SOLID);
if (dt.isPrimitiveActive(PR_WIREFRAME_TRIANGLES)) /*EDGE | TRI | DRAW
{ ---------------------------------
drawWiredTriangles(dt._intatts[size_t(PR_WIREFRAME_TRIANGLES)], dt._glopts, textid); TRUE TRUE EDGE
} TRUE FALSE EDGE
FALSE TRUE TRI
FALSE FALSE NOTHING */
if (dt.isPrimitiveActive(PR_WIREFRAME_EDGES))
drawEdges(dt._intatts[size_t(PR_WIREFRAME_EDGES)], dt._glopts);
else else
{ {
if (dt.isPrimitiveActive(PR_WIREFRAME_EDGES)) if (dt.isPrimitiveActive(PR_WIREFRAME_TRIANGLES))
drawEdges(dt._intatts[size_t(PR_WIREFRAME_EDGES)], dt._glopts); {
drawWiredTriangles(dt._intatts[size_t(PR_WIREFRAME_TRIANGLES)], dt._glopts, textid);
}
} }
if (pointstoo || solidtoo) if (pointstoo || solidtoo)