First set of changes to the new circulators
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@898 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
@@ -327,11 +327,11 @@ MeshViewerWidgetT<M>::draw_openmesh(const std::string& _draw_mode)
|
||||
for (; fIt!=fEnd; ++fIt)
|
||||
{
|
||||
fvIt = mesh_.cfv_iter(fIt.handle());
|
||||
glArrayElement(fvIt.handle().idx());
|
||||
glArrayElement(fvIt->idx());
|
||||
++fvIt;
|
||||
glArrayElement(fvIt.handle().idx());
|
||||
glArrayElement(fvIt->idx());
|
||||
++fvIt;
|
||||
glArrayElement(fvIt.handle().idx());
|
||||
glArrayElement(fvIt->idx());
|
||||
}
|
||||
glEnd();
|
||||
|
||||
@@ -363,11 +363,11 @@ MeshViewerWidgetT<M>::draw_openmesh(const std::string& _draw_mode)
|
||||
for (; fIt!=fEnd; ++fIt)
|
||||
{
|
||||
fvIt = mesh_.cfv_iter(fIt.handle());
|
||||
glArrayElement(fvIt.handle().idx());
|
||||
glArrayElement(fvIt->idx());
|
||||
++fvIt;
|
||||
glArrayElement(fvIt.handle().idx());
|
||||
glArrayElement(fvIt->idx());
|
||||
++fvIt;
|
||||
glArrayElement(fvIt.handle().idx());
|
||||
glArrayElement(fvIt->idx());
|
||||
}
|
||||
glEnd();
|
||||
|
||||
@@ -391,11 +391,11 @@ MeshViewerWidgetT<M>::draw_openmesh(const std::string& _draw_mode)
|
||||
glColor( fIt.handle() );
|
||||
|
||||
fvIt = mesh_.cfv_iter(fIt.handle());
|
||||
glArrayElement(fvIt.handle().idx());
|
||||
glArrayElement(fvIt->idx());
|
||||
++fvIt;
|
||||
glArrayElement(fvIt.handle().idx());
|
||||
glArrayElement(fvIt->idx());
|
||||
++fvIt;
|
||||
glArrayElement(fvIt.handle().idx());
|
||||
glArrayElement(fvIt->idx());
|
||||
}
|
||||
glEnd();
|
||||
|
||||
|
||||
@@ -380,18 +380,18 @@ get_active_cuts(const VHierarchyNodeHandle _node_handle, MyMesh::VertexHandle &v
|
||||
|
||||
for (vv_it=mesh_.vv_iter(vhierarchy_.vertex_handle(_node_handle)); vv_it; ++vv_it)
|
||||
{
|
||||
nnode_handle = mesh_.data(vv_it.handle()).vhierarchy_node_handle();
|
||||
nnode_handle = mesh_.data(*vv_it).vhierarchy_node_handle();
|
||||
nnode_index = vhierarchy_.node_index(nnode_handle);
|
||||
|
||||
if (vl == MyMesh::InvalidVertexHandle && vhierarchy_.is_ancestor(nnode_index, fund_lcut_index) == true)
|
||||
vl = vv_it.handle();
|
||||
vl = *vv_it;
|
||||
if (vr == MyMesh::InvalidVertexHandle && vhierarchy_.is_ancestor(nnode_index, fund_rcut_index) == true)
|
||||
vr = vv_it.handle();
|
||||
vr = *vv_it;
|
||||
|
||||
/*if (vl == MyMesh::InvalidVertexHandle && nnode_index.is_ancestor_index(fund_lcut_index) == true)
|
||||
vl = vv_it.handle();
|
||||
vl = *vv_it;
|
||||
if (vr == MyMesh::InvalidVertexHandle && nnode_index.is_ancestor_index(fund_rcut_index) == true)
|
||||
vr = vv_it.handle();*/
|
||||
vr = *vv_it;*/
|
||||
|
||||
if (vl != MyMesh::InvalidVertexHandle && vr != MyMesh::InvalidVertexHandle)
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user