Commit b548bf22 authored by Hans-Christian Ebke's avatar Hans-Christian Ebke
Browse files

Rewrote vertex-centered circulators.

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@890 fdac6126-5c0c-442c-9429-916003d36597
parent 6d70b254
......@@ -61,1969 +61,251 @@
namespace OpenMesh {
namespace Iterators {
template<class Mesh, class CenterEntityHandle>
class GenericCirculator_CenterEntityFnsT {
public:
static void increment(const Mesh *mesh, typename Mesh::HalfedgeHandle &heh, typename Mesh::HalfedgeHandle &start, int &lap_counter);
static void decrement(const Mesh *mesh, typename Mesh::HalfedgeHandle &heh, typename Mesh::HalfedgeHandle &start, int &lap_counter);
};
//== FORWARD DECLARATIONS =====================================================
template <class Mesh> class VertexVertexIterT;
template <class Mesh> class VertexIHalfedgeIterT;
template <class Mesh> class VertexOHalfedgeIterT;
template <class Mesh> class VertexEdgeIterT;
template <class Mesh> class VertexFaceIterT;
template <class Mesh> class ConstVertexVertexIterT;
template <class Mesh> class ConstVertexIHalfedgeIterT;
template <class Mesh> class ConstVertexOHalfedgeIterT;
template <class Mesh> class ConstVertexEdgeIterT;
template <class Mesh> class ConstVertexFaceIterT;
template <class Mesh> class FaceVertexIterT;
template <class Mesh> class FaceHalfedgeIterT;
template <class Mesh> class FaceEdgeIterT;
template <class Mesh> class FaceFaceIterT;
template <class Mesh> class ConstFaceVertexIterT;
template <class Mesh> class ConstFaceHalfedgeIterT;
template <class Mesh> class ConstFaceEdgeIterT;
template <class Mesh> class ConstFaceFaceIterT;
//== CLASS DEFINITION =========================================================
/** \class VertexVertexIterT CirculatorsT.hh <OpenMesh/Mesh/Iterators/CirculatorsT.hh>
Circulator.
*/
template <class Mesh>
class VertexVertexIterT
{
public:
//--- Typedefs ---
typedef typename Mesh::HalfedgeHandle HalfedgeHandle;
typedef typename Mesh::Vertex value_type;
typedef typename Mesh::VertexHandle value_handle;
#if 0
typedef std::bidirectional_iterator_tag iterator_category;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Vertex& reference;
typedef const typename Mesh::Vertex* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Vertex& reference;
typedef typename Mesh::Vertex* pointer;
#endif
/// Default constructor
VertexVertexIterT() : mesh_(0), lap_counter_(0) {}
/// Construct with mesh and a typename Mesh::VertexHandle
VertexVertexIterT(mesh_ref _mesh, typename Mesh::VertexHandle _start, bool _end = false) :
mesh_(&_mesh),
start_(_mesh.halfedge_handle(_start)),
heh_(start_),
lap_counter_(_end)
{ ; }
/// Construct with mesh and start halfedge
VertexVertexIterT(mesh_ref _mesh, HalfedgeHandle _heh, bool _end = false) :
mesh_(&_mesh),
start_(_heh),
heh_(_heh),
lap_counter_(_end)
{ ; }
/// Copy constructor
VertexVertexIterT(const VertexVertexIterT& _rhs) :
mesh_(_rhs.mesh_),
start_(_rhs.start_),
heh_(_rhs.heh_),
lap_counter_(_rhs.lap_counter_)
{ ; }
/// Assignment operator
VertexVertexIterT& operator=(const VertexVertexIterT<Mesh>& _rhs)
{
mesh_ = _rhs.mesh_;
start_ = _rhs.start_;
heh_ = _rhs.heh_;
lap_counter_ = _rhs.lap_counter_;
return *this;
}
#if 0
/// construct from non-const circulator type
VertexVertexIterT(const VertexVertexIterT<Mesh>& _rhs) :
mesh_(_rhs.mesh_),
start_(_rhs.start_),
heh_(_rhs.heh_),
lap_counter_(_rhs.lap_counter_)
{ ; }
/// assign from non-const circulator
VertexVertexIterT& operator=(const VertexVertexIterT<Mesh>& _rhs)
{
mesh_ = _rhs.mesh_;
start_ = _rhs.start_;
heh_ = _rhs.heh_;
lap_counter_ = _rhs.lap_counter_;
return *this;
}
#else
friend class ConstVertexVertexIterT<Mesh>;
#endif
/// Equal ?
bool operator==(const VertexVertexIterT& _rhs) const {
return ((mesh_ == _rhs.mesh_) &&
(start_ == _rhs.start_) &&
(heh_ == _rhs.heh_) &&
(lap_counter_ == _rhs.lap_counter_));
}
/// Not equal ?
bool operator!=(const VertexVertexIterT& _rhs) const {
return !operator==(_rhs);
}
/// Pre-Increment (next cw target)
VertexVertexIterT& operator++() {
assert(mesh_);
heh_=mesh_->cw_rotated_halfedge_handle(heh_);
if(heh_ == start_) lap_counter_++;
return *this;
}
/// Pre-Decrement (next ccw target)
VertexVertexIterT& operator--() {
assert(mesh_);
if(heh_ == start_) lap_counter_--;
heh_=mesh_->ccw_rotated_halfedge_handle(heh_);
return *this;
}
/** Get the current halfedge. There are \c Vertex*Iters and \c
Face*Iters. For both the current state is defined by the
current halfedge. This is what this method returns.
*/
HalfedgeHandle current_halfedge_handle() const {
return heh_;
}
/// Return the handle of the current target.
typename Mesh::VertexHandle handle() const {
assert(mesh_);
return mesh_->to_vertex_handle(heh_);
}
/// Cast to the handle of the current target.
operator typename Mesh::VertexHandle() const {
assert(mesh_);
return mesh_->to_vertex_handle(heh_);
}
/// Return a reference to the current target.
reference operator*() const {
assert(mesh_);
return mesh_->deref(handle());
}
/// Return a pointer to the current target.
pointer operator->() const {
assert(mesh_);
return &mesh_->deref(handle());
}
/** Returns whether the circulator is still valid.
After one complete round around a vertex/face the circulator becomes
invalid, i.e. this function will return \c false. Nevertheless you
can continue circulating. This method just tells you whether you
have completed the first round.
*/
operator bool() const {
return heh_.is_valid() && ((start_ != heh_) || (lap_counter_ == 0));
}
protected:
mesh_ptr mesh_;
HalfedgeHandle start_, heh_;
int lap_counter_;
};
//== CLASS DEFINITION =========================================================
/** \class ConstVertexVertexIterT CirculatorsT.hh <OpenMesh/Mesh/Iterators/CirculatorsT.hh>
Circulator.
*/
template <class Mesh>
class ConstVertexVertexIterT
{
public:
//--- Typedefs ---
typedef typename Mesh::HalfedgeHandle HalfedgeHandle;
typedef typename Mesh::Vertex value_type;
typedef typename Mesh::VertexHandle value_handle;
#if 1
typedef std::bidirectional_iterator_tag iterator_category;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Vertex& reference;
typedef const typename Mesh::Vertex* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Vertex& reference;
typedef typename Mesh::Vertex* pointer;
#endif
/// Default constructor
ConstVertexVertexIterT() : mesh_(0), lap_counter_(0) {}
/// Construct with mesh and a typename Mesh::VertexHandle
ConstVertexVertexIterT(mesh_ref _mesh, typename Mesh::VertexHandle _start, bool _end = false) :
mesh_(&_mesh),
start_(_mesh.halfedge_handle(_start)),
heh_(start_),
lap_counter_(_end)
{ ; }
/// Construct with mesh and start halfedge
ConstVertexVertexIterT(mesh_ref _mesh, HalfedgeHandle _heh, bool _end = false) :
mesh_(&_mesh),
start_(_heh),
heh_(_heh),
lap_counter_(_end)
{ ; }
/// Copy constructor
ConstVertexVertexIterT(const ConstVertexVertexIterT& _rhs) :
mesh_(_rhs.mesh_),
start_(_rhs.start_),
heh_(_rhs.heh_),
lap_counter_(_rhs.lap_counter_)
{ ; }
/// Assignment operator
ConstVertexVertexIterT& operator=(const ConstVertexVertexIterT<Mesh>& _rhs)
{
mesh_ = _rhs.mesh_;
start_ = _rhs.start_;
heh_ = _rhs.heh_;
lap_counter_ = _rhs.lap_counter_;
return *this;
}
#if 1
/// construct from non-const circulator type
ConstVertexVertexIterT(const VertexVertexIterT<Mesh>& _rhs) :
mesh_(_rhs.mesh_),
start_(_rhs.start_),
heh_(_rhs.heh_),
lap_counter_(_rhs.lap_counter_)
{ ; }
/// assign from non-const circulator
ConstVertexVertexIterT& operator=(const VertexVertexIterT<Mesh>& _rhs)
{
mesh_ = _rhs.mesh_;
start_ = _rhs.start_;
heh_ = _rhs.heh_;
lap_counter_ = _rhs.lap_counter_;
return *this;
}
#else
friend class ConstVertexVertexIterT<Mesh>;
#endif
/// Equal ?
bool operator==(const ConstVertexVertexIterT& _rhs) const {
return ((mesh_ == _rhs.mesh_) &&
(start_ == _rhs.start_) &&
(heh_ == _rhs.heh_) &&
(lap_counter_ == _rhs.lap_counter_));
}
/// Not equal ?
bool operator!=(const ConstVertexVertexIterT& _rhs) const {
return !operator==(_rhs);
}
/// Pre-Increment (next cw target)
ConstVertexVertexIterT& operator++() {
assert(mesh_);
heh_=mesh_->cw_rotated_halfedge_handle(heh_);
if(heh_ == start_) lap_counter_++;
return *this;
}
/// Pre-Decrement (next ccw target)
ConstVertexVertexIterT& operator--() {
assert(mesh_);
if(heh_ == start_) lap_counter_--;
heh_=mesh_->ccw_rotated_halfedge_handle(heh_);
return *this;
}
/** Get the current halfedge. There are \c Vertex*Iters and \c
Face*Iters. For both the current state is defined by the
current halfedge. This is what this method returns.
*/
HalfedgeHandle current_halfedge_handle() const {
return heh_;
}
/// Return the handle of the current target.
typename Mesh::VertexHandle handle() const {
assert(mesh_);
return mesh_->to_vertex_handle(heh_);
}
/// Cast to the handle of the current target.
operator typename Mesh::VertexHandle() const {
assert(mesh_);
return mesh_->to_vertex_handle(heh_);
}
/// Return a reference to the current target.
reference operator*() const {
assert(mesh_);
return mesh_->deref(handle());
}
/// Return a pointer to the current target.
pointer operator->() const {
assert(mesh_);
return &mesh_->deref(handle());
}
/** Returns whether the circulator is still valid.
After one complete round around a vertex/face the circulator becomes
invalid, i.e. this function will return \c false. Nevertheless you
can continue circulating. This method just tells you whether you
have completed the first round.
*/
operator bool() const {
return heh_.is_valid() && ((start_ != heh_) || (lap_counter_ == 0));
}
protected:
mesh_ptr mesh_;
HalfedgeHandle start_, heh_;
int lap_counter_;
};
//== CLASS DEFINITION =========================================================
/** \class VertexOHalfedgeIterT CirculatorsT.hh <OpenMesh/Mesh/Iterators/CirculatorsT.hh>
Circulator.
*/
template <class Mesh>
class VertexOHalfedgeIterT
{
public:
//--- Typedefs ---
typedef typename Mesh::HalfedgeHandle HalfedgeHandle;
typedef typename Mesh::Halfedge value_type;
typedef typename Mesh::HalfedgeHandle value_handle;
#if 0
typedef std::bidirectional_iterator_tag iterator_category;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Halfedge& reference;
typedef const typename Mesh::Halfedge* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Halfedge& reference;
typedef typename Mesh::Halfedge* pointer;
#endif
/// Default constructor
VertexOHalfedgeIterT() : mesh_(0), lap_counter_(false) {}
/// Construct with mesh and a typename Mesh::VertexHandle
VertexOHalfedgeIterT(mesh_ref _mesh, typename Mesh::VertexHandle _start, bool _end = false) :
mesh_(&_mesh),
start_(_mesh.halfedge_handle(_start)),
heh_(start_),
lap_counter_(_end)
{ ; }
/// Construct with mesh and start halfedge
VertexOHalfedgeIterT(mesh_ref _mesh, HalfedgeHandle _heh, bool _end = false) :
mesh_(&_mesh),
start_(_heh),
heh_(_heh),
lap_counter_(_end)
{ ; }
/// Copy constructor
VertexOHalfedgeIterT(const VertexOHalfedgeIterT& _rhs) :
mesh_(_rhs.mesh_),
start_(_rhs.start_),
heh_(_rhs.heh_),
lap_counter_(_rhs.lap_counter_)
{ ; }
/// Assignment operator
VertexOHalfedgeIterT& operator=(const VertexOHalfedgeIterT<Mesh>& _rhs)
{
mesh_ = _rhs.mesh_;
start_ = _rhs.start_;
heh_ = _rhs.heh_;
lap_counter_ = _rhs.lap_counter_;
return *this;
}
#if 0
/// construct from non-const circulator type
VertexOHalfedgeIterT(const VertexOHalfedgeIterT<Mesh>& _rhs) :
mesh_(_rhs.mesh_),
start_(_rhs.start_),
heh_(_rhs.heh_),
lap_counter_(_rhs.lap_counter_)
{ ; }
/// assign from non-const circulator
VertexOHalfedgeIterT& operator=(const VertexOHalfedgeIterT<Mesh>& _rhs)
{
mesh_ = _rhs.mesh_;
start_ = _rhs.start_;
heh_ = _rhs.heh_;
lap_counter_ = _rhs.lap_counter_;
return *this;
}
#else
friend class ConstVertexOHalfedgeIterT<Mesh>;
#endif
/// Equal ?
bool operator==(const VertexOHalfedgeIterT& _rhs) const {
return ((mesh_ == _rhs.mesh_) &&
(start_ == _rhs.start_) &&
(heh_ == _rhs.heh_) &&
(lap_counter_ == _rhs.lap_counter_));
}
/// Not equal ?
bool operator!=(const VertexOHalfedgeIterT& _rhs) const {
return !operator==(_rhs);
}
/// Pre-Increment (next cw target)
VertexOHalfedgeIterT& operator++() {
assert(mesh_);
heh_=mesh_->cw_rotated_halfedge_handle(heh_);
if(heh_ == start_) lap_counter_++;
return *this;
}
/// Pre-Decrement (next ccw target)
VertexOHalfedgeIterT& operator--() {
assert(mesh_);
if(heh_ == start_) lap_counter_--;
heh_=mesh_->ccw_rotated_halfedge_handle(heh_);
return *this;
}
/** Get the current halfedge. There are \c Vertex*Iters and \c
Face*Iters. For both the current state is defined by the
current halfedge. This is what this method returns.
*/
HalfedgeHandle current_halfedge_handle() const {
return heh_;
}
/// Return the handle of the current target.
typename Mesh::HalfedgeHandle handle() const {
assert(mesh_);
return heh_;
}
/// Cast to the handle of the current target.
operator typename Mesh::HalfedgeHandle() const {
assert(mesh_);
return heh_;
}
/// Return a reference to the current target.
reference operator*() const {
assert(mesh_);
return mesh_->deref(handle());
}
/// Return a pointer to the current target.
pointer operator->() const {
assert(mesh_);
return &mesh_->deref(handle());
}
/** Returns whether the circulator is still valid.
After one complete round around a vertex/face the circulator becomes
invalid, i.e. this function will return \c false. Nevertheless you
can continue circulating. This method just tells you whether you
have completed the first round.
*/
operator bool() const {
return heh_.is_valid() && ((start_ != heh_) || (lap_counter_ == 0));
}
protected:
mesh_ptr mesh_;
HalfedgeHandle start_, heh_;
int lap_counter_;
};