OM3 compat

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1198 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2015-01-15 10:34:21 +00:00
parent b9fd3edef9
commit 76545e6c68
5 changed files with 22 additions and 22 deletions

View File

@@ -152,7 +152,7 @@ drawFaces(bool _send_normals, OpenMesh::GenProg::Bool2Type<true>)
for (; f_it!=f_end; ++f_it)
{
glNormal(mesh_->normal(f_it));
fv_it = mesh_->cfv_iter(f_it.handle());
fv_it = mesh_->cfv_iter(*f_it);
glVertex(mesh_->point(fv_it));
++fv_it;
glVertex(mesh_->point(fv_it));
@@ -166,7 +166,7 @@ drawFaces(bool _send_normals, OpenMesh::GenProg::Bool2Type<true>)
glBegin(GL_TRIANGLES);
for (; f_it!=f_end; ++f_it)
{
fv_it = mesh_->cfv_iter(f_it.handle());
fv_it = mesh_->cfv_iter(*f_it);
glVertex(mesh_->point(fv_it));
++fv_it;
glVertex(mesh_->point(fv_it));
@@ -198,7 +198,7 @@ drawFaces(bool _send_normals, OpenMesh::GenProg::Bool2Type<false>)
{
glBegin(GL_POLYGON);
glNormal(mesh_->normal(f_it));
for (fv_it=mesh_->cfv_iter(f_it.handle()); fv_it.is_valid() ++fv_it)
for (fv_it=mesh_->cfv_iter(*f_it); fv_it.is_valid() ++fv_it)
glVertex(mesh_->point(fv_it));
glEnd();
}
@@ -208,7 +208,7 @@ drawFaces(bool _send_normals, OpenMesh::GenProg::Bool2Type<false>)
for (; f_it!=f_end; ++f_it)
{
glBegin(GL_POLYGON);
for (fv_it=mesh_->cfv_iter(f_it.handle()); fv_it.is_valid() ++fv_it)
for (fv_it=mesh_->cfv_iter(*f_it); fv_it.is_valid() ++fv_it)
glVertex(mesh_->point(fv_it));
glEnd();
}
@@ -250,7 +250,7 @@ genPrimitives(SoAction* _action, OpenMesh::GenProg::Bool2Type<true>)
{
pv.setNormal(sbvec3f(mesh_->normal(f_it)));
fv_it = mesh_->cfv_iter(f_it.handle());
fv_it = mesh_->cfv_iter(*f_it);
pv.setPoint(sbvec3f(mesh_->point(fv_it)));
shapeVertex(&pv);
@@ -290,7 +290,7 @@ genPrimitives(SoAction* _action, OpenMesh::GenProg::Bool2Type<false>)
pv.setNormal(sbvec3f(mesh_->normal(f_it)));
for (fv_it=mesh_->cfv_iter(f_it.handle()); fv_it.is_valid() ++fv_it)
for (fv_it=mesh_->cfv_iter(*f_it); fv_it.is_valid() ++fv_it)
{
pv.setPoint(sbvec3f(mesh_->point(fv_it)));
shapeVertex(&pv);