CirculatorsT.hh 91.3 KB
Newer Older
Jan Möbius's avatar
Jan Möbius committed
1 2 3
/*===========================================================================*\
 *                                                                           *
 *                               OpenMesh                                    *
Jan Möbius's avatar
Jan Möbius committed
4
 *      Copyright (C) 2001-2012 by Computer Graphics Group, RWTH Aachen      *
Jan Möbius's avatar
Jan Möbius committed
5 6 7
 *                           www.openmesh.org                                *
 *                                                                           *
 *---------------------------------------------------------------------------* 
8
 *  This file is part of OpenMesh.                                           *
Jan Möbius's avatar
Jan Möbius committed
9
 *                                                                           *
10 11 12 13 14
 *  OpenMesh is free software: you can redistribute it and/or modify         * 
 *  it under the terms of the GNU Lesser General Public License as           *
 *  published by the Free Software Foundation, either version 3 of           *
 *  the License, or (at your option) any later version with the              *
 *  following exceptions:                                                    *
Jan Möbius's avatar
Jan Möbius committed
15
 *                                                                           *
16 17 18 19 20 21 22
 *  If other files instantiate templates or use macros                       *
 *  or inline functions from this file, or you compile this file and         *
 *  link it with other files to produce an executable, this file does        *
 *  not by itself cause the resulting executable to be covered by the        *
 *  GNU Lesser General Public License. This exception does not however       *
 *  invalidate any other reasons why the executable file might be            *
 *  covered by the GNU Lesser General Public License.                        *
Jan Möbius's avatar
Jan Möbius committed
23
 *                                                                           *
24 25 26 27
 *  OpenMesh is distributed in the hope that it will be useful,              *
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of           *
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            *
 *  GNU Lesser General Public License for more details.                      *
Jan Möbius's avatar
Jan Möbius committed
28
 *                                                                           *
29 30 31 32 33 34 35 36 37 38
 *  You should have received a copy of the GNU LesserGeneral Public          *
 *  License along with OpenMesh.  If not,                                    *
 *  see <http://www.gnu.org/licenses/>.                                      *
 *                                                                           *
\*===========================================================================*/ 

/*===========================================================================*\
 *                                                                           *             
 *   $Revision$                                                         *
 *   $Date$                   *
Jan Möbius's avatar
Jan Möbius committed
39 40
 *                                                                           *
\*===========================================================================*/
41

Jan Möbius's avatar
Jan Möbius committed
42 43 44 45 46 47 48 49 50 51 52 53 54 55
#ifndef OPENMESH_CIRCULATORS_HH
#define OPENMESH_CIRCULATORS_HH
//=============================================================================
//
//  Vertex and Face circulators for PolyMesh/TriMesh
//
//=============================================================================



//== INCLUDES =================================================================

#include <OpenMesh/Core/System/config.h>
#include <assert.h>
56
#include <cstddef>
Jan Möbius's avatar
Jan Möbius committed
57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106


//== NAMESPACES ===============================================================

namespace OpenMesh {
namespace Iterators {


//== 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 ---

107
  typedef typename Mesh::HalfedgeHandle     HalfedgeHandle;
Jan Möbius's avatar
Jan Möbius committed
108

109
  typedef typename Mesh::Vertex             value_type;
110
  typedef typename Mesh::VertexHandle       value_handle;
Jan Möbius's avatar
Jan Möbius committed
111 112

#if 0
113
  typedef std::bidirectional_iterator_tag   iterator_category;
114
  typedef std::ptrdiff_t                    difference_type;
115 116 117 118
  typedef const Mesh&                       mesh_ref;
  typedef const Mesh*                       mesh_ptr;
  typedef const typename Mesh::Vertex&      reference;
  typedef const typename Mesh::Vertex*      pointer;
Jan Möbius's avatar
Jan Möbius committed
119
#else
120
  typedef std::bidirectional_iterator_tag   iterator_category;
121
  typedef std::ptrdiff_t                    difference_type;
122 123 124 125
  typedef Mesh&                             mesh_ref;
  typedef Mesh*                             mesh_ptr;
  typedef typename Mesh::Vertex&            reference;
  typedef typename Mesh::Vertex*            pointer;
Jan Möbius's avatar
Jan Möbius committed
126 127 128 129 130
#endif



  /// Default constructor
131
  VertexVertexIterT() : mesh_(0), lap_counter_(0) {}
Jan Möbius's avatar
Jan Möbius committed
132 133 134


  /// Construct with mesh and a typename Mesh::VertexHandle
135
  VertexVertexIterT(mesh_ref _mesh, typename Mesh::VertexHandle _start, bool _end = false) :
Jan Möbius's avatar
Jan Möbius committed
136 137 138
    mesh_(&_mesh), 
    start_(_mesh.halfedge_handle(_start)),
    heh_(start_),
139
    lap_counter_(_end)
Jan Möbius's avatar
Jan Möbius committed
140 141 142 143
  {  ; }


  /// Construct with mesh and start halfedge
144
  VertexVertexIterT(mesh_ref _mesh, HalfedgeHandle _heh, bool _end = false) :
Jan Möbius's avatar
Jan Möbius committed
145 146 147
    mesh_(&_mesh),
    start_(_heh),
    heh_(_heh),
148
    lap_counter_(_end)
Jan Möbius's avatar
Jan Möbius committed
149 150 151 152 153 154 155 156
  {  ; }


  /// Copy constructor
  VertexVertexIterT(const VertexVertexIterT& _rhs) :
    mesh_(_rhs.mesh_),
    start_(_rhs.start_),
    heh_(_rhs.heh_),
157
    lap_counter_(_rhs.lap_counter_)
Jan Möbius's avatar
Jan Möbius committed
158 159 160 161 162 163 164 165 166
  {  ; }


  /// Assignment operator
  VertexVertexIterT& operator=(const VertexVertexIterT<Mesh>& _rhs)
  {
    mesh_   = _rhs.mesh_;
    start_  = _rhs.start_;
    heh_    = _rhs.heh_;
167
    lap_counter_ = _rhs.lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
168 169 170 171 172 173 174 175 176 177
    return *this;
  }


#if 0
  /// construct from non-const circulator type
  VertexVertexIterT(const VertexVertexIterT<Mesh>& _rhs) :
    mesh_(_rhs.mesh_),
    start_(_rhs.start_),
    heh_(_rhs.heh_),
178
    lap_counter_(_rhs.lap_counter_)
Jan Möbius's avatar
Jan Möbius committed
179 180 181 182 183 184 185 186 187
  {  ; }


  /// assign from non-const circulator
  VertexVertexIterT& operator=(const VertexVertexIterT<Mesh>& _rhs)
  {
    mesh_   = _rhs.mesh_;
    start_  = _rhs.start_;
    heh_    = _rhs.heh_;
188
    lap_counter_ = _rhs.lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
189 190 191 192 193 194 195 196 197 198 199 200
    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_) &&
201
	    (lap_counter_ == _rhs.lap_counter_));
Jan Möbius's avatar
Jan Möbius committed
202 203 204 205 206 207 208 209 210 211 212 213
  }


  /// Not equal ?
  bool operator!=(const VertexVertexIterT& _rhs) const {
    return !operator==(_rhs);
  }


  /// Pre-Increment (next cw target)
  VertexVertexIterT& operator++() { 
    assert(mesh_);
214 215
    heh_=mesh_->cw_rotated_halfedge_handle(heh_);
    if(heh_ == start_) lap_counter_++;
Jan Möbius's avatar
Jan Möbius committed
216 217 218 219 220 221 222
    return *this;
  }


  /// Pre-Decrement (next ccw target)
  VertexVertexIterT& operator--() { 
    assert(mesh_);
223 224
    if(heh_ == start_) lap_counter_--;
    heh_=mesh_->ccw_rotated_halfedge_handle(heh_);
Jan Möbius's avatar
Jan Möbius committed
225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240
    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_);
241
    return mesh_->to_vertex_handle(heh_);
Jan Möbius's avatar
Jan Möbius committed
242 243 244 245 246 247
  }


  /// Cast to the handle of the current target.
  operator typename Mesh::VertexHandle() const {
    assert(mesh_);
248
    return mesh_->to_vertex_handle(heh_);
Jan Möbius's avatar
Jan Möbius committed
249 250 251 252
  }
    

  ///  Return a reference to the current target.
253 254 255
  reference operator*() const { 
    assert(mesh_);
    return mesh_->deref(handle());
Jan Möbius's avatar
Jan Möbius committed
256 257 258 259
  }


  /// Return a pointer to the current target.
260 261 262
  pointer operator->() const {
    assert(mesh_);
    return &mesh_->deref(handle());
Jan Möbius's avatar
Jan Möbius committed
263 264 265 266 267 268 269 270 271 272
  }


  /** 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 {
273
    return heh_.is_valid() && ((start_ != heh_) || (lap_counter_ == 0));
Jan Möbius's avatar
Jan Möbius committed
274 275 276 277 278 279 280
  }


protected:

  mesh_ptr         mesh_;
  HalfedgeHandle   start_, heh_;
281
  int              lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300
};



//== CLASS DEFINITION =========================================================

	      
/** \class ConstVertexVertexIterT CirculatorsT.hh <OpenMesh/Mesh/Iterators/CirculatorsT.hh>
    Circulator.
*/

template <class Mesh>
class ConstVertexVertexIterT
{
 public:


  //--- Typedefs ---

301
  typedef typename Mesh::HalfedgeHandle     HalfedgeHandle;
Jan Möbius's avatar
Jan Möbius committed
302

303 304
  typedef typename Mesh::Vertex             value_type;
  typedef typename Mesh::VertexHandle       value_handle;
Jan Möbius's avatar
Jan Möbius committed
305 306

#if 1
307
  typedef std::bidirectional_iterator_tag   iterator_category;
308
  typedef std::ptrdiff_t                    difference_type;
309 310 311 312
  typedef const Mesh&                       mesh_ref;
  typedef const Mesh*                       mesh_ptr;
  typedef const typename Mesh::Vertex&      reference;
  typedef const typename Mesh::Vertex*      pointer;
Jan Möbius's avatar
Jan Möbius committed
313
#else
314
  typedef std::bidirectional_iterator_tag   iterator_category;
315
  typedef std::ptrdiff_t                    difference_type;
316 317 318 319
  typedef Mesh&                             mesh_ref;
  typedef Mesh*                             mesh_ptr;
  typedef typename Mesh::Vertex&            reference;
  typedef typename Mesh::Vertex*            pointer;
Jan Möbius's avatar
Jan Möbius committed
320 321 322 323 324
#endif



  /// Default constructor
325
  ConstVertexVertexIterT() : mesh_(0), lap_counter_(0) {}
Jan Möbius's avatar
Jan Möbius committed
326 327 328


  /// Construct with mesh and a typename Mesh::VertexHandle
329
  ConstVertexVertexIterT(mesh_ref _mesh, typename Mesh::VertexHandle _start, bool _end = false) :
Jan Möbius's avatar
Jan Möbius committed
330 331 332
    mesh_(&_mesh), 
    start_(_mesh.halfedge_handle(_start)),
    heh_(start_),
333
    lap_counter_(_end)
Jan Möbius's avatar
Jan Möbius committed
334 335 336 337
  {  ; }


  /// Construct with mesh and start halfedge
338
  ConstVertexVertexIterT(mesh_ref _mesh, HalfedgeHandle _heh, bool _end = false) :
Jan Möbius's avatar
Jan Möbius committed
339 340 341
    mesh_(&_mesh),
    start_(_heh),
    heh_(_heh),
342
    lap_counter_(_end)
Jan Möbius's avatar
Jan Möbius committed
343 344 345 346 347 348 349 350
  {  ; }


  /// Copy constructor
  ConstVertexVertexIterT(const ConstVertexVertexIterT& _rhs) :
    mesh_(_rhs.mesh_),
    start_(_rhs.start_),
    heh_(_rhs.heh_),
351
    lap_counter_(_rhs.lap_counter_)
Jan Möbius's avatar
Jan Möbius committed
352 353 354 355 356 357 358 359 360
  {  ; }


  /// Assignment operator
  ConstVertexVertexIterT& operator=(const ConstVertexVertexIterT<Mesh>& _rhs)
  {
    mesh_   = _rhs.mesh_;
    start_  = _rhs.start_;
    heh_    = _rhs.heh_;
361
    lap_counter_ = _rhs.lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
362 363 364 365 366 367 368 369 370 371
    return *this;
  }


#if 1
  /// construct from non-const circulator type
  ConstVertexVertexIterT(const VertexVertexIterT<Mesh>& _rhs) :
    mesh_(_rhs.mesh_),
    start_(_rhs.start_),
    heh_(_rhs.heh_),
372
    lap_counter_(_rhs.lap_counter_)
Jan Möbius's avatar
Jan Möbius committed
373 374 375 376 377 378 379 380 381
  {  ; }


  /// assign from non-const circulator
  ConstVertexVertexIterT& operator=(const VertexVertexIterT<Mesh>& _rhs)
  {
    mesh_   = _rhs.mesh_;
    start_  = _rhs.start_;
    heh_    = _rhs.heh_;
382
    lap_counter_ = _rhs.lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
383 384 385 386 387 388 389 390 391 392 393 394
    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_) &&
395
	    (lap_counter_ == _rhs.lap_counter_));
Jan Möbius's avatar
Jan Möbius committed
396 397 398 399 400 401 402 403 404 405 406 407
  }


  /// Not equal ?
  bool operator!=(const ConstVertexVertexIterT& _rhs) const {
    return !operator==(_rhs);
  }


  /// Pre-Increment (next cw target)
  ConstVertexVertexIterT& operator++() { 
    assert(mesh_);
408 409
    heh_=mesh_->cw_rotated_halfedge_handle(heh_);
    if(heh_ == start_) lap_counter_++;
Jan Möbius's avatar
Jan Möbius committed
410 411 412 413 414 415 416
    return *this;
  }


  /// Pre-Decrement (next ccw target)
  ConstVertexVertexIterT& operator--() { 
    assert(mesh_);
417 418
    if(heh_ == start_) lap_counter_--;
    heh_=mesh_->ccw_rotated_halfedge_handle(heh_);
Jan Möbius's avatar
Jan Möbius committed
419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434
    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_);
435
    return mesh_->to_vertex_handle(heh_);
Jan Möbius's avatar
Jan Möbius committed
436 437 438 439 440 441
  }


  /// Cast to the handle of the current target.
  operator typename Mesh::VertexHandle() const {
    assert(mesh_);
442
    return mesh_->to_vertex_handle(heh_);
Jan Möbius's avatar
Jan Möbius committed
443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466
  }
    

  ///  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 { 
467
    return heh_.is_valid() && ((start_ != heh_) || (lap_counter_ == 0));
Jan Möbius's avatar
Jan Möbius committed
468 469 470 471 472 473 474
  }


protected:

  mesh_ptr         mesh_;
  HalfedgeHandle   start_, heh_;
475
  int              lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494
};



//== CLASS DEFINITION =========================================================


/** \class VertexOHalfedgeIterT CirculatorsT.hh <OpenMesh/Mesh/Iterators/CirculatorsT.hh>
    Circulator.
*/

template <class Mesh>
class VertexOHalfedgeIterT
{
 public:


  //--- Typedefs ---

495
  typedef typename Mesh::HalfedgeHandle     HalfedgeHandle;
Jan Möbius's avatar
Jan Möbius committed
496 497

  typedef typename Mesh::Halfedge           value_type;
498
  typedef typename Mesh::HalfedgeHandle     value_handle;
Jan Möbius's avatar
Jan Möbius committed
499 500

#if 0
501
  typedef std::bidirectional_iterator_tag   iterator_category;
502
  typedef std::ptrdiff_t                    difference_type;
503 504 505 506
  typedef const Mesh&                       mesh_ref;
  typedef const Mesh*                       mesh_ptr;
  typedef const typename Mesh::Halfedge&    reference;
  typedef const typename Mesh::Halfedge*    pointer;
Jan Möbius's avatar
Jan Möbius committed
507
#else
508
  typedef std::bidirectional_iterator_tag   iterator_category;
509
  typedef std::ptrdiff_t                    difference_type;
510 511 512 513
  typedef Mesh&                             mesh_ref;
  typedef Mesh*                             mesh_ptr;
  typedef typename Mesh::Halfedge&          reference;
  typedef typename Mesh::Halfedge*          pointer;
Jan Möbius's avatar
Jan Möbius committed
514 515 516 517 518
#endif



  /// Default constructor
519
  VertexOHalfedgeIterT() : mesh_(0), lap_counter_(false) {}
Jan Möbius's avatar
Jan Möbius committed
520 521 522


  /// Construct with mesh and a typename Mesh::VertexHandle
523
  VertexOHalfedgeIterT(mesh_ref _mesh, typename Mesh::VertexHandle _start, bool _end = false) :
Jan Möbius's avatar
Jan Möbius committed
524 525 526
    mesh_(&_mesh), 
    start_(_mesh.halfedge_handle(_start)),
    heh_(start_),
527
    lap_counter_(_end)
Jan Möbius's avatar
Jan Möbius committed
528 529 530 531
  {  ; }


  /// Construct with mesh and start halfedge
532
  VertexOHalfedgeIterT(mesh_ref _mesh, HalfedgeHandle _heh, bool _end = false) :
Jan Möbius's avatar
Jan Möbius committed
533 534 535
    mesh_(&_mesh),
    start_(_heh),
    heh_(_heh),
536
    lap_counter_(_end)
Jan Möbius's avatar
Jan Möbius committed
537 538 539 540 541 542 543 544
  {  ; }


  /// Copy constructor
  VertexOHalfedgeIterT(const VertexOHalfedgeIterT& _rhs) :
    mesh_(_rhs.mesh_),
    start_(_rhs.start_),
    heh_(_rhs.heh_),
545
    lap_counter_(_rhs.lap_counter_)
Jan Möbius's avatar
Jan Möbius committed
546 547 548 549 550 551 552 553 554
  {  ; }


  /// Assignment operator
  VertexOHalfedgeIterT& operator=(const VertexOHalfedgeIterT<Mesh>& _rhs)
  {
    mesh_   = _rhs.mesh_;
    start_  = _rhs.start_;
    heh_    = _rhs.heh_;
555
    lap_counter_ = _rhs.lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
556 557 558 559 560 561 562 563 564 565
    return *this;
  }


#if 0
  /// construct from non-const circulator type
  VertexOHalfedgeIterT(const VertexOHalfedgeIterT<Mesh>& _rhs) :
    mesh_(_rhs.mesh_),
    start_(_rhs.start_),
    heh_(_rhs.heh_),
566
    lap_counter_(_rhs.lap_counter_)
Jan Möbius's avatar
Jan Möbius committed
567 568 569 570 571 572 573 574 575
  {  ; }


  /// assign from non-const circulator
  VertexOHalfedgeIterT& operator=(const VertexOHalfedgeIterT<Mesh>& _rhs)
  {
    mesh_   = _rhs.mesh_;
    start_  = _rhs.start_;
    heh_    = _rhs.heh_;
576
    lap_counter_ = _rhs.lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
577 578 579 580 581 582 583 584 585 586 587 588
    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_) &&
589
	    (lap_counter_ == _rhs.lap_counter_));
Jan Möbius's avatar
Jan Möbius committed
590 591 592 593 594 595 596 597 598 599 600 601
  }


  /// Not equal ?
  bool operator!=(const VertexOHalfedgeIterT& _rhs) const {
    return !operator==(_rhs);
  }


  /// Pre-Increment (next cw target)
  VertexOHalfedgeIterT& operator++() { 
    assert(mesh_);
602 603
    heh_=mesh_->cw_rotated_halfedge_handle(heh_);
    if(heh_ == start_) lap_counter_++;
Jan Möbius's avatar
Jan Möbius committed
604 605 606 607 608 609 610
    return *this;
  }


  /// Pre-Decrement (next ccw target)
  VertexOHalfedgeIterT& operator--() { 
    assert(mesh_);
611 612
    if(heh_ == start_) lap_counter_--;
    heh_=mesh_->ccw_rotated_halfedge_handle(heh_);
Jan Möbius's avatar
Jan Möbius committed
613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660
    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 { 
661
    return heh_.is_valid() && ((start_ != heh_) || (lap_counter_ == 0));
Jan Möbius's avatar
Jan Möbius committed
662 663 664 665 666 667 668
  }


protected:

  mesh_ptr         mesh_;
  HalfedgeHandle   start_, heh_;
669
  int              lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688
};



//== CLASS DEFINITION =========================================================

	      
/** \class ConstVertexOHalfedgeIterT CirculatorsT.hh <OpenMesh/Mesh/Iterators/CirculatorsT.hh>
    Circulator.
*/

template <class Mesh>
class ConstVertexOHalfedgeIterT
{
 public:


  //--- Typedefs ---

689
  typedef typename Mesh::HalfedgeHandle     HalfedgeHandle;
Jan Möbius's avatar
Jan Möbius committed
690 691

  typedef typename Mesh::Halfedge           value_type;
692
  typedef typename Mesh::HalfedgeHandle     value_handle;
Jan Möbius's avatar
Jan Möbius committed
693 694

#if 1
695
  typedef std::bidirectional_iterator_tag   iterator_category;
696
  typedef std::ptrdiff_t                    difference_type;
697 698 699 700
  typedef const Mesh&                       mesh_ref;
  typedef const Mesh*                       mesh_ptr;
  typedef const typename Mesh::Halfedge&    reference;
  typedef const typename Mesh::Halfedge*    pointer;
Jan Möbius's avatar
Jan Möbius committed
701
#else
702
  typedef std::bidirectional_iterator_tag   iterator_category;
703
  typedef std::ptrdiff_t                    difference_type;
704 705 706 707
  typedef Mesh&                             mesh_ref;
  typedef Mesh*                             mesh_ptr;
  typedef typename Mesh::Halfedge&          reference;
  typedef typename Mesh::Halfedge*          pointer;
Jan Möbius's avatar
Jan Möbius committed
708 709 710 711 712
#endif



  /// Default constructor
713
  ConstVertexOHalfedgeIterT() : mesh_(0), lap_counter_(false) {}
Jan Möbius's avatar
Jan Möbius committed
714 715 716


  /// Construct with mesh and a typename Mesh::VertexHandle
717
  ConstVertexOHalfedgeIterT(mesh_ref _mesh, typename Mesh::VertexHandle _start, bool _end = false) :
Jan Möbius's avatar
Jan Möbius committed
718 719 720
    mesh_(&_mesh), 
    start_(_mesh.halfedge_handle(_start)),
    heh_(start_),
721
    lap_counter_(_end)
Jan Möbius's avatar
Jan Möbius committed
722 723 724 725
  {  ; }


  /// Construct with mesh and start halfedge
726
  ConstVertexOHalfedgeIterT(mesh_ref _mesh, HalfedgeHandle _heh, bool _end = false) :
Jan Möbius's avatar
Jan Möbius committed
727 728 729
    mesh_(&_mesh),
    start_(_heh),
    heh_(_heh),
730
    lap_counter_(_end)
Jan Möbius's avatar
Jan Möbius committed
731 732 733 734 735 736 737 738
  {  ; }


  /// Copy constructor
  ConstVertexOHalfedgeIterT(const ConstVertexOHalfedgeIterT& _rhs) :
    mesh_(_rhs.mesh_),
    start_(_rhs.start_),
    heh_(_rhs.heh_),
739
    lap_counter_(_rhs.lap_counter_)
Jan Möbius's avatar
Jan Möbius committed
740 741 742 743 744 745 746 747 748
  {  ; }


  /// Assignment operator
  ConstVertexOHalfedgeIterT& operator=(const ConstVertexOHalfedgeIterT<Mesh>& _rhs)
  {
    mesh_   = _rhs.mesh_;
    start_  = _rhs.start_;
    heh_    = _rhs.heh_;
749
    lap_counter_ = _rhs.lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
750 751 752 753 754 755 756 757 758 759
    return *this;
  }


#if 1
  /// construct from non-const circulator type
  ConstVertexOHalfedgeIterT(const VertexOHalfedgeIterT<Mesh>& _rhs) :
    mesh_(_rhs.mesh_),
    start_(_rhs.start_),
    heh_(_rhs.heh_),
760
    lap_counter_(_rhs.lap_counter_)
Jan Möbius's avatar
Jan Möbius committed
761 762 763 764 765 766 767 768 769
  {  ; }


  /// assign from non-const circulator
  ConstVertexOHalfedgeIterT& operator=(const VertexOHalfedgeIterT<Mesh>& _rhs)
  {
    mesh_   = _rhs.mesh_;
    start_  = _rhs.start_;
    heh_    = _rhs.heh_;
770
    lap_counter_ = _rhs.lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
771 772 773 774 775 776 777 778 779 780 781 782
    return *this;
  }
#else
  friend class ConstVertexOHalfedgeIterT<Mesh>;
#endif  


  /// Equal ?
  bool operator==(const ConstVertexOHalfedgeIterT& _rhs) const {
    return ((mesh_   == _rhs.mesh_) &&
	    (start_  == _rhs.start_) &&
	    (heh_    == _rhs.heh_) &&
783
	    (lap_counter_ == _rhs.lap_counter_));
Jan Möbius's avatar
Jan Möbius committed
784 785 786 787 788 789 790 791 792 793 794 795
  }


  /// Not equal ?
  bool operator!=(const ConstVertexOHalfedgeIterT& _rhs) const {
    return !operator==(_rhs);
  }


  /// Pre-Increment (next cw target)
  ConstVertexOHalfedgeIterT& operator++() { 
    assert(mesh_);
796 797
    heh_=mesh_->cw_rotated_halfedge_handle(heh_);
    if(heh_ == start_) lap_counter_++;
Jan Möbius's avatar
Jan Möbius committed
798 799 800 801 802 803 804
    return *this;
  }


  /// Pre-Decrement (next ccw target)
  ConstVertexOHalfedgeIterT& operator--() { 
    assert(mesh_);
805 806
    if(heh_ == start_) lap_counter_--;
    heh_=mesh_->ccw_rotated_halfedge_handle(heh_);
Jan Möbius's avatar
Jan Möbius committed
807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854
    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 { 
855
    return heh_.is_valid() && ((start_ != heh_) || (lap_counter_ == 0));
Jan Möbius's avatar
Jan Möbius committed
856 857 858 859 860 861 862
  }


protected:

  mesh_ptr         mesh_;
  HalfedgeHandle   start_, heh_;
863
  int              lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882
};



//== CLASS DEFINITION =========================================================

	      
/** \class VertexIHalfedgeIterT CirculatorsT.hh <OpenMesh/Mesh/Iterators/CirculatorsT.hh>
    Circulator.
*/

template <class Mesh>
class VertexIHalfedgeIterT
{
 public:


  //--- Typedefs ---

883
  typedef typename Mesh::HalfedgeHandle     HalfedgeHandle;
Jan Möbius's avatar
Jan Möbius committed
884 885

  typedef typename Mesh::Halfedge           value_type;
886
  typedef typename Mesh::HalfedgeHandle     value_handle;
Jan Möbius's avatar
Jan Möbius committed
887 888

#if 0
889
  typedef std::bidirectional_iterator_tag   iterator_category;
890
  typedef std::ptrdiff_t                    difference_type;
891 892 893 894
  typedef const Mesh&                       mesh_ref;
  typedef const Mesh*                       mesh_ptr;
  typedef const typename Mesh::Halfedge&    reference;
  typedef const typename Mesh::Halfedge*    pointer;
Jan Möbius's avatar
Jan Möbius committed
895
#else
896
  typedef std::bidirectional_iterator_tag   iterator_category;
897
  typedef std::ptrdiff_t                    difference_type;
898 899 900 901
  typedef Mesh&                             mesh_ref;
  typedef Mesh*                             mesh_ptr;
  typedef typename Mesh::Halfedge&          reference;
  typedef typename Mesh::Halfedge*          pointer;
Jan Möbius's avatar
Jan Möbius committed
902 903 904 905 906
#endif



  /// Default constructor
907
  VertexIHalfedgeIterT() : mesh_(0), lap_counter_(false) {}
Jan Möbius's avatar
Jan Möbius committed
908 909 910


  /// Construct with mesh and a typename Mesh::VertexHandle
911
  VertexIHalfedgeIterT(mesh_ref _mesh, typename Mesh::VertexHandle _start, bool _end = false) :
Jan Möbius's avatar
Jan Möbius committed
912 913 914
    mesh_(&_mesh), 
    start_(_mesh.halfedge_handle(_start)),
    heh_(start_),
915
    lap_counter_(_end)
Jan Möbius's avatar
Jan Möbius committed
916 917 918 919
  {  ; }


  /// Construct with mesh and start halfedge
920
  VertexIHalfedgeIterT(mesh_ref _mesh, HalfedgeHandle _heh, bool _end = false) :
Jan Möbius's avatar
Jan Möbius committed
921 922 923
    mesh_(&_mesh),
    start_(_heh),
    heh_(_heh),
924
    lap_counter_(_end)
Jan Möbius's avatar
Jan Möbius committed
925 926 927 928 929 930 931 932
  {  ; }


  /// Copy constructor
  VertexIHalfedgeIterT(const VertexIHalfedgeIterT& _rhs) :
    mesh_(_rhs.mesh_),
    start_(_rhs.start_),
    heh_(_rhs.heh_),
933
    lap_counter_(_rhs.lap_counter_)
Jan Möbius's avatar
Jan Möbius committed
934 935 936 937 938 939 940 941 942
  {  ; }


  /// Assignment operator
  VertexIHalfedgeIterT& operator=(const VertexIHalfedgeIterT<Mesh>& _rhs)
  {
    mesh_   = _rhs.mesh_;
    start_  = _rhs.start_;
    heh_    = _rhs.heh_;
943
    lap_counter_ = _rhs.lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
944 945 946 947 948 949 950 951 952 953
    return *this;
  }


#if 0
  /// construct from non-const circulator type
  VertexIHalfedgeIterT(const VertexIHalfedgeIterT<Mesh>& _rhs) :
    mesh_(_rhs.mesh_),
    start_(_rhs.start_),
    heh_(_rhs.heh_),
954
    lap_counter_(_rhs.lap_counter_)
Jan Möbius's avatar
Jan Möbius committed
955 956 957 958 959 960 961 962 963
  {  ; }


  /// assign from non-const circulator
  VertexIHalfedgeIterT& operator=(const VertexIHalfedgeIterT<Mesh>& _rhs)
  {
    mesh_   = _rhs.mesh_;
    start_  = _rhs.start_;
    heh_    = _rhs.heh_;
964
    lap_counter_ = _rhs.lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
965 966 967 968 969 970 971 972 973 974 975 976
    return *this;
  }
#else
  friend class ConstVertexIHalfedgeIterT<Mesh>;
#endif  


  /// Equal ?
  bool operator==(const VertexIHalfedgeIterT& _rhs) const {
    return ((mesh_   == _rhs.mesh_) &&
	    (start_  == _rhs.start_) &&
	    (heh_    == _rhs.heh_) &&
977
	    (lap_counter_ == _rhs.lap_counter_));
Jan Möbius's avatar
Jan Möbius committed
978 979 980 981 982 983 984 985 986 987 988 989
  }


  /// Not equal ?
  bool operator!=(const VertexIHalfedgeIterT& _rhs) const {
    return !operator==(_rhs);
  }


  /// Pre-Increment (next cw target)
  VertexIHalfedgeIterT& operator++() { 
    assert(mesh_);
990 991
    heh_=mesh_->cw_rotated_halfedge_handle(heh_);
    if(heh_ == start_) lap_counter_++;
Jan Möbius's avatar
Jan Möbius committed
992 993 994 995 996 997 998
    return *this;
  }


  /// Pre-Decrement (next ccw target)
  VertexIHalfedgeIterT& operator--() { 
    assert(mesh_);
999 1000
    if(heh_ == start_) lap_counter_--;
    heh_=mesh_->ccw_rotated_halfedge_handle(heh_);
Jan Möbius's avatar
Jan Möbius committed
1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048
    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 mesh_->opposite_halfedge_handle(heh_); 
  }


  /// Cast to the handle of the current target.
  operator typename Mesh::HalfedgeHandle() const {
    assert(mesh_);
    return mesh_->opposite_halfedge_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 { 
1049
    return heh_.is_valid() && ((start_ != heh_) || (lap_counter_ == 0));
Jan Möbius's avatar
Jan Möbius committed
1050 1051 1052 1053 1054 1055 1056
  }


protected:

  mesh_ptr         mesh_;
  HalfedgeHandle   start_, heh_;
1057
  int              lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076
};



//== CLASS DEFINITION =========================================================


/** \class ConstVertexIHalfedgeIterT CirculatorsT.hh <OpenMesh/Mesh/Iterators/CirculatorsT.hh>
    Circulator.
*/

template <class Mesh>
class ConstVertexIHalfedgeIterT
{
 public:


  //--- Typedefs ---

1077
  typedef typename Mesh::HalfedgeHandle     HalfedgeHandle;
Jan Möbius's avatar
Jan Möbius committed
1078 1079

  typedef typename Mesh::Halfedge           value_type;
1080
  typedef typename Mesh::HalfedgeHandle     value_handle;
Jan Möbius's avatar
Jan Möbius committed
1081 1082

#if 1
1083
  typedef std::bidirectional_iterator_tag   iterator_category;
1084
  typedef std::ptrdiff_t                    difference_type;
1085 1086 1087 1088
  typedef const Mesh&                       mesh_ref;
  typedef const Mesh*                       mesh_ptr;
  typedef const typename Mesh::Halfedge&    reference;
  typedef const typename Mesh::Halfedge*    pointer;
Jan Möbius's avatar
Jan Möbius committed
1089
#else
1090
  typedef std::bidirectional_iterator_tag   iterator_category;
1091
  typedef std::ptrdiff_t                    difference_type;
1092 1093 1094 1095
  typedef Mesh&                             mesh_ref;
  typedef Mesh*                             mesh_ptr;
  typedef typename Mesh::Halfedge&          reference;
  typedef typename Mesh::Halfedge*          pointer;
Jan Möbius's avatar
Jan Möbius committed
1096 1097 1098 1099 1100
#endif



  /// Default constructor
1101
  ConstVertexIHalfedgeIterT() : mesh_(0), lap_counter_(false) {}
Jan Möbius's avatar
Jan Möbius committed
1102 1103 1104


  /// Construct with mesh and a typename Mesh::VertexHandle
1105
  ConstVertexIHalfedgeIterT(mesh_ref _mesh, typename Mesh::VertexHandle _start, bool _end = false) :
Jan Möbius's avatar
Jan Möbius committed
1106 1107 1108
    mesh_(&_mesh), 
    start_(_mesh.halfedge_handle(_start)),
    heh_(start_),
1109
    lap_counter_(_end)
Jan Möbius's avatar
Jan Möbius committed
1110 1111 1112 1113
  {  ; }


  /// Construct with mesh and start halfedge
1114
  ConstVertexIHalfedgeIterT(mesh_ref _mesh, HalfedgeHandle _heh, bool _end = false) :
Jan Möbius's avatar
Jan Möbius committed
1115 1116 1117
    mesh_(&_mesh),
    start_(_heh),
    heh_(_heh),
1118
    lap_counter_(_end)
Jan Möbius's avatar
Jan Möbius committed
1119 1120 1121 1122 1123 1124 1125 1126
  {  ; }


  /// Copy constructor
  ConstVertexIHalfedgeIterT(const ConstVertexIHalfedgeIterT& _rhs) :
    mesh_(_rhs.mesh_),
    start_(_rhs.start_),
    heh_(_rhs.heh_),
1127
    lap_counter_(_rhs.lap_counter_)
Jan Möbius's avatar
Jan Möbius committed
1128 1129 1130 1131 1132 1133 1134 1135 1136
  {  ; }


  /// Assignment operator
  ConstVertexIHalfedgeIterT& operator=(const ConstVertexIHalfedgeIterT<Mesh>& _rhs)
  {
    mesh_   = _rhs.mesh_;
    start_  = _rhs.start_;
    heh_    = _rhs.heh_;
1137
    lap_counter_ = _rhs.lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
1138 1139 1140 1141 1142 1143 1144 1145 1146 1147
    return *this;
  }


#if 1
  /// construct from non-const circulator type
  ConstVertexIHalfedgeIterT(const VertexIHalfedgeIterT<Mesh>& _rhs) :
    mesh_(_rhs.mesh_),
    start_(_rhs.start_),
    heh_(_rhs.heh_),
1148
    lap_counter_(_rhs.lap_counter_)
Jan Möbius's avatar
Jan Möbius committed
1149 1150 1151 1152 1153 1154 1155 1156 1157
  {  ; }


  /// assign from non-const circulator
  ConstVertexIHalfedgeIterT& operator=(const VertexIHalfedgeIterT<Mesh>& _rhs)
  {
    mesh_   = _rhs.mesh_;
    start_  = _rhs.start_;
    heh_    = _rhs.heh_;
1158
    lap_counter_ = _rhs.lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170
    return *this;
  }
#else
  friend class ConstVertexIHalfedgeIterT<Mesh>;
#endif  


  /// Equal ?
  bool operator==(const ConstVertexIHalfedgeIterT& _rhs) const {
    return ((mesh_   == _rhs.mesh_) &&
	    (start_  == _rhs.start_) &&
	    (heh_    == _rhs.heh_) &&
1171
	    (lap_counter_ == _rhs.lap_counter_));
Jan Möbius's avatar
Jan Möbius committed
1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183
  }


  /// Not equal ?
  bool operator!=(const ConstVertexIHalfedgeIterT& _rhs) const {
    return !operator==(_rhs);
  }


  /// Pre-Increment (next cw target)
  ConstVertexIHalfedgeIterT& operator++() { 
    assert(mesh_);
1184 1185
    heh_=mesh_->cw_rotated_halfedge_handle(heh_);
    if(heh_ == start_) lap_counter_++;
Jan Möbius's avatar
Jan Möbius committed
1186 1187 1188 1189 1190 1191 1192
    return *this;
  }


  /// Pre-Decrement (next ccw target)
  ConstVertexIHalfedgeIterT& operator--() { 
    assert(mesh_);
1193 1194
    if(heh_ == start_) lap_counter_--;
    heh_=mesh_->ccw_rotated_halfedge_handle(heh_);
Jan Möbius's avatar
Jan Möbius committed
1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242
    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 mesh_->opposite_halfedge_handle(heh_); 
  }


  /// Cast to the handle of the current target.
  operator typename Mesh::HalfedgeHandle() const {
    assert(mesh_);
    return mesh_->opposite_halfedge_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 { 
1243
    return heh_.is_valid() && ((start_ != heh_) || (lap_counter_ == 0));
Jan Möbius's avatar
Jan Möbius committed
1244 1245 1246 1247 1248 1249 1250
  }


protected:

  mesh_ptr         mesh_;
  HalfedgeHandle   start_, heh_;
1251
  int              lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270
};



//== CLASS DEFINITION =========================================================

	      
/** \class VertexEdgeIterT CirculatorsT.hh <OpenMesh/Mesh/Iterators/CirculatorsT.hh>
    Circulator.
*/

template <class Mesh>
class VertexEdgeIterT
{
 public:


  //--- Typedefs ---

1271
  typedef typename Mesh::HalfedgeHandle     HalfedgeHandle;
Jan Möbius's avatar
Jan Möbius committed
1272

1273
  typedef typename Mesh::Edge               value_type;
Jan Möbius's avatar
Jan Möbius committed
1274 1275 1276
  typedef typename Mesh::EdgeHandle         value_handle;

#if 0
1277
  typedef std::bidirectional_iterator_tag   iterator_category;
1278
  typedef std::ptrdiff_t                    difference_type;
1279 1280 1281 1282
  typedef const Mesh&                       mesh_ref;
  typedef const Mesh*                       mesh_ptr;
  typedef const typename Mesh::Edge&        reference;
  typedef const typename Mesh::Edge*        pointer;
Jan Möbius's avatar
Jan Möbius committed
1283
#else
1284
  typedef std::bidirectional_iterator_tag   iterator_category;
1285
  typedef std::ptrdiff_t                    difference_type;
1286 1287 1288 1289
  typedef Mesh&                             mesh_ref;
  typedef Mesh*                             mesh_ptr;
  typedef typename Mesh::Edge&              reference;
  typedef typename Mesh::Edge*              pointer;
Jan Möbius's avatar
Jan Möbius committed
1290 1291 1292 1293 1294
#endif



  /// Default constructor
1295
  VertexEdgeIterT() : mesh_(0), lap_counter_(false) {}
Jan Möbius's avatar
Jan Möbius committed
1296 1297 1298


  /// Construct with mesh and a typename Mesh::VertexHandle
1299
  VertexEdgeIterT(mesh_ref _mesh, typename Mesh::VertexHandle _start, bool _end = false) :
Jan Möbius's avatar
Jan Möbius committed
1300 1301 1302
    mesh_(&_mesh), 
    start_(_mesh.halfedge_handle(_start)),
    heh_(start_),
1303
    lap_counter_(_end)
Jan Möbius's avatar
Jan Möbius committed
1304 1305 1306 1307
  {  ; }


  /// Construct with mesh and start halfedge
1308
  VertexEdgeIterT(mesh_ref _mesh, HalfedgeHandle _heh, bool _end = false) :
Jan Möbius's avatar
Jan Möbius committed
1309 1310 1311
    mesh_(&_mesh),
    start_(_heh),
    heh_(_heh),
1312
    lap_counter_(_end)
Jan Möbius's avatar
Jan Möbius committed
1313 1314 1315 1316 1317 1318 1319 1320
  {  ; }


  /// Copy constructor
  VertexEdgeIterT(const VertexEdgeIterT& _rhs) :
    mesh_(_rhs.mesh_),
    start_(_rhs.start_),
    heh_(_rhs.heh_),
1321
    lap_counter_(_rhs.lap_counter_)
Jan Möbius's avatar
Jan Möbius committed
1322 1323 1324 1325 1326 1327 1328 1329 1330
  {  ; }


  /// Assignment operator
  VertexEdgeIterT& operator=(const VertexEdgeIterT<Mesh>& _rhs)
  {
    mesh_   = _rhs.mesh_;
    start_  = _rhs.start_;
    heh_    = _rhs.heh_;
1331
    lap_counter_ = _rhs.lap_counter_;
Jan Möbius's avatar
Jan Möbius committed
1332 1333 1334 1335 1336 1337 1338 1339 1340 1341
    return *this;
  }


#if 0
  /// construct from non-const circulator type
  VertexEdgeIterT(const VertexEdgeIterT<Mesh>& _rhs) :
    mesh_(_rhs.mesh_),
    start_(_rhs.start_),
    heh_(_rhs.heh_),
1342
    lap_counter_(_rhs.lap_counter_)
Jan Möbius's avatar
Jan Möbius committed
1343 1344 1345 1346 1347 1348 1349 1350 1351
  {  ; }


  /// assign from non-const circulator
  VertexEdgeIterT& operator=(const VertexEdgeIterT<Mesh>& _rhs)
  {
    mesh_   = _rhs.mesh_;
    start_  = _rhs.start_;
    heh_    = _rhs.heh_;
1352
    lap_counter_ = _rhs.lap_counter_;