* apps/mesh-segm-skel/mesh-complex-max-curv.cc: Remove dead code. * apps/mesh-segm-skel/mesh-complex-skel.cc: Typo. * apps/mesh-segm-skel/Makefile.am: Add titles and FIXMES. --- milena/ChangeLog | 8 ++++ milena/apps/mesh-segm-skel/Makefile.am | 36 ++++++++++++++++++-- .../apps/mesh-segm-skel/mesh-complex-max-curv.cc | 13 +------ milena/apps/mesh-segm-skel/mesh-complex-skel.cc | 2 +- 4 files changed, 44 insertions(+), 15 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 58cd008..8b45871 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-05-11 Roland Levillain <roland@lrde.epita.fr> + Clean up and new FIXMES in in apps/mesh-segm-skel. + + * apps/mesh-segm-skel/mesh-complex-max-curv.cc: Remove dead code. + * apps/mesh-segm-skel/mesh-complex-skel.cc: Typo. + * apps/mesh-segm-skel/Makefile.am: Add titles and FIXMES. + +2010-05-11 Roland Levillain <roland@lrde.epita.fr> + New application: mesh-complex-max-curv-extrema. * apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc: New. diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index 460e6e9..b702ccb 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -79,11 +79,13 @@ endif ENABLE_TRIMESH if ENABLE_TRIMESH bin_PROGRAMS += mesh-pinv-curv mesh-max-curv + # FIXME: Rename as mesh-trimesh-pinv-curv? mesh_pinv_curv_SOURCES = mesh-pinv-curv.cc io.hh mesh_pinv_curv_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) mesh_pinv_curv_LDFLAGS = $(LDFLAGS_trimesh) mesh_pinv_curv_LDADD = $(LDADD_trimesh) + # FIXME: Rename as mesh-trimesh-max-curv? mesh_max_curv_SOURCES = mesh-max-curv.cc io.hh mesh_max_curv_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) mesh_max_curv_LDFLAGS = $(LDFLAGS_trimesh) @@ -93,17 +95,34 @@ if ENABLE_TRIMESH endif ENABLE_TRIMESH ## ---------------------------------------------------- ## +## Graph-based applications, independent of Trimesh. ## +## ---------------------------------------------------- ## + +# FIXME: To be written (and factored, of course): +# +# mesh-graph-{max,pinv}-curv +# +# mesh-graph-segm +# mesh-graph-{max,pinv}-curv-segm +# +# mesh-graph-skel +# mesh-graph-{max,pinv}-curv-skel +# +# ... + +## ---------------------------------------------------- ## ## Complex-based applications, independent of Trimesh. ## ## ---------------------------------------------------- ## # A Milena re-implementation of some features from Trimesh. This code # is completely independent from the Trimesh library. # FIXME: Change the name of this directory, as it is confusing. +# FIXME: Integrate this header into Milena. noinst_HEADERS = trimesh/misc.hh EXTRA_DIST = trimesh/README -## Segmentation. -## ------------ +## Curvature computation. +## ---------------------- # A small program exercising the curvature computation routines ported # from Trimesh to Milena. @@ -112,6 +131,7 @@ mesh_complex_max_curv_SOURCES = mesh-complex-max-curv.cc TESTS += test-mesh-complex-max-curv CLEANFILES += teapot-complex-max-curv.off +# FIXME: Implement (and exercise) mesh-complex-pinv-curv. # A program computing the max curvature at each (2-)face of the # surface of a triangle mesh and displaying its local minima @@ -123,7 +143,14 @@ CLEANFILES += \ socket-complex-max-curv-extrema.off \ teapot-complex-max-curv-extrema.off -# Segmentation program working on precomputed meshes with curvatures data. +# FIXME: Implement (and exercise) mesh-complex-pinv-curv-extrema. + +## Segmentation. +## ------------- + +# Segmentation program working on precomputed meshes with curvature +# data. Less accurate, since curvature is stored on triangles +# (polygons), whereas the segmentation is performed on edges. bin_PROGRAMS += mesh-complex-segm mesh_complex_segm_SOURCES = mesh-complex-segm.cc TESTS += test-mesh-complex-segm @@ -159,3 +186,6 @@ CLEANFILES += \ socket-max-curv-skel.off \ teapot-max-curv.off \ three-triangles-skel.off + +# FIXME: Implement `mesh-complex-{max,pinv}-curv-skel'. +# ... diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc index 8d79839..79ac4ea 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Milena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -86,16 +87,6 @@ int main(int argc, char* argv[]) mln::bin_2complex_image3df input; mln::io::off::load(input, input_filename); -// // ------------------------------------------------------------ -// // FIXME: TEST. -// mln::complex_image< 2, mln::space_2complex_geometry, mln::algebra::vec<3, float> > -// normal = mesh_normal(input.domain()); -// mln::p_n_faces_fwd_piter<D, G> v_(normal.domain(), 0); -// for_all(v_) -// std::cout << normal(v_) << std::endl; -// std::exit(0); -// // ------------------------------------------------------------ - std::pair<ima_t, ima_t> curv = mln::geom::mesh_curvature(input.domain()); // Compute the max curvature at each vertex. diff --git a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc index a4df815..b7e1f1f 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc @@ -209,7 +209,7 @@ main(int argc, char* argv[]) `---------*/ /* FIXME: This does not work (yet). - Use workaround mln::io::off::save_bin_salt instead (bad!) */ + Use workaround mln::io::off::save_bin_alt instead (bad!) */ #if 0 mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); -- 1.5.6.5