From cb4f24383f7cce1c165f70f085eb5d8dee7cf550 Mon Sep 17 00:00:00 2001 From: Guido Ranzuglia Date: Mon, 12 Sep 2016 08:58:29 +0200 Subject: [PATCH] - various bugs fixed --- vcg/complex/algorithms/update/texture.h | 1 + ..._mesh_attributes_multi_viewer_bo_manager.h | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/vcg/complex/algorithms/update/texture.h b/vcg/complex/algorithms/update/texture.h index d0a8339a..c454ddd1 100644 --- a/vcg/complex/algorithms/update/texture.h +++ b/vcg/complex/algorithms/update/texture.h @@ -111,6 +111,7 @@ static void WedgeTexFromVertexTex(ComputeMeshType &m) { (*fi).WT(i).U() = (*fi).V(i)->T().U(); (*fi).WT(i).V() = (*fi).V(i)->T().V(); + (*fi).WT(i).N() = 0; } } } diff --git a/wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h b/wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h index 60fcf349..a7484f75 100644 --- a/wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h +++ b/wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h @@ -1307,14 +1307,21 @@ namespace vcg } bool solidtoo = dt.isPrimitiveActive(PR_SOLID); - if (dt.isPrimitiveActive(PR_WIREFRAME_TRIANGLES)) - { - drawWiredTriangles(dt._intatts[size_t(PR_WIREFRAME_TRIANGLES)], dt._glopts, textid); - } + /*EDGE | TRI | DRAW + --------------------------------- + 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 { - if (dt.isPrimitiveActive(PR_WIREFRAME_EDGES)) - drawEdges(dt._intatts[size_t(PR_WIREFRAME_EDGES)], dt._glopts); + if (dt.isPrimitiveActive(PR_WIREFRAME_TRIANGLES)) + { + drawWiredTriangles(dt._intatts[size_t(PR_WIREFRAME_TRIANGLES)], dt._glopts, textid); + } } if (pointstoo || solidtoo)