Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Next change set for the new interface

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@902 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2013-08-07 10:26:50 +00:00
parent 29335262e4
commit 50dc9e8478
13 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/OpenMesh/Apps/Subdivider/adaptive_subdivider.cc
View File

@@ -308,7 +308,7 @@ int main(int argc, char **argv)
if (mesh.data(f_it).state() < target1) {
++i;
fh = f_it.handle();
fh = *f_it;
timer2.start();
subdivider.refine(fh);
timer2.stop();
@@ -318,7 +318,7 @@ int main(int argc, char **argv)
for (v_it = mesh.vertices_begin(); v_it != mesh.vertices_end(); ++v_it) {
if (mesh.data(v_it).state() < target2) {
vh = v_it.handle();
vh = *v_it;
timer2.cont();
subdivider.refine(vh);
timer2.stop();
@@ -350,7 +350,7 @@ int main(int argc, char **argv)
// calculate quality
quality = 0.0;
fh = mesh.faces_begin().handle();
fh = *(mesh.faces_begin());
// check every face
for (f_it = mesh.faces_begin(); f_it != mesh.faces_end(); ++f_it) {
@@ -358,7 +358,7 @@ int main(int argc, char **argv)
face_quality = 0.0;
valence = 0;
for (ff_it = mesh.ff_iter(f_it.handle()); ff_it; ++ff_it) {
for (ff_it = mesh.ff_iter(*f_it); ff_it; ++ff_it) {
temp_quality = OpenMesh::dot( mesh.normal(f_it),
mesh.normal(ff_it) );
@@ -383,9 +383,9 @@ int main(int argc, char **argv)
#define nheh next_halfedge_handle
#define tvh to_vertex_handle
#define fvh from_vertex_handle
p1 = mesh.point(mesh.tvh(mesh.heh(f_it.handle())));
p2 = mesh.point(mesh.fvh(mesh.heh(f_it.handle())));
p3 = mesh.point(mesh.tvh(mesh.nheh(mesh.heh(f_it.handle()))));
p1 = mesh.point(mesh.tvh(mesh.heh(*f_it)));
p2 = mesh.point(mesh.fvh(mesh.heh(*f_it)));
p3 = mesh.point(mesh.tvh(mesh.nheh(mesh.heh(*f_it))));
#undef heh
#undef nheh
#undef tvh
@@ -397,10 +397,10 @@ int main(int argc, char **argv)
face_quality *= pow(double(area), double(.1));
//face_quality *= area;
if (face_quality >= quality && !mesh.is_boundary(f_it.handle()))
if (face_quality >= quality && !mesh.is_boundary(*f_it))
{
quality = face_quality;
fh = f_it.handle();
fh = *f_it;
}
}

10
src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc
View File

@@ -508,7 +508,7 @@ save_vd_prog_mesh(const std::string &_filename)
for (f_it=mesh_.faces_begin(); f_it!=mesh_.faces_end(); ++f_it) {
hh = mesh_.halfedge_handle(f_it.handle());
hh = mesh_.halfedge_handle(*f_it);
vh = mesh_.to_vertex_handle(hh);
fvi[0] = handle2index_map[vh];
@@ -660,16 +660,16 @@ vdpm_analysis()
// initialize
for (h_it=mesh_.halfedges_begin(); h_it!=mesh_.halfedges_end(); ++h_it)
{
vh = mesh_.to_vertex_handle(h_it.handle());
vh = mesh_.to_vertex_handle(*h_it);
mesh_.data(h_it).set_vhierarchy_leaf_node_handle(mesh_.data(vh).vhierarchy_node_handle());
}
for (v_it=mesh_.vertices_begin(); v_it!=mesh_.vertices_end(); ++v_it)
{
VHierarchyNodeHandle
node_handle = mesh_.data(v_it.handle()).vhierarchy_node_handle();
node_handle = mesh_.data(*v_it).vhierarchy_node_handle();
vhierarchy_.node(node_handle).set_normal(mesh_.normal(v_it.handle()));
vhierarchy_.node(node_handle).set_normal(mesh_.normal(*v_it));
}
std::cout << "Start view-dependent PM analysis" << std::endl;
@@ -859,7 +859,7 @@ compute_screen_space_error(VHierarchyNodeHandle node_handle, VHierarchyNodeHandl
for (vf_it=mesh_.vf_iter(vh); vf_it; ++vf_it)
{
heh = mesh_.halfedge_handle(vf_it.handle());
heh = mesh_.halfedge_handle(*vf_it);
tri[0] = mesh_.point(mesh_.to_vertex_handle(heh));
heh = mesh_.next_halfedge_handle(heh);
tri[1] = mesh_.point(mesh_.to_vertex_handle(heh));

2
src/OpenMesh/Apps/mconvert/mconvert.cc
View File

@@ -275,7 +275,7 @@ int main(int argc, char *argv[] )
timer.start();
MyMesh::VertexIter vit = mesh.vertices_begin();
for (; vit != mesh.vertices_end(); ++vit)
mesh.set_normal( vit.handle(), -mesh.normal( vit.handle() ) );
mesh.set_normal( *vit, -mesh.normal( *vit ) );
timer.stop();
std::cout << " " << mesh.n_vertices()
<< " vertex normals in " << timer.as_string() << std::endl;