diff --git a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.cc b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.cc index a6508249..927dea9b 100644 --- a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.cc +++ b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh index 3311521b..82499dd5 100644 --- a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh +++ b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/Decimating/decimater.cc b/src/OpenMesh/Apps/Decimating/decimater.cc index 313c33f8..042450e3 100644 --- a/src/OpenMesh/Apps/Decimating/decimater.cc +++ b/src/OpenMesh/Apps/Decimating/decimater.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/Decimating/decimaterviewer.cc b/src/OpenMesh/Apps/Decimating/decimaterviewer.cc index 13cfed8c..7c7e2dec 100644 --- a/src/OpenMesh/Apps/Decimating/decimaterviewer.cc +++ b/src/OpenMesh/Apps/Decimating/decimaterviewer.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/Dualizer/dualizer.cc b/src/OpenMesh/Apps/Dualizer/dualizer.cc index e5fcd642..42706286 100644 --- a/src/OpenMesh/Apps/Dualizer/dualizer.cc +++ b/src/OpenMesh/Apps/Dualizer/dualizer.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.cc b/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.cc index 7bd4b288..977fffe7 100644 --- a/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.cc +++ b/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh b/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh index c62201af..09312025 100644 --- a/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh +++ b/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/ProgViewer/progviewer.cc b/src/OpenMesh/Apps/ProgViewer/progviewer.cc index d09e8c1f..c249e0f8 100644 --- a/src/OpenMesh/Apps/ProgViewer/progviewer.cc +++ b/src/OpenMesh/Apps/ProgViewer/progviewer.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/QtViewer/MeshViewerWidget.cc b/src/OpenMesh/Apps/QtViewer/MeshViewerWidget.cc index 7385e596..f7f99301 100644 --- a/src/OpenMesh/Apps/QtViewer/MeshViewerWidget.cc +++ b/src/OpenMesh/Apps/QtViewer/MeshViewerWidget.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/QtViewer/MeshViewerWidget.hh b/src/OpenMesh/Apps/QtViewer/MeshViewerWidget.hh index 706fc0c9..1d4a48a4 100644 --- a/src/OpenMesh/Apps/QtViewer/MeshViewerWidget.hh +++ b/src/OpenMesh/Apps/QtViewer/MeshViewerWidget.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh index d7223cd7..c55d519d 100644 --- a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh +++ b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh index 339e3ac4..29b6d987 100644 --- a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh +++ b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc b/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc index bf1f6973..431825ab 100644 --- a/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc +++ b/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh b/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh index ddef0faa..9d7287c3 100644 --- a/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh +++ b/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/QtViewer/meshviewer.cc b/src/OpenMesh/Apps/QtViewer/meshviewer.cc index 8593bc8a..5fd4c48e 100644 --- a/src/OpenMesh/Apps/QtViewer/meshviewer.cc +++ b/src/OpenMesh/Apps/QtViewer/meshviewer.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/Smoothing/smooth.cc b/src/OpenMesh/Apps/Smoothing/smooth.cc index 76a0e273..a50de6f0 100644 --- a/src/OpenMesh/Apps/Smoothing/smooth.cc +++ b/src/OpenMesh/Apps/Smoothing/smooth.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/Subdivider/MeshViewerWidget.hh b/src/OpenMesh/Apps/Subdivider/MeshViewerWidget.hh index e8e96ca7..c62ebdbf 100644 --- a/src/OpenMesh/Apps/Subdivider/MeshViewerWidget.hh +++ b/src/OpenMesh/Apps/Subdivider/MeshViewerWidget.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc b/src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc index 64a9fcdc..090ea928 100644 --- a/src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc +++ b/src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/Subdivider/SubdivideWidget.hh b/src/OpenMesh/Apps/Subdivider/SubdivideWidget.hh index 2a247596..6ec2a1da 100644 --- a/src/OpenMesh/Apps/Subdivider/SubdivideWidget.hh +++ b/src/OpenMesh/Apps/Subdivider/SubdivideWidget.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/Subdivider/adaptive_subdivider.cc b/src/OpenMesh/Apps/Subdivider/adaptive_subdivider.cc index 809d5dac..fab4fb1c 100644 --- a/src/OpenMesh/Apps/Subdivider/adaptive_subdivider.cc +++ b/src/OpenMesh/Apps/Subdivider/adaptive_subdivider.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/Subdivider/qtsubdivider.cc b/src/OpenMesh/Apps/Subdivider/qtsubdivider.cc index b6674d63..9bffe575 100644 --- a/src/OpenMesh/Apps/Subdivider/qtsubdivider.cc +++ b/src/OpenMesh/Apps/Subdivider/qtsubdivider.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/Subdivider/subdivider.cc b/src/OpenMesh/Apps/Subdivider/subdivider.cc index a4016427..99a6dd0b 100644 --- a/src/OpenMesh/Apps/Subdivider/subdivider.cc +++ b/src/OpenMesh/Apps/Subdivider/subdivider.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc b/src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc index 835cdddb..31b8a076 100644 --- a/src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc +++ b/src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/VDPMSynthesizerViewerWidget.cc b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/VDPMSynthesizerViewerWidget.cc index 026c7318..93919f6d 100644 --- a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/VDPMSynthesizerViewerWidget.cc +++ b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/VDPMSynthesizerViewerWidget.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/VDPMSynthesizerViewerWidget.hh b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/VDPMSynthesizerViewerWidget.hh index fd81f40a..90f99d9c 100644 --- a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/VDPMSynthesizerViewerWidget.hh +++ b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/VDPMSynthesizerViewerWidget.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/vdpmsynthesizer.cc b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/vdpmsynthesizer.cc index f122fa4a..586f9436 100644 --- a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/vdpmsynthesizer.cc +++ b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/vdpmsynthesizer.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc b/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc index 77b7dae6..8d8b7d5a 100644 --- a/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc +++ b/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Apps/mconvert/mconvert.cc b/src/OpenMesh/Apps/mconvert/mconvert.cc index 5cedd6ce..93853bea 100644 --- a/src/OpenMesh/Apps/mconvert/mconvert.cc +++ b/src/OpenMesh/Apps/mconvert/mconvert.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Geometry/Config.hh b/src/OpenMesh/Core/Geometry/Config.hh index 334bd406..ac1eea82 100644 --- a/src/OpenMesh/Core/Geometry/Config.hh +++ b/src/OpenMesh/Core/Geometry/Config.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Geometry/EigenVectorT.hh b/src/OpenMesh/Core/Geometry/EigenVectorT.hh index ce9ffc32..51ebf5cf 100644 --- a/src/OpenMesh/Core/Geometry/EigenVectorT.hh +++ b/src/OpenMesh/Core/Geometry/EigenVectorT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Geometry/LoopSchemeMaskT.hh b/src/OpenMesh/Core/Geometry/LoopSchemeMaskT.hh index 9ae62691..d101b7fc 100644 --- a/src/OpenMesh/Core/Geometry/LoopSchemeMaskT.hh +++ b/src/OpenMesh/Core/Geometry/LoopSchemeMaskT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Geometry/MathDefs.hh b/src/OpenMesh/Core/Geometry/MathDefs.hh index 82c16eb4..1e1cb75e 100644 --- a/src/OpenMesh/Core/Geometry/MathDefs.hh +++ b/src/OpenMesh/Core/Geometry/MathDefs.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Geometry/NormalConeT.hh b/src/OpenMesh/Core/Geometry/NormalConeT.hh index c2442f5d..43f9b50d 100644 --- a/src/OpenMesh/Core/Geometry/NormalConeT.hh +++ b/src/OpenMesh/Core/Geometry/NormalConeT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * @@ -40,11 +40,6 @@ * ========================================================================= */ - - - - - //============================================================================= // // CLASS NormalCone diff --git a/src/OpenMesh/Core/Geometry/NormalConeT_impl.hh b/src/OpenMesh/Core/Geometry/NormalConeT_impl.hh index ed9ce908..e314e9ef 100644 --- a/src/OpenMesh/Core/Geometry/NormalConeT_impl.hh +++ b/src/OpenMesh/Core/Geometry/NormalConeT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Geometry/Plane3d.hh b/src/OpenMesh/Core/Geometry/Plane3d.hh index 32e68d00..077bed22 100644 --- a/src/OpenMesh/Core/Geometry/Plane3d.hh +++ b/src/OpenMesh/Core/Geometry/Plane3d.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Geometry/QuadricT.hh b/src/OpenMesh/Core/Geometry/QuadricT.hh index 1c6c9fa5..cb4db90d 100644 --- a/src/OpenMesh/Core/Geometry/QuadricT.hh +++ b/src/OpenMesh/Core/Geometry/QuadricT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Geometry/Vector11T.hh b/src/OpenMesh/Core/Geometry/Vector11T.hh index 44258377..32112166 100644 --- a/src/OpenMesh/Core/Geometry/Vector11T.hh +++ b/src/OpenMesh/Core/Geometry/Vector11T.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Geometry/VectorT.hh b/src/OpenMesh/Core/Geometry/VectorT.hh index 87a7e1d0..f559274a 100644 --- a/src/OpenMesh/Core/Geometry/VectorT.hh +++ b/src/OpenMesh/Core/Geometry/VectorT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Geometry/VectorT_inc.hh b/src/OpenMesh/Core/Geometry/VectorT_inc.hh index 8f5f30ff..f21c5e9d 100644 --- a/src/OpenMesh/Core/Geometry/VectorT_inc.hh +++ b/src/OpenMesh/Core/Geometry/VectorT_inc.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/BinaryHelper.cc b/src/OpenMesh/Core/IO/BinaryHelper.cc index 9bd30939..e8a865f1 100644 --- a/src/OpenMesh/Core/IO/BinaryHelper.cc +++ b/src/OpenMesh/Core/IO/BinaryHelper.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/BinaryHelper.hh b/src/OpenMesh/Core/IO/BinaryHelper.hh index da3bb881..e734479d 100644 --- a/src/OpenMesh/Core/IO/BinaryHelper.hh +++ b/src/OpenMesh/Core/IO/BinaryHelper.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/IOInstances.hh b/src/OpenMesh/Core/IO/IOInstances.hh index c40de6d4..cd424320 100644 --- a/src/OpenMesh/Core/IO/IOInstances.hh +++ b/src/OpenMesh/Core/IO/IOInstances.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/IOManager.cc b/src/OpenMesh/Core/IO/IOManager.cc index bdc77859..0e95a312 100644 --- a/src/OpenMesh/Core/IO/IOManager.cc +++ b/src/OpenMesh/Core/IO/IOManager.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/IOManager.hh b/src/OpenMesh/Core/IO/IOManager.hh index ce958c79..cdcb11ac 100644 --- a/src/OpenMesh/Core/IO/IOManager.hh +++ b/src/OpenMesh/Core/IO/IOManager.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/MeshIO.hh b/src/OpenMesh/Core/IO/MeshIO.hh index 33ee5a79..a4e4e010 100644 --- a/src/OpenMesh/Core/IO/MeshIO.hh +++ b/src/OpenMesh/Core/IO/MeshIO.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/OFFFormat.hh b/src/OpenMesh/Core/IO/OFFFormat.hh index 31f4388c..e3e25cfa 100644 --- a/src/OpenMesh/Core/IO/OFFFormat.hh +++ b/src/OpenMesh/Core/IO/OFFFormat.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/OMFormat.cc b/src/OpenMesh/Core/IO/OMFormat.cc index abebc177..71b55ec3 100644 --- a/src/OpenMesh/Core/IO/OMFormat.cc +++ b/src/OpenMesh/Core/IO/OMFormat.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/OMFormat.hh b/src/OpenMesh/Core/IO/OMFormat.hh index 514a932b..d19fa072 100644 --- a/src/OpenMesh/Core/IO/OMFormat.hh +++ b/src/OpenMesh/Core/IO/OMFormat.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/OMFormatT_impl.hh b/src/OpenMesh/Core/IO/OMFormatT_impl.hh index b79333bf..fbe1d5ca 100644 --- a/src/OpenMesh/Core/IO/OMFormatT_impl.hh +++ b/src/OpenMesh/Core/IO/OMFormatT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/Options.hh b/src/OpenMesh/Core/IO/Options.hh index 347098af..3b5967a2 100644 --- a/src/OpenMesh/Core/IO/Options.hh +++ b/src/OpenMesh/Core/IO/Options.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/SR_binary.hh b/src/OpenMesh/Core/IO/SR_binary.hh index 0dfcc09b..1e1dcb14 100644 --- a/src/OpenMesh/Core/IO/SR_binary.hh +++ b/src/OpenMesh/Core/IO/SR_binary.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/SR_binary_spec.hh b/src/OpenMesh/Core/IO/SR_binary_spec.hh index 6777e8a6..2e8a34c0 100644 --- a/src/OpenMesh/Core/IO/SR_binary_spec.hh +++ b/src/OpenMesh/Core/IO/SR_binary_spec.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/SR_rbo.hh b/src/OpenMesh/Core/IO/SR_rbo.hh index 876307ed..a75c3079 100644 --- a/src/OpenMesh/Core/IO/SR_rbo.hh +++ b/src/OpenMesh/Core/IO/SR_rbo.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/SR_store.hh b/src/OpenMesh/Core/IO/SR_store.hh index 07df4782..de89d39b 100644 --- a/src/OpenMesh/Core/IO/SR_store.hh +++ b/src/OpenMesh/Core/IO/SR_store.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/SR_types.hh b/src/OpenMesh/Core/IO/SR_types.hh index 65107674..263d7de8 100644 --- a/src/OpenMesh/Core/IO/SR_types.hh +++ b/src/OpenMesh/Core/IO/SR_types.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/StoreRestore.hh b/src/OpenMesh/Core/IO/StoreRestore.hh index f2891e7b..fffab310 100644 --- a/src/OpenMesh/Core/IO/StoreRestore.hh +++ b/src/OpenMesh/Core/IO/StoreRestore.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/exporter/BaseExporter.hh b/src/OpenMesh/Core/IO/exporter/BaseExporter.hh index c60181ff..ddcc697f 100644 --- a/src/OpenMesh/Core/IO/exporter/BaseExporter.hh +++ b/src/OpenMesh/Core/IO/exporter/BaseExporter.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/exporter/ExporterT.hh b/src/OpenMesh/Core/IO/exporter/ExporterT.hh index 8f9dde90..cb259288 100644 --- a/src/OpenMesh/Core/IO/exporter/ExporterT.hh +++ b/src/OpenMesh/Core/IO/exporter/ExporterT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/importer/BaseImporter.hh b/src/OpenMesh/Core/IO/importer/BaseImporter.hh index 947c108d..a3e4aedb 100644 --- a/src/OpenMesh/Core/IO/importer/BaseImporter.hh +++ b/src/OpenMesh/Core/IO/importer/BaseImporter.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/importer/ImporterT.hh b/src/OpenMesh/Core/IO/importer/ImporterT.hh index b8e56724..d6066dec 100644 --- a/src/OpenMesh/Core/IO/importer/ImporterT.hh +++ b/src/OpenMesh/Core/IO/importer/ImporterT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/reader/BaseReader.cc b/src/OpenMesh/Core/IO/reader/BaseReader.cc index d7bc0946..6de6cb07 100644 --- a/src/OpenMesh/Core/IO/reader/BaseReader.cc +++ b/src/OpenMesh/Core/IO/reader/BaseReader.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/reader/BaseReader.hh b/src/OpenMesh/Core/IO/reader/BaseReader.hh index 9f6c23bb..40a97d95 100644 --- a/src/OpenMesh/Core/IO/reader/BaseReader.hh +++ b/src/OpenMesh/Core/IO/reader/BaseReader.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/reader/OBJReader.cc b/src/OpenMesh/Core/IO/reader/OBJReader.cc index 6fe6141e..f5d0bfd3 100644 --- a/src/OpenMesh/Core/IO/reader/OBJReader.cc +++ b/src/OpenMesh/Core/IO/reader/OBJReader.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/reader/OBJReader.hh b/src/OpenMesh/Core/IO/reader/OBJReader.hh index 2de77bc4..04234f6d 100644 --- a/src/OpenMesh/Core/IO/reader/OBJReader.hh +++ b/src/OpenMesh/Core/IO/reader/OBJReader.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/reader/OFFReader.cc b/src/OpenMesh/Core/IO/reader/OFFReader.cc index e4a239ff..242913a2 100644 --- a/src/OpenMesh/Core/IO/reader/OFFReader.cc +++ b/src/OpenMesh/Core/IO/reader/OFFReader.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/reader/OFFReader.hh b/src/OpenMesh/Core/IO/reader/OFFReader.hh index 2efe6e4a..cb11d1cd 100644 --- a/src/OpenMesh/Core/IO/reader/OFFReader.hh +++ b/src/OpenMesh/Core/IO/reader/OFFReader.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/reader/OMReader.cc b/src/OpenMesh/Core/IO/reader/OMReader.cc index 33a9e0e1..b9b9cb4d 100644 --- a/src/OpenMesh/Core/IO/reader/OMReader.cc +++ b/src/OpenMesh/Core/IO/reader/OMReader.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/reader/OMReader.hh b/src/OpenMesh/Core/IO/reader/OMReader.hh index d29a8820..4460bcc7 100644 --- a/src/OpenMesh/Core/IO/reader/OMReader.hh +++ b/src/OpenMesh/Core/IO/reader/OMReader.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/reader/PLYReader.cc b/src/OpenMesh/Core/IO/reader/PLYReader.cc index 84d9fd78..5ab21b74 100644 --- a/src/OpenMesh/Core/IO/reader/PLYReader.cc +++ b/src/OpenMesh/Core/IO/reader/PLYReader.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/reader/PLYReader.hh b/src/OpenMesh/Core/IO/reader/PLYReader.hh index 44ba7a06..ec2b24cd 100644 --- a/src/OpenMesh/Core/IO/reader/PLYReader.hh +++ b/src/OpenMesh/Core/IO/reader/PLYReader.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/reader/STLReader.cc b/src/OpenMesh/Core/IO/reader/STLReader.cc index 1964d194..c3f6ec9e 100644 --- a/src/OpenMesh/Core/IO/reader/STLReader.cc +++ b/src/OpenMesh/Core/IO/reader/STLReader.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/reader/STLReader.hh b/src/OpenMesh/Core/IO/reader/STLReader.hh index ff094d0f..6f3b7dee 100644 --- a/src/OpenMesh/Core/IO/reader/STLReader.hh +++ b/src/OpenMesh/Core/IO/reader/STLReader.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/writer/BaseWriter.cc b/src/OpenMesh/Core/IO/writer/BaseWriter.cc index 5b959093..4c6fe319 100644 --- a/src/OpenMesh/Core/IO/writer/BaseWriter.cc +++ b/src/OpenMesh/Core/IO/writer/BaseWriter.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/writer/BaseWriter.hh b/src/OpenMesh/Core/IO/writer/BaseWriter.hh index fb1c1962..b1cf122a 100644 --- a/src/OpenMesh/Core/IO/writer/BaseWriter.hh +++ b/src/OpenMesh/Core/IO/writer/BaseWriter.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/writer/OBJWriter.cc b/src/OpenMesh/Core/IO/writer/OBJWriter.cc index b83dde24..da706f99 100644 --- a/src/OpenMesh/Core/IO/writer/OBJWriter.cc +++ b/src/OpenMesh/Core/IO/writer/OBJWriter.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/writer/OBJWriter.hh b/src/OpenMesh/Core/IO/writer/OBJWriter.hh index bdb3ef61..6c05cb20 100644 --- a/src/OpenMesh/Core/IO/writer/OBJWriter.hh +++ b/src/OpenMesh/Core/IO/writer/OBJWriter.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/writer/OFFWriter.cc b/src/OpenMesh/Core/IO/writer/OFFWriter.cc index 6b8c3364..83741b1b 100644 --- a/src/OpenMesh/Core/IO/writer/OFFWriter.cc +++ b/src/OpenMesh/Core/IO/writer/OFFWriter.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/writer/OFFWriter.hh b/src/OpenMesh/Core/IO/writer/OFFWriter.hh index 9ee32485..777d3af8 100644 --- a/src/OpenMesh/Core/IO/writer/OFFWriter.hh +++ b/src/OpenMesh/Core/IO/writer/OFFWriter.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/writer/OMWriter.cc b/src/OpenMesh/Core/IO/writer/OMWriter.cc index dd11cb17..9526c05a 100644 --- a/src/OpenMesh/Core/IO/writer/OMWriter.cc +++ b/src/OpenMesh/Core/IO/writer/OMWriter.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/writer/OMWriter.hh b/src/OpenMesh/Core/IO/writer/OMWriter.hh index 110285ed..4f26a9f9 100644 --- a/src/OpenMesh/Core/IO/writer/OMWriter.hh +++ b/src/OpenMesh/Core/IO/writer/OMWriter.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/writer/PLYWriter.cc b/src/OpenMesh/Core/IO/writer/PLYWriter.cc index dc9e864a..61d8d95e 100644 --- a/src/OpenMesh/Core/IO/writer/PLYWriter.cc +++ b/src/OpenMesh/Core/IO/writer/PLYWriter.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/writer/PLYWriter.hh b/src/OpenMesh/Core/IO/writer/PLYWriter.hh index 08814955..c6fd0730 100644 --- a/src/OpenMesh/Core/IO/writer/PLYWriter.hh +++ b/src/OpenMesh/Core/IO/writer/PLYWriter.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/writer/STLWriter.cc b/src/OpenMesh/Core/IO/writer/STLWriter.cc index 727eda55..11160438 100644 --- a/src/OpenMesh/Core/IO/writer/STLWriter.cc +++ b/src/OpenMesh/Core/IO/writer/STLWriter.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/IO/writer/STLWriter.hh b/src/OpenMesh/Core/IO/writer/STLWriter.hh index 8890d1e1..64b9035e 100644 --- a/src/OpenMesh/Core/IO/writer/STLWriter.hh +++ b/src/OpenMesh/Core/IO/writer/STLWriter.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/ArrayItems.hh b/src/OpenMesh/Core/Mesh/ArrayItems.hh index 53cdcd96..014af13b 100644 --- a/src/OpenMesh/Core/Mesh/ArrayItems.hh +++ b/src/OpenMesh/Core/Mesh/ArrayItems.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/ArrayKernel.cc b/src/OpenMesh/Core/Mesh/ArrayKernel.cc index f824a4a3..7134872b 100644 --- a/src/OpenMesh/Core/Mesh/ArrayKernel.cc +++ b/src/OpenMesh/Core/Mesh/ArrayKernel.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/ArrayKernel.hh b/src/OpenMesh/Core/Mesh/ArrayKernel.hh index bf68b8ca..413cba55 100644 --- a/src/OpenMesh/Core/Mesh/ArrayKernel.hh +++ b/src/OpenMesh/Core/Mesh/ArrayKernel.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/ArrayKernelT_impl.hh b/src/OpenMesh/Core/Mesh/ArrayKernelT_impl.hh index f62248ca..b50e01f1 100644 --- a/src/OpenMesh/Core/Mesh/ArrayKernelT_impl.hh +++ b/src/OpenMesh/Core/Mesh/ArrayKernelT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * @@ -37,272 +37,272 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * * - * ========================================================================= */ - -#define OPENMESH_ARRAY_KERNEL_C - -//== INCLUDES ================================================================= - -#include - -//== NAMESPACES =============================================================== - -namespace OpenMesh -{ - -//== IMPLEMENTATION ========================================================== - -template -void ArrayKernel::garbage_collection(std_API_Container_VHandlePointer& vh_to_update, - std_API_Container_HHandlePointer& hh_to_update, - std_API_Container_FHandlePointer& fh_to_update, - bool _v, bool _e, bool _f) -{ - -#ifdef DEBUG - #ifndef OM_GARBAGE_NO_STATUS_WARNING - if ( !this->has_vertex_status() ) - omerr() << "garbage_collection: No vertex status available. You can request it: mesh.request_vertex_status() or define OM_GARBAGE_NO_STATUS_WARNING to silence this warning." << std::endl; - if ( !this->has_edge_status() ) - omerr() << "garbage_collection: No edge status available. You can request it: mesh.request_edge_status() or define OM_GARBAGE_NO_STATUS_WARNING to silence this warning." << std::endl; - if ( !this->has_face_status() ) - omerr() << "garbage_collection: No face status available. You can request it: mesh.request_face_status() or define OM_GARBAGE_NO_STATUS_WARNING to silence this warning." << std::endl; - #endif -#endif - - const bool track_vhandles = ( !vh_to_update.empty() ); - const bool track_hhandles = ( !hh_to_update.empty() ); - const bool track_fhandles = ( !fh_to_update.empty() ); - - int i, i0, i1; - - int nV = int(n_vertices()); - int nE = int(n_edges()); - int nH = int(2*n_edges()); - int nF = (int(n_faces())); - - std::vector vh_map; - std::vector hh_map; - std::vector fh_map; - - std::map vertex_inverse_map; - std::map halfedge_inverse_map; - std::map face_inverse_map; - - // setup handle mapping: - vh_map.reserve(nV); - for (i=0; i 0 && this->has_vertex_status() ) - { - i0=0; i1=nV-1; - - while (1) - { - // find 1st deleted and last un-deleted - while (!status(VertexHandle(i0)).deleted() && i0 < i1) ++i0; - while ( status(VertexHandle(i1)).deleted() && i0 < i1) --i1; - if (i0 >= i1) break; - - // If we keep track of the vertex handles for updates, - // we need to have the opposite direction - if ( track_vhandles ) { - vertex_inverse_map[i1] = i0; - vertex_inverse_map[i0] = -1; - } - - // swap - std::swap(vertices_[i0], vertices_[i1]); - std::swap(vh_map[i0], vh_map[i1]); - vprops_swap(i0, i1); - }; - - vertices_.resize(status(VertexHandle(i0)).deleted() ? i0 : i0+1); - vprops_resize(n_vertices()); - } - - - // remove deleted edges - if (_e && n_edges() > 0 && this->has_edge_status() ) - { - i0=0; i1=nE-1; - - while (1) - { - // find 1st deleted and last un-deleted - while (!status(EdgeHandle(i0)).deleted() && i0 < i1) ++i0; - while ( status(EdgeHandle(i1)).deleted() && i0 < i1) --i1; - if (i0 >= i1) break; - - // If we keep track of the vertex handles for updates, - // we need to have the opposite direction - if ( track_hhandles ) { - halfedge_inverse_map[2*i1] = 2 * i0; - halfedge_inverse_map[2*i0] = -1; - - halfedge_inverse_map[2*i1 + 1] = 2 * i0 + 1; - halfedge_inverse_map[2*i0 + 1] = -1; - } - - // swap - std::swap(edges_[i0], edges_[i1]); - std::swap(hh_map[2*i0], hh_map[2*i1]); - std::swap(hh_map[2*i0+1], hh_map[2*i1+1]); - eprops_swap(i0, i1); - hprops_swap(2*i0, 2*i1); - hprops_swap(2*i0+1, 2*i1+1); - }; - - edges_.resize(status(EdgeHandle(i0)).deleted() ? i0 : i0+1); - eprops_resize(n_edges()); - hprops_resize(n_halfedges()); - } - - - // remove deleted faces - if (_f && n_faces() > 0 && this->has_face_status() ) - { - i0=0; i1=nF-1; - - while (1) - { - // find 1st deleted and last un-deleted - while (!status(FaceHandle(i0)).deleted() && i0 < i1) ++i0; - while ( status(FaceHandle(i1)).deleted() && i0 < i1) --i1; - if (i0 >= i1) break; - - // If we keep track of the face handles for updates, - // we need to have the opposite direction - if ( track_fhandles ) { - face_inverse_map[i1] = i0; - face_inverse_map[i0] = -1; - } - - // swap - std::swap(faces_[i0], faces_[i1]); - std::swap(fh_map[i0], fh_map[i1]); - fprops_swap(i0, i1); - }; - - faces_.resize(status(FaceHandle(i0)).deleted() ? i0 : i0+1); - fprops_resize(n_faces()); - } - - - // update handles of vertices - if (_e) - { - KernelVertexIter v_it(vertices_begin()), v_end(vertices_end()); - VertexHandle vh; - - for (; v_it!=v_end; ++v_it) - { - vh = handle(*v_it); - if (!is_isolated(vh)) - { - set_halfedge_handle(vh, hh_map[halfedge_handle(vh).idx()]); - } - } - } - - HalfedgeHandle hh; - // update handles of halfedges - for (KernelEdgeIter e_it(edges_begin()); e_it != edges_end(); ++e_it) - {//in the first pass update the (half)edges vertices - hh = halfedge_handle(handle(*e_it), 0); - set_vertex_handle(hh, vh_map[to_vertex_handle(hh).idx()]); - hh = halfedge_handle(handle(*e_it), 1); - set_vertex_handle(hh, vh_map[to_vertex_handle(hh).idx()]); - } - for (KernelEdgeIter e_it(edges_begin()); e_it != edges_end(); ++e_it) - {//in the second pass update the connectivity of the (half)edges - hh = halfedge_handle(handle(*e_it), 0); - set_next_halfedge_handle(hh, hh_map[next_halfedge_handle(hh).idx()]); - if (!is_boundary(hh)) - { - set_face_handle(hh, fh_map[face_handle(hh).idx()]); - } - hh = halfedge_handle(handle(*e_it), 1); - set_next_halfedge_handle(hh, hh_map[next_halfedge_handle(hh).idx()]); - if (!is_boundary(hh)) - { - set_face_handle(hh, fh_map[face_handle(hh).idx()]); - } - } - - // update handles of faces - if (_e) - { - KernelFaceIter f_it(faces_begin()), f_end(faces_end()); - FaceHandle fh; - - for (; f_it!=f_end; ++f_it) - { - fh = handle(*f_it); - set_halfedge_handle(fh, hh_map[halfedge_handle(fh).idx()]); - } - } - - const int vertexCount = int(vertices_.size()); - const int halfedgeCount = int(edges_.size() * 2); - const int faceCount = int(faces_.size()); - - // Update the vertex handles in the vertex handle vector - typename std_API_Container_VHandlePointer::iterator v_it(vh_to_update.begin()), v_it_end(vh_to_update.end()); - for(; v_it != v_it_end; ++v_it) - { - - // Only changed vertices need to be considered - if ( (*v_it)->idx() != vh_map[(*v_it)->idx()].idx() ) { - *(*v_it) = VertexHandle(vertex_inverse_map[(*v_it)->idx()]); - - // Vertices above the vertex count have to be already mapped, or they are invalid now! - } else if ( ((*v_it)->idx() >= vertexCount) && (vertex_inverse_map.find((*v_it)->idx()) == vertex_inverse_map.end()) ) { - (*v_it)->invalidate(); - } - - } - - // Update the halfedge handles in the halfedge handle vector - typename std_API_Container_HHandlePointer::iterator hh_it(hh_to_update.begin()), hh_it_end(hh_to_update.end()); - for(; hh_it != hh_it_end; ++hh_it) - { - // Only changed faces need to be considered - if ( (*hh_it)->idx() != hh_map[(*hh_it)->idx()].idx() ) { - *(*hh_it) = HalfedgeHandle(halfedge_inverse_map[(*hh_it)->idx()]); - - // Vertices above the face count have to be already mapped, or they are invalid now! - } else if ( ((*hh_it)->idx() >= halfedgeCount) && (halfedge_inverse_map.find((*hh_it)->idx()) == halfedge_inverse_map.end()) ) { - (*hh_it)->invalidate(); - } - - } - - // Update the face handles in the face handle vector - typename std_API_Container_FHandlePointer::iterator fh_it(fh_to_update.begin()), fh_it_end(fh_to_update.end()); - for(; fh_it != fh_it_end; ++fh_it) - { - - // Only changed faces need to be considered - if ( (*fh_it)->idx() != fh_map[(*fh_it)->idx()].idx() ) { - *(*fh_it) = FaceHandle(face_inverse_map[(*fh_it)->idx()]); - - // Vertices above the face count have to be already mapped, or they are invalid now! - } else if ( ((*fh_it)->idx() >= faceCount) && (face_inverse_map.find((*fh_it)->idx()) == face_inverse_map.end()) ) { - (*fh_it)->invalidate(); - } - - } -} - -} - + * ========================================================================= */ + +#define OPENMESH_ARRAY_KERNEL_C + +//== INCLUDES ================================================================= + +#include + +//== NAMESPACES =============================================================== + +namespace OpenMesh +{ + +//== IMPLEMENTATION ========================================================== + +template +void ArrayKernel::garbage_collection(std_API_Container_VHandlePointer& vh_to_update, + std_API_Container_HHandlePointer& hh_to_update, + std_API_Container_FHandlePointer& fh_to_update, + bool _v, bool _e, bool _f) +{ + +#ifdef DEBUG + #ifndef OM_GARBAGE_NO_STATUS_WARNING + if ( !this->has_vertex_status() ) + omerr() << "garbage_collection: No vertex status available. You can request it: mesh.request_vertex_status() or define OM_GARBAGE_NO_STATUS_WARNING to silence this warning." << std::endl; + if ( !this->has_edge_status() ) + omerr() << "garbage_collection: No edge status available. You can request it: mesh.request_edge_status() or define OM_GARBAGE_NO_STATUS_WARNING to silence this warning." << std::endl; + if ( !this->has_face_status() ) + omerr() << "garbage_collection: No face status available. You can request it: mesh.request_face_status() or define OM_GARBAGE_NO_STATUS_WARNING to silence this warning." << std::endl; + #endif +#endif + + const bool track_vhandles = ( !vh_to_update.empty() ); + const bool track_hhandles = ( !hh_to_update.empty() ); + const bool track_fhandles = ( !fh_to_update.empty() ); + + int i, i0, i1; + + int nV = int(n_vertices()); + int nE = int(n_edges()); + int nH = int(2*n_edges()); + int nF = (int(n_faces())); + + std::vector vh_map; + std::vector hh_map; + std::vector fh_map; + + std::map vertex_inverse_map; + std::map halfedge_inverse_map; + std::map face_inverse_map; + + // setup handle mapping: + vh_map.reserve(nV); + for (i=0; i 0 && this->has_vertex_status() ) + { + i0=0; i1=nV-1; + + while (1) + { + // find 1st deleted and last un-deleted + while (!status(VertexHandle(i0)).deleted() && i0 < i1) ++i0; + while ( status(VertexHandle(i1)).deleted() && i0 < i1) --i1; + if (i0 >= i1) break; + + // If we keep track of the vertex handles for updates, + // we need to have the opposite direction + if ( track_vhandles ) { + vertex_inverse_map[i1] = i0; + vertex_inverse_map[i0] = -1; + } + + // swap + std::swap(vertices_[i0], vertices_[i1]); + std::swap(vh_map[i0], vh_map[i1]); + vprops_swap(i0, i1); + }; + + vertices_.resize(status(VertexHandle(i0)).deleted() ? i0 : i0+1); + vprops_resize(n_vertices()); + } + + + // remove deleted edges + if (_e && n_edges() > 0 && this->has_edge_status() ) + { + i0=0; i1=nE-1; + + while (1) + { + // find 1st deleted and last un-deleted + while (!status(EdgeHandle(i0)).deleted() && i0 < i1) ++i0; + while ( status(EdgeHandle(i1)).deleted() && i0 < i1) --i1; + if (i0 >= i1) break; + + // If we keep track of the vertex handles for updates, + // we need to have the opposite direction + if ( track_hhandles ) { + halfedge_inverse_map[2*i1] = 2 * i0; + halfedge_inverse_map[2*i0] = -1; + + halfedge_inverse_map[2*i1 + 1] = 2 * i0 + 1; + halfedge_inverse_map[2*i0 + 1] = -1; + } + + // swap + std::swap(edges_[i0], edges_[i1]); + std::swap(hh_map[2*i0], hh_map[2*i1]); + std::swap(hh_map[2*i0+1], hh_map[2*i1+1]); + eprops_swap(i0, i1); + hprops_swap(2*i0, 2*i1); + hprops_swap(2*i0+1, 2*i1+1); + }; + + edges_.resize(status(EdgeHandle(i0)).deleted() ? i0 : i0+1); + eprops_resize(n_edges()); + hprops_resize(n_halfedges()); + } + + + // remove deleted faces + if (_f && n_faces() > 0 && this->has_face_status() ) + { + i0=0; i1=nF-1; + + while (1) + { + // find 1st deleted and last un-deleted + while (!status(FaceHandle(i0)).deleted() && i0 < i1) ++i0; + while ( status(FaceHandle(i1)).deleted() && i0 < i1) --i1; + if (i0 >= i1) break; + + // If we keep track of the face handles for updates, + // we need to have the opposite direction + if ( track_fhandles ) { + face_inverse_map[i1] = i0; + face_inverse_map[i0] = -1; + } + + // swap + std::swap(faces_[i0], faces_[i1]); + std::swap(fh_map[i0], fh_map[i1]); + fprops_swap(i0, i1); + }; + + faces_.resize(status(FaceHandle(i0)).deleted() ? i0 : i0+1); + fprops_resize(n_faces()); + } + + + // update handles of vertices + if (_e) + { + KernelVertexIter v_it(vertices_begin()), v_end(vertices_end()); + VertexHandle vh; + + for (; v_it!=v_end; ++v_it) + { + vh = handle(*v_it); + if (!is_isolated(vh)) + { + set_halfedge_handle(vh, hh_map[halfedge_handle(vh).idx()]); + } + } + } + + HalfedgeHandle hh; + // update handles of halfedges + for (KernelEdgeIter e_it(edges_begin()); e_it != edges_end(); ++e_it) + {//in the first pass update the (half)edges vertices + hh = halfedge_handle(handle(*e_it), 0); + set_vertex_handle(hh, vh_map[to_vertex_handle(hh).idx()]); + hh = halfedge_handle(handle(*e_it), 1); + set_vertex_handle(hh, vh_map[to_vertex_handle(hh).idx()]); + } + for (KernelEdgeIter e_it(edges_begin()); e_it != edges_end(); ++e_it) + {//in the second pass update the connectivity of the (half)edges + hh = halfedge_handle(handle(*e_it), 0); + set_next_halfedge_handle(hh, hh_map[next_halfedge_handle(hh).idx()]); + if (!is_boundary(hh)) + { + set_face_handle(hh, fh_map[face_handle(hh).idx()]); + } + hh = halfedge_handle(handle(*e_it), 1); + set_next_halfedge_handle(hh, hh_map[next_halfedge_handle(hh).idx()]); + if (!is_boundary(hh)) + { + set_face_handle(hh, fh_map[face_handle(hh).idx()]); + } + } + + // update handles of faces + if (_e) + { + KernelFaceIter f_it(faces_begin()), f_end(faces_end()); + FaceHandle fh; + + for (; f_it!=f_end; ++f_it) + { + fh = handle(*f_it); + set_halfedge_handle(fh, hh_map[halfedge_handle(fh).idx()]); + } + } + + const int vertexCount = int(vertices_.size()); + const int halfedgeCount = int(edges_.size() * 2); + const int faceCount = int(faces_.size()); + + // Update the vertex handles in the vertex handle vector + typename std_API_Container_VHandlePointer::iterator v_it(vh_to_update.begin()), v_it_end(vh_to_update.end()); + for(; v_it != v_it_end; ++v_it) + { + + // Only changed vertices need to be considered + if ( (*v_it)->idx() != vh_map[(*v_it)->idx()].idx() ) { + *(*v_it) = VertexHandle(vertex_inverse_map[(*v_it)->idx()]); + + // Vertices above the vertex count have to be already mapped, or they are invalid now! + } else if ( ((*v_it)->idx() >= vertexCount) && (vertex_inverse_map.find((*v_it)->idx()) == vertex_inverse_map.end()) ) { + (*v_it)->invalidate(); + } + + } + + // Update the halfedge handles in the halfedge handle vector + typename std_API_Container_HHandlePointer::iterator hh_it(hh_to_update.begin()), hh_it_end(hh_to_update.end()); + for(; hh_it != hh_it_end; ++hh_it) + { + // Only changed faces need to be considered + if ( (*hh_it)->idx() != hh_map[(*hh_it)->idx()].idx() ) { + *(*hh_it) = HalfedgeHandle(halfedge_inverse_map[(*hh_it)->idx()]); + + // Vertices above the face count have to be already mapped, or they are invalid now! + } else if ( ((*hh_it)->idx() >= halfedgeCount) && (halfedge_inverse_map.find((*hh_it)->idx()) == halfedge_inverse_map.end()) ) { + (*hh_it)->invalidate(); + } + + } + + // Update the face handles in the face handle vector + typename std_API_Container_FHandlePointer::iterator fh_it(fh_to_update.begin()), fh_it_end(fh_to_update.end()); + for(; fh_it != fh_it_end; ++fh_it) + { + + // Only changed faces need to be considered + if ( (*fh_it)->idx() != fh_map[(*fh_it)->idx()].idx() ) { + *(*fh_it) = FaceHandle(face_inverse_map[(*fh_it)->idx()]); + + // Vertices above the face count have to be already mapped, or they are invalid now! + } else if ( ((*fh_it)->idx() >= faceCount) && (face_inverse_map.find((*fh_it)->idx()) == face_inverse_map.end()) ) { + (*fh_it)->invalidate(); + } + + } +} + +} + diff --git a/src/OpenMesh/Core/Mesh/AttribKernelT.hh b/src/OpenMesh/Core/Mesh/AttribKernelT.hh index 8dc1a2b8..40e878b9 100644 --- a/src/OpenMesh/Core/Mesh/AttribKernelT.hh +++ b/src/OpenMesh/Core/Mesh/AttribKernelT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/Attributes.hh b/src/OpenMesh/Core/Mesh/Attributes.hh index e02066ce..021190d2 100644 --- a/src/OpenMesh/Core/Mesh/Attributes.hh +++ b/src/OpenMesh/Core/Mesh/Attributes.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/BaseKernel.cc b/src/OpenMesh/Core/Mesh/BaseKernel.cc index 1cdd9cf3..d793d48d 100644 --- a/src/OpenMesh/Core/Mesh/BaseKernel.cc +++ b/src/OpenMesh/Core/Mesh/BaseKernel.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/BaseKernel.hh b/src/OpenMesh/Core/Mesh/BaseKernel.hh index 0270a580..6fd160ea 100644 --- a/src/OpenMesh/Core/Mesh/BaseKernel.hh +++ b/src/OpenMesh/Core/Mesh/BaseKernel.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/BaseMesh.hh b/src/OpenMesh/Core/Mesh/BaseMesh.hh index 359514dd..e67f6677 100644 --- a/src/OpenMesh/Core/Mesh/BaseMesh.hh +++ b/src/OpenMesh/Core/Mesh/BaseMesh.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/Casts.hh b/src/OpenMesh/Core/Mesh/Casts.hh index 4a913a7f..aa86f2ea 100644 --- a/src/OpenMesh/Core/Mesh/Casts.hh +++ b/src/OpenMesh/Core/Mesh/Casts.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/CirculatorsT.hh b/src/OpenMesh/Core/Mesh/CirculatorsT.hh index 622134e8..b16185f3 100644 --- a/src/OpenMesh/Core/Mesh/CirculatorsT.hh +++ b/src/OpenMesh/Core/Mesh/CirculatorsT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/FinalMeshItemsT.hh b/src/OpenMesh/Core/Mesh/FinalMeshItemsT.hh index 9952e4eb..72202b12 100644 --- a/src/OpenMesh/Core/Mesh/FinalMeshItemsT.hh +++ b/src/OpenMesh/Core/Mesh/FinalMeshItemsT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/Handles.hh b/src/OpenMesh/Core/Mesh/Handles.hh index 0f237e20..80c38eaf 100644 --- a/src/OpenMesh/Core/Mesh/Handles.hh +++ b/src/OpenMesh/Core/Mesh/Handles.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/IteratorsT.hh b/src/OpenMesh/Core/Mesh/IteratorsT.hh index 446d1cc3..3605e647 100644 --- a/src/OpenMesh/Core/Mesh/IteratorsT.hh +++ b/src/OpenMesh/Core/Mesh/IteratorsT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/PolyConnectivity.cc b/src/OpenMesh/Core/Mesh/PolyConnectivity.cc index 9811b43a..c61946e8 100644 --- a/src/OpenMesh/Core/Mesh/PolyConnectivity.cc +++ b/src/OpenMesh/Core/Mesh/PolyConnectivity.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/PolyConnectivity.hh b/src/OpenMesh/Core/Mesh/PolyConnectivity.hh index c71033fe..f56280ae 100644 --- a/src/OpenMesh/Core/Mesh/PolyConnectivity.hh +++ b/src/OpenMesh/Core/Mesh/PolyConnectivity.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/PolyConnectivity_inline_impl.hh b/src/OpenMesh/Core/Mesh/PolyConnectivity_inline_impl.hh index 2be178e2..01d6eecb 100644 --- a/src/OpenMesh/Core/Mesh/PolyConnectivity_inline_impl.hh +++ b/src/OpenMesh/Core/Mesh/PolyConnectivity_inline_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/PolyMeshT.hh b/src/OpenMesh/Core/Mesh/PolyMeshT.hh index 03bedaac..b6c70bb7 100644 --- a/src/OpenMesh/Core/Mesh/PolyMeshT.hh +++ b/src/OpenMesh/Core/Mesh/PolyMeshT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/PolyMeshT_impl.hh b/src/OpenMesh/Core/Mesh/PolyMeshT_impl.hh index 66d49d9f..c98f2bed 100644 --- a/src/OpenMesh/Core/Mesh/PolyMeshT_impl.hh +++ b/src/OpenMesh/Core/Mesh/PolyMeshT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/PolyMesh_ArrayKernelT.hh b/src/OpenMesh/Core/Mesh/PolyMesh_ArrayKernelT.hh index 5111faff..6df9eb3b 100644 --- a/src/OpenMesh/Core/Mesh/PolyMesh_ArrayKernelT.hh +++ b/src/OpenMesh/Core/Mesh/PolyMesh_ArrayKernelT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/Status.hh b/src/OpenMesh/Core/Mesh/Status.hh index 22ef81d6..fcefef93 100644 --- a/src/OpenMesh/Core/Mesh/Status.hh +++ b/src/OpenMesh/Core/Mesh/Status.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/Tags.hh b/src/OpenMesh/Core/Mesh/Tags.hh index ba3d9a96..5b610d61 100644 --- a/src/OpenMesh/Core/Mesh/Tags.hh +++ b/src/OpenMesh/Core/Mesh/Tags.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/Traits.hh b/src/OpenMesh/Core/Mesh/Traits.hh index 5768286a..69e5a9a1 100644 --- a/src/OpenMesh/Core/Mesh/Traits.hh +++ b/src/OpenMesh/Core/Mesh/Traits.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/TriConnectivity.cc b/src/OpenMesh/Core/Mesh/TriConnectivity.cc index 31f63fc3..09b5a73a 100644 --- a/src/OpenMesh/Core/Mesh/TriConnectivity.cc +++ b/src/OpenMesh/Core/Mesh/TriConnectivity.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/TriConnectivity.hh b/src/OpenMesh/Core/Mesh/TriConnectivity.hh index f9c84751..3a1f2c8b 100644 --- a/src/OpenMesh/Core/Mesh/TriConnectivity.hh +++ b/src/OpenMesh/Core/Mesh/TriConnectivity.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/TriMeshT.hh b/src/OpenMesh/Core/Mesh/TriMeshT.hh index 5784fb2f..bc84d34e 100644 --- a/src/OpenMesh/Core/Mesh/TriMeshT.hh +++ b/src/OpenMesh/Core/Mesh/TriMeshT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/TriMeshT_impl.hh b/src/OpenMesh/Core/Mesh/TriMeshT_impl.hh index 43592ecc..5de9cb63 100644 --- a/src/OpenMesh/Core/Mesh/TriMeshT_impl.hh +++ b/src/OpenMesh/Core/Mesh/TriMeshT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh b/src/OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh index 21d1654c..3a01183f 100644 --- a/src/OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh +++ b/src/OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/gen/circulators_header.hh b/src/OpenMesh/Core/Mesh/gen/circulators_header.hh index 276a737b..83ddc640 100644 --- a/src/OpenMesh/Core/Mesh/gen/circulators_header.hh +++ b/src/OpenMesh/Core/Mesh/gen/circulators_header.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Mesh/gen/iterators_header.hh b/src/OpenMesh/Core/Mesh/gen/iterators_header.hh index 89205330..8557d5e1 100644 --- a/src/OpenMesh/Core/Mesh/gen/iterators_header.hh +++ b/src/OpenMesh/Core/Mesh/gen/iterators_header.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/System/OpenMeshDLLMacros.hh b/src/OpenMesh/Core/System/OpenMeshDLLMacros.hh index d821df74..1643e91f 100644 --- a/src/OpenMesh/Core/System/OpenMeshDLLMacros.hh +++ b/src/OpenMesh/Core/System/OpenMeshDLLMacros.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/System/compiler.hh b/src/OpenMesh/Core/System/compiler.hh index c14b6c20..eac33f55 100644 --- a/src/OpenMesh/Core/System/compiler.hh +++ b/src/OpenMesh/Core/System/compiler.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/System/config.h b/src/OpenMesh/Core/System/config.h index a8a5a1fa..8ee6956b 100644 --- a/src/OpenMesh/Core/System/config.h +++ b/src/OpenMesh/Core/System/config.h @@ -39,13 +39,6 @@ * * * ========================================================================= */ -/*===========================================================================*\ - * * - * $Revision$ * - * $Date$ * - * * -\*===========================================================================*/ - /** \file config.h * \todo Move content to config.hh and include it to be compatible with old * source. diff --git a/src/OpenMesh/Core/System/config.hh b/src/OpenMesh/Core/System/config.hh index ba504c55..0b400db7 100644 --- a/src/OpenMesh/Core/System/config.hh +++ b/src/OpenMesh/Core/System/config.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/System/mostream.hh b/src/OpenMesh/Core/System/mostream.hh index e774d7bc..868bd014 100644 --- a/src/OpenMesh/Core/System/mostream.hh +++ b/src/OpenMesh/Core/System/mostream.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/System/omstream.cc b/src/OpenMesh/Core/System/omstream.cc index 810e3152..352d6ff4 100644 --- a/src/OpenMesh/Core/System/omstream.cc +++ b/src/OpenMesh/Core/System/omstream.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/System/omstream.hh b/src/OpenMesh/Core/System/omstream.hh index b44c5507..07d2ee8b 100644 --- a/src/OpenMesh/Core/System/omstream.hh +++ b/src/OpenMesh/Core/System/omstream.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Utils/AutoPropertyHandleT.hh b/src/OpenMesh/Core/Utils/AutoPropertyHandleT.hh index 19afb46e..c23f584f 100644 --- a/src/OpenMesh/Core/Utils/AutoPropertyHandleT.hh +++ b/src/OpenMesh/Core/Utils/AutoPropertyHandleT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Utils/BaseProperty.cc b/src/OpenMesh/Core/Utils/BaseProperty.cc index 847b1882..bd1f4f7d 100644 --- a/src/OpenMesh/Core/Utils/BaseProperty.cc +++ b/src/OpenMesh/Core/Utils/BaseProperty.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Utils/BaseProperty.hh b/src/OpenMesh/Core/Utils/BaseProperty.hh index e4d552f1..d73bda44 100644 --- a/src/OpenMesh/Core/Utils/BaseProperty.hh +++ b/src/OpenMesh/Core/Utils/BaseProperty.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Utils/Endian.cc b/src/OpenMesh/Core/Utils/Endian.cc index 1af0a81a..d0dbe240 100644 --- a/src/OpenMesh/Core/Utils/Endian.cc +++ b/src/OpenMesh/Core/Utils/Endian.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Utils/Endian.hh b/src/OpenMesh/Core/Utils/Endian.hh index a3b3ce89..a7b71d3f 100644 --- a/src/OpenMesh/Core/Utils/Endian.hh +++ b/src/OpenMesh/Core/Utils/Endian.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Utils/GenProg.hh b/src/OpenMesh/Core/Utils/GenProg.hh index 9d04af21..0bdcc4d9 100644 --- a/src/OpenMesh/Core/Utils/GenProg.hh +++ b/src/OpenMesh/Core/Utils/GenProg.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Utils/Noncopyable.hh b/src/OpenMesh/Core/Utils/Noncopyable.hh index 87f64412..14011fb8 100644 --- a/src/OpenMesh/Core/Utils/Noncopyable.hh +++ b/src/OpenMesh/Core/Utils/Noncopyable.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Utils/Property.hh b/src/OpenMesh/Core/Utils/Property.hh index 1a7b474a..1a200ab4 100644 --- a/src/OpenMesh/Core/Utils/Property.hh +++ b/src/OpenMesh/Core/Utils/Property.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Utils/PropertyContainer.hh b/src/OpenMesh/Core/Utils/PropertyContainer.hh index 297d16b9..4bdb29a4 100644 --- a/src/OpenMesh/Core/Utils/PropertyContainer.hh +++ b/src/OpenMesh/Core/Utils/PropertyContainer.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Utils/PropertyManager.hh b/src/OpenMesh/Core/Utils/PropertyManager.hh index aa843245..cd2e13db 100644 --- a/src/OpenMesh/Core/Utils/PropertyManager.hh +++ b/src/OpenMesh/Core/Utils/PropertyManager.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Utils/RandomNumberGenerator.cc b/src/OpenMesh/Core/Utils/RandomNumberGenerator.cc index 9d876392..303748a7 100644 --- a/src/OpenMesh/Core/Utils/RandomNumberGenerator.cc +++ b/src/OpenMesh/Core/Utils/RandomNumberGenerator.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Utils/RandomNumberGenerator.hh b/src/OpenMesh/Core/Utils/RandomNumberGenerator.hh index c0b2be3d..141e899a 100644 --- a/src/OpenMesh/Core/Utils/RandomNumberGenerator.hh +++ b/src/OpenMesh/Core/Utils/RandomNumberGenerator.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Utils/SingletonT.hh b/src/OpenMesh/Core/Utils/SingletonT.hh index 438cd655..f572d8bc 100644 --- a/src/OpenMesh/Core/Utils/SingletonT.hh +++ b/src/OpenMesh/Core/Utils/SingletonT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Utils/SingletonT_impl.hh b/src/OpenMesh/Core/Utils/SingletonT_impl.hh index 6ad23d66..6f4129b3 100644 --- a/src/OpenMesh/Core/Utils/SingletonT_impl.hh +++ b/src/OpenMesh/Core/Utils/SingletonT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Utils/color_cast.hh b/src/OpenMesh/Core/Utils/color_cast.hh index 8ed6f5a2..7d3020c8 100644 --- a/src/OpenMesh/Core/Utils/color_cast.hh +++ b/src/OpenMesh/Core/Utils/color_cast.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Utils/vector_cast.hh b/src/OpenMesh/Core/Utils/vector_cast.hh index 07e0794b..9e80a913 100644 --- a/src/OpenMesh/Core/Utils/vector_cast.hh +++ b/src/OpenMesh/Core/Utils/vector_cast.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Core/Utils/vector_traits.hh b/src/OpenMesh/Core/Utils/vector_traits.hh index 801eb5c4..3b10c6fc 100644 --- a/src/OpenMesh/Core/Utils/vector_traits.hh +++ b/src/OpenMesh/Core/Utils/vector_traits.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/BaseDecimaterT.hh b/src/OpenMesh/Tools/Decimater/BaseDecimaterT.hh index 0d2cf864..9c2e207b 100644 --- a/src/OpenMesh/Tools/Decimater/BaseDecimaterT.hh +++ b/src/OpenMesh/Tools/Decimater/BaseDecimaterT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * @@ -192,8 +192,8 @@ protected: { if (observer() && _n_collapses % observer()->get_interval() == 0) { - observer()->notify(_n_collapses); - return !observer()->abort(); + observer()->notify(_n_collapses); + return !observer()->abort(); } return true; } diff --git a/src/OpenMesh/Tools/Decimater/BaseDecimaterT_impl.hh b/src/OpenMesh/Tools/Decimater/BaseDecimaterT_impl.hh index c8f8dac5..efbc2154 100644 --- a/src/OpenMesh/Tools/Decimater/BaseDecimaterT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/BaseDecimaterT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/CollapseInfoT.hh b/src/OpenMesh/Tools/Decimater/CollapseInfoT.hh index ed648bc4..0af03a67 100644 --- a/src/OpenMesh/Tools/Decimater/CollapseInfoT.hh +++ b/src/OpenMesh/Tools/Decimater/CollapseInfoT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/DecimaterT.hh b/src/OpenMesh/Tools/Decimater/DecimaterT.hh index 6d0b3b4d..8ea6b481 100644 --- a/src/OpenMesh/Tools/Decimater/DecimaterT.hh +++ b/src/OpenMesh/Tools/Decimater/DecimaterT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/DecimaterT_impl.hh b/src/OpenMesh/Tools/Decimater/DecimaterT_impl.hh index c38d4272..9f47b390 100644 --- a/src/OpenMesh/Tools/Decimater/DecimaterT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/DecimaterT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/McDecimaterT.hh b/src/OpenMesh/Tools/Decimater/McDecimaterT.hh index 553e311d..76edb903 100644 --- a/src/OpenMesh/Tools/Decimater/McDecimaterT.hh +++ b/src/OpenMesh/Tools/Decimater/McDecimaterT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/McDecimaterT_impl.hh b/src/OpenMesh/Tools/Decimater/McDecimaterT_impl.hh index 59b4fdf2..1c587674 100644 --- a/src/OpenMesh/Tools/Decimater/McDecimaterT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/McDecimaterT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * @@ -199,8 +199,8 @@ size_t McDecimaterT::decimate(size_t _n_collapses, bool _only_selected) { // post-process collapse this->postprocess_collapse(ci); - // notify observer and stop if the observer requests it - if (!this->notify_observer(n_collapses)) + // notify observer and stop if the observer requests it + if (!this->notify_observer(n_collapses)) return n_collapses; } else { @@ -342,8 +342,8 @@ size_t McDecimaterT::decimate_to_faces(size_t _nv, size_t _nf, bool _only_ // post-process collapse this->postprocess_collapse(ci); - // notify observer and stop if the observer requests it - if (!this->notify_observer(n_collapses)) + // notify observer and stop if the observer requests it + if (!this->notify_observer(n_collapses)) return n_collapses; } else { @@ -501,8 +501,8 @@ size_t McDecimaterT::decimate_constraints_only(float _factor, bool _only_s // post-process collapse this->postprocess_collapse(ci); - // notify observer and stop if the observer requests it - if (!this->notify_observer(n_collapses)) + // notify observer and stop if the observer requests it + if (!this->notify_observer(n_collapses)) return n_collapses; } else { diff --git a/src/OpenMesh/Tools/Decimater/MixedDecimaterT.hh b/src/OpenMesh/Tools/Decimater/MixedDecimaterT.hh index 7e3bbdbb..4a21e7e3 100644 --- a/src/OpenMesh/Tools/Decimater/MixedDecimaterT.hh +++ b/src/OpenMesh/Tools/Decimater/MixedDecimaterT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/MixedDecimaterT_impl.hh b/src/OpenMesh/Tools/Decimater/MixedDecimaterT_impl.hh index e17882a6..98a38f27 100644 --- a/src/OpenMesh/Tools/Decimater/MixedDecimaterT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/MixedDecimaterT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/ModAspectRatioT.hh b/src/OpenMesh/Tools/Decimater/ModAspectRatioT.hh index 0213cbbb..30f71570 100644 --- a/src/OpenMesh/Tools/Decimater/ModAspectRatioT.hh +++ b/src/OpenMesh/Tools/Decimater/ModAspectRatioT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/ModAspectRatioT_impl.hh b/src/OpenMesh/Tools/Decimater/ModAspectRatioT_impl.hh index eebb2cc3..0546d540 100644 --- a/src/OpenMesh/Tools/Decimater/ModAspectRatioT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/ModAspectRatioT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/ModBaseT.hh b/src/OpenMesh/Tools/Decimater/ModBaseT.hh index f89e907e..f17995e5 100644 --- a/src/OpenMesh/Tools/Decimater/ModBaseT.hh +++ b/src/OpenMesh/Tools/Decimater/ModBaseT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh index e8e75a39..b196a95c 100644 --- a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh +++ b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT_impl.hh b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT_impl.hh index 084946f0..6897fe36 100644 --- a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh b/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh index 74c76373..999930eb 100644 --- a/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh +++ b/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/ModHausdorffT_impl.hh b/src/OpenMesh/Tools/Decimater/ModHausdorffT_impl.hh index 7985dc90..1fd30e01 100644 --- a/src/OpenMesh/Tools/Decimater/ModHausdorffT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/ModHausdorffT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/ModIndependentSetsT.hh b/src/OpenMesh/Tools/Decimater/ModIndependentSetsT.hh index 7a416af7..5d5ecc64 100644 --- a/src/OpenMesh/Tools/Decimater/ModIndependentSetsT.hh +++ b/src/OpenMesh/Tools/Decimater/ModIndependentSetsT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh b/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh index b3ea88e7..eac583bf 100644 --- a/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh +++ b/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/ModNormalFlippingT.hh b/src/OpenMesh/Tools/Decimater/ModNormalFlippingT.hh index 1333662b..f91b4d43 100644 --- a/src/OpenMesh/Tools/Decimater/ModNormalFlippingT.hh +++ b/src/OpenMesh/Tools/Decimater/ModNormalFlippingT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/ModProgMeshT.hh b/src/OpenMesh/Tools/Decimater/ModProgMeshT.hh index dbedc07c..43ab006a 100644 --- a/src/OpenMesh/Tools/Decimater/ModProgMeshT.hh +++ b/src/OpenMesh/Tools/Decimater/ModProgMeshT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/ModProgMeshT_impl.hh b/src/OpenMesh/Tools/Decimater/ModProgMeshT_impl.hh index 1f657851..e8944279 100644 --- a/src/OpenMesh/Tools/Decimater/ModProgMeshT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/ModProgMeshT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/ModQuadricT.hh b/src/OpenMesh/Tools/Decimater/ModQuadricT.hh index 2f431bf4..f5b5e6e5 100644 --- a/src/OpenMesh/Tools/Decimater/ModQuadricT.hh +++ b/src/OpenMesh/Tools/Decimater/ModQuadricT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/ModQuadricT_impl.hh b/src/OpenMesh/Tools/Decimater/ModQuadricT_impl.hh index 88ea66db..7606fc59 100644 --- a/src/OpenMesh/Tools/Decimater/ModQuadricT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/ModQuadricT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/ModRoundnessT.hh b/src/OpenMesh/Tools/Decimater/ModRoundnessT.hh index afd5ade4..fe58d10c 100644 --- a/src/OpenMesh/Tools/Decimater/ModRoundnessT.hh +++ b/src/OpenMesh/Tools/Decimater/ModRoundnessT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/Observer.cc b/src/OpenMesh/Tools/Decimater/Observer.cc index 5e5c5939..894d5af3 100644 --- a/src/OpenMesh/Tools/Decimater/Observer.cc +++ b/src/OpenMesh/Tools/Decimater/Observer.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Decimater/Observer.hh b/src/OpenMesh/Tools/Decimater/Observer.hh index d690209a..7f44fff3 100644 --- a/src/OpenMesh/Tools/Decimater/Observer.hh +++ b/src/OpenMesh/Tools/Decimater/Observer.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Dualizer/meshDualT.hh b/src/OpenMesh/Tools/Dualizer/meshDualT.hh index 4c221669..be4c9518 100644 --- a/src/OpenMesh/Tools/Dualizer/meshDualT.hh +++ b/src/OpenMesh/Tools/Dualizer/meshDualT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh b/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh index d4a52c29..f31d8c2b 100644 --- a/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh +++ b/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT_impl.hh b/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT_impl.hh index 461b85df..7c4d5fad 100644 --- a/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT_impl.hh +++ b/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.hh b/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.hh index c50ec078..afd35888 100644 --- a/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.hh +++ b/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * @@ -37,90 +37,90 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * * - * ========================================================================= */ - - - -/** \file LaplaceSmootherT.hh - - */ - -//============================================================================= -// -// CLASS LaplaceSmootherT -// -//============================================================================= - -#ifndef OPENMESH_LAPLACE_SMOOTHERT_HH -#define OPENMESH_LAPLACE_SMOOTHERT_HH - - - -//== INCLUDES ================================================================= - -#include - - -//== NAMESPACES =============================================================== - -namespace OpenMesh { -namespace Smoother { - -//== CLASS DEFINITION ========================================================= - -/// Laplacian Smoothing. -template -class LaplaceSmootherT : public SmootherT -{ -private: - typedef SmootherT Base; -public: - - typedef typename SmootherT::Component Component; - typedef typename SmootherT::Continuity Continuity; - typedef typename SmootherT::Scalar Scalar; - typedef typename SmootherT::VertexHandle VertexHandle; - typedef typename SmootherT::EdgeHandle EdgeHandle; - - - explicit LaplaceSmootherT( Mesh& _mesh ); - virtual ~LaplaceSmootherT(); - - - void initialize(Component _comp, Continuity _cont); - - -protected: - - // misc helpers - - Scalar weight(VertexHandle _vh) const - { return Base::mesh_.property(vertex_weights_, _vh); } - - Scalar weight(EdgeHandle _eh) const - { return Base::mesh_.property(edge_weights_, _eh); } - - -private: - - enum LaplaceWeighting { UniformWeighting, CotWeighting }; - void compute_weights(LaplaceWeighting _mode); - - - OpenMesh::VPropHandleT vertex_weights_; - OpenMesh::EPropHandleT edge_weights_; -}; - - -//============================================================================= -} // namespace Smoother -} // namespace OpenMesh -//============================================================================= -#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_LAPLACE_SMOOTHERT_C) -#define OPENMESH_LAPLACE_SMOOTHERT_TEMPLATES -#include "LaplaceSmootherT_impl.hh" -#endif -//============================================================================= -#endif // OPENMESH_LAPLACE_SMOOTHERT_HH defined -//============================================================================= - + * ========================================================================= */ + + + +/** \file LaplaceSmootherT.hh + + */ + +//============================================================================= +// +// CLASS LaplaceSmootherT +// +//============================================================================= + +#ifndef OPENMESH_LAPLACE_SMOOTHERT_HH +#define OPENMESH_LAPLACE_SMOOTHERT_HH + + + +//== INCLUDES ================================================================= + +#include + + +//== NAMESPACES =============================================================== + +namespace OpenMesh { +namespace Smoother { + +//== CLASS DEFINITION ========================================================= + +/// Laplacian Smoothing. +template +class LaplaceSmootherT : public SmootherT +{ +private: + typedef SmootherT Base; +public: + + typedef typename SmootherT::Component Component; + typedef typename SmootherT::Continuity Continuity; + typedef typename SmootherT::Scalar Scalar; + typedef typename SmootherT::VertexHandle VertexHandle; + typedef typename SmootherT::EdgeHandle EdgeHandle; + + + explicit LaplaceSmootherT( Mesh& _mesh ); + virtual ~LaplaceSmootherT(); + + + void initialize(Component _comp, Continuity _cont); + + +protected: + + // misc helpers + + Scalar weight(VertexHandle _vh) const + { return Base::mesh_.property(vertex_weights_, _vh); } + + Scalar weight(EdgeHandle _eh) const + { return Base::mesh_.property(edge_weights_, _eh); } + + +private: + + enum LaplaceWeighting { UniformWeighting, CotWeighting }; + void compute_weights(LaplaceWeighting _mode); + + + OpenMesh::VPropHandleT vertex_weights_; + OpenMesh::EPropHandleT edge_weights_; +}; + + +//============================================================================= +} // namespace Smoother +} // namespace OpenMesh +//============================================================================= +#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_LAPLACE_SMOOTHERT_C) +#define OPENMESH_LAPLACE_SMOOTHERT_TEMPLATES +#include "LaplaceSmootherT_impl.hh" +#endif +//============================================================================= +#endif // OPENMESH_LAPLACE_SMOOTHERT_HH defined +//============================================================================= + diff --git a/src/OpenMesh/Tools/Smoother/LaplaceSmootherT_impl.hh b/src/OpenMesh/Tools/Smoother/LaplaceSmootherT_impl.hh index 8e53e912..96f5068c 100644 --- a/src/OpenMesh/Tools/Smoother/LaplaceSmootherT_impl.hh +++ b/src/OpenMesh/Tools/Smoother/LaplaceSmootherT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * @@ -37,187 +37,187 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * * - * ========================================================================= */ - - - -/** \file LaplaceSmootherT_impl.hh - - */ - -//============================================================================= -// -// CLASS LaplaceSmootherT - IMPLEMENTATION -// -//============================================================================= - -#define OPENMESH_LAPLACE_SMOOTHERT_C - -//== INCLUDES ================================================================= - -#include - - -//== NAMESPACES =============================================================== - - -namespace OpenMesh { -namespace Smoother { - - -//== IMPLEMENTATION ========================================================== - - -template -LaplaceSmootherT:: -LaplaceSmootherT(Mesh& _mesh) - : SmootherT(_mesh) -{ - // custom properties - Base::mesh_.add_property(vertex_weights_); - Base::mesh_.add_property(edge_weights_); -} - - -//----------------------------------------------------------------------------- - - -template -LaplaceSmootherT:: -~LaplaceSmootherT() -{ - // free custom properties - Base::mesh_.remove_property(vertex_weights_); - Base::mesh_.remove_property(edge_weights_); -} - - -//----------------------------------------------------------------------------- - - -template -void -LaplaceSmootherT:: -initialize(Component _comp, Continuity _cont) -{ - SmootherT::initialize(_comp, _cont); - - // calculate weights - switch (_comp) - { - case Base::Tangential: - compute_weights(UniformWeighting); - break; - - - case Base::Normal: - compute_weights(CotWeighting); - break; - - - case Base::Tangential_and_Normal: - compute_weights(UniformWeighting); - break; - } -} - - -//----------------------------------------------------------------------------- - - -template -void -LaplaceSmootherT:: -compute_weights(LaplaceWeighting _weighting) -{ - typename Mesh::VertexIter v_it, v_end(Base::mesh_.vertices_end()); - typename Mesh::EdgeIter e_it, e_end(Base::mesh_.edges_end()); - typename Mesh::HalfedgeHandle heh0, heh1, heh2; - typename Mesh::VertexHandle v0, v1; - typename Mesh::Normal d0, d1; - typename Mesh::Scalar weight, lb(-1.0), ub(1.0); - - - - // init vertex weights - for (v_it=Base::mesh_.vertices_begin(); v_it!=v_end; ++v_it) - Base::mesh_.property(vertex_weights_, *v_it) = 0.0; - - - - switch (_weighting) - { - // Uniform weighting - case UniformWeighting: - { - for (e_it=Base::mesh_.edges_begin(); e_it!=e_end; ++e_it) - { - heh0 = Base::mesh_.halfedge_handle(*e_it, 0); - heh1 = Base::mesh_.halfedge_handle(*e_it, 1); - v0 = Base::mesh_.to_vertex_handle(heh0); - v1 = Base::mesh_.to_vertex_handle(heh1); - - Base::mesh_.property(edge_weights_, *e_it) = 1.0; - Base::mesh_.property(vertex_weights_, v0) += 1.0; - Base::mesh_.property(vertex_weights_, v1) += 1.0; - } - - break; - } - - - // Cotangent weighting - case CotWeighting: - { - for (e_it=Base::mesh_.edges_begin(); e_it!=e_end; ++e_it) + * ========================================================================= */ + + + +/** \file LaplaceSmootherT_impl.hh + + */ + +//============================================================================= +// +// CLASS LaplaceSmootherT - IMPLEMENTATION +// +//============================================================================= + +#define OPENMESH_LAPLACE_SMOOTHERT_C + +//== INCLUDES ================================================================= + +#include + + +//== NAMESPACES =============================================================== + + +namespace OpenMesh { +namespace Smoother { + + +//== IMPLEMENTATION ========================================================== + + +template +LaplaceSmootherT:: +LaplaceSmootherT(Mesh& _mesh) + : SmootherT(_mesh) +{ + // custom properties + Base::mesh_.add_property(vertex_weights_); + Base::mesh_.add_property(edge_weights_); +} + + +//----------------------------------------------------------------------------- + + +template +LaplaceSmootherT:: +~LaplaceSmootherT() +{ + // free custom properties + Base::mesh_.remove_property(vertex_weights_); + Base::mesh_.remove_property(edge_weights_); +} + + +//----------------------------------------------------------------------------- + + +template +void +LaplaceSmootherT:: +initialize(Component _comp, Continuity _cont) +{ + SmootherT::initialize(_comp, _cont); + + // calculate weights + switch (_comp) + { + case Base::Tangential: + compute_weights(UniformWeighting); + break; + + + case Base::Normal: + compute_weights(CotWeighting); + break; + + + case Base::Tangential_and_Normal: + compute_weights(UniformWeighting); + break; + } +} + + +//----------------------------------------------------------------------------- + + +template +void +LaplaceSmootherT:: +compute_weights(LaplaceWeighting _weighting) +{ + typename Mesh::VertexIter v_it, v_end(Base::mesh_.vertices_end()); + typename Mesh::EdgeIter e_it, e_end(Base::mesh_.edges_end()); + typename Mesh::HalfedgeHandle heh0, heh1, heh2; + typename Mesh::VertexHandle v0, v1; + typename Mesh::Normal d0, d1; + typename Mesh::Scalar weight, lb(-1.0), ub(1.0); + + + + // init vertex weights + for (v_it=Base::mesh_.vertices_begin(); v_it!=v_end; ++v_it) + Base::mesh_.property(vertex_weights_, *v_it) = 0.0; + + + + switch (_weighting) + { + // Uniform weighting + case UniformWeighting: + { + for (e_it=Base::mesh_.edges_begin(); e_it!=e_end; ++e_it) + { + heh0 = Base::mesh_.halfedge_handle(*e_it, 0); + heh1 = Base::mesh_.halfedge_handle(*e_it, 1); + v0 = Base::mesh_.to_vertex_handle(heh0); + v1 = Base::mesh_.to_vertex_handle(heh1); + + Base::mesh_.property(edge_weights_, *e_it) = 1.0; + Base::mesh_.property(vertex_weights_, v0) += 1.0; + Base::mesh_.property(vertex_weights_, v1) += 1.0; + } + + break; + } + + + // Cotangent weighting + case CotWeighting: + { + for (e_it=Base::mesh_.edges_begin(); e_it!=e_end; ++e_it) { const typename Mesh::Point *p0, *p1, *p2; - - weight = 0.0; - - heh0 = Base::mesh_.halfedge_handle(*e_it, 0); - v0 = Base::mesh_.to_vertex_handle(heh0); - p0 = &Base::mesh_.point(v0); - - heh1 = Base::mesh_.halfedge_handle(*e_it, 1); - v1 = Base::mesh_.to_vertex_handle(heh1); - p1 = &Base::mesh_.point(v1); - - heh2 = Base::mesh_.next_halfedge_handle(heh0); - p2 = &Base::mesh_.point(Base::mesh_.to_vertex_handle(heh2)); - d0 = (*p0 - *p2); d0.normalize(); - d1 = (*p1 - *p2); d1.normalize(); - weight += static_cast(1.0) / tan(acos(std::max(lb, std::min(ub, dot(d0,d1) )))); - - heh2 = Base::mesh_.next_halfedge_handle(heh1); - p2 = &Base::mesh_.point(Base::mesh_.to_vertex_handle(heh2)); - d0 = (*p0 - *p2); d0.normalize(); - d1 = (*p1 - *p2); d1.normalize(); - weight += static_cast(1.0) / tan(acos(std::max(lb, std::min(ub, dot(d0,d1) )))); - - Base::mesh_.property(edge_weights_, *e_it) = weight; - Base::mesh_.property(vertex_weights_, v0) += weight; - Base::mesh_.property(vertex_weights_, v1) += weight; - } - break; - } - } - - - // invert vertex weights: - // before: sum of edge weights - // after: one over sum of edge weights - for (v_it=Base::mesh_.vertices_begin(); v_it!=v_end; ++v_it) - { - weight = Base::mesh_.property(vertex_weights_, *v_it); - if (weight) - Base::mesh_.property(vertex_weights_, *v_it) = static_cast(1.0) / weight; - } -} - - - -//============================================================================= -} // namespace Smoother -} // namespace OpenMesh -//============================================================================= + + weight = 0.0; + + heh0 = Base::mesh_.halfedge_handle(*e_it, 0); + v0 = Base::mesh_.to_vertex_handle(heh0); + p0 = &Base::mesh_.point(v0); + + heh1 = Base::mesh_.halfedge_handle(*e_it, 1); + v1 = Base::mesh_.to_vertex_handle(heh1); + p1 = &Base::mesh_.point(v1); + + heh2 = Base::mesh_.next_halfedge_handle(heh0); + p2 = &Base::mesh_.point(Base::mesh_.to_vertex_handle(heh2)); + d0 = (*p0 - *p2); d0.normalize(); + d1 = (*p1 - *p2); d1.normalize(); + weight += static_cast(1.0) / tan(acos(std::max(lb, std::min(ub, dot(d0,d1) )))); + + heh2 = Base::mesh_.next_halfedge_handle(heh1); + p2 = &Base::mesh_.point(Base::mesh_.to_vertex_handle(heh2)); + d0 = (*p0 - *p2); d0.normalize(); + d1 = (*p1 - *p2); d1.normalize(); + weight += static_cast(1.0) / tan(acos(std::max(lb, std::min(ub, dot(d0,d1) )))); + + Base::mesh_.property(edge_weights_, *e_it) = weight; + Base::mesh_.property(vertex_weights_, v0) += weight; + Base::mesh_.property(vertex_weights_, v1) += weight; + } + break; + } + } + + + // invert vertex weights: + // before: sum of edge weights + // after: one over sum of edge weights + for (v_it=Base::mesh_.vertices_begin(); v_it!=v_end; ++v_it) + { + weight = Base::mesh_.property(vertex_weights_, *v_it); + if (weight) + Base::mesh_.property(vertex_weights_, *v_it) = static_cast(1.0) / weight; + } +} + + + +//============================================================================= +} // namespace Smoother +} // namespace OpenMesh +//============================================================================= diff --git a/src/OpenMesh/Tools/Smoother/SmootherT.hh b/src/OpenMesh/Tools/Smoother/SmootherT.hh index 90714768..5b6dfaa4 100644 --- a/src/OpenMesh/Tools/Smoother/SmootherT.hh +++ b/src/OpenMesh/Tools/Smoother/SmootherT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Smoother/SmootherT_impl.hh b/src/OpenMesh/Tools/Smoother/SmootherT_impl.hh index b9bee5c5..48fb8a99 100644 --- a/src/OpenMesh/Tools/Smoother/SmootherT_impl.hh +++ b/src/OpenMesh/Tools/Smoother/SmootherT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Smoother/smooth_mesh.hh b/src/OpenMesh/Tools/Smoother/smooth_mesh.hh index 51a0fc4d..4b1411cc 100644 --- a/src/OpenMesh/Tools/Smoother/smooth_mesh.hh +++ b/src/OpenMesh/Tools/Smoother/smooth_mesh.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh index b9298263..9754a287 100644 --- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh +++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT_impl.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT_impl.hh index e13bb0a4..23785fb9 100644 --- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT_impl.hh +++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeTraits.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeTraits.hh index 8418177d..04efe31a 100644 --- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeTraits.hh +++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeTraits.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RuleInterfaceT.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RuleInterfaceT.hh index dc133148..4367a16e 100644 --- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RuleInterfaceT.hh +++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RuleInterfaceT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh index 2c2e7679..556839a5 100644 --- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh +++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT_impl.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT_impl.hh index 8de1456e..fda17db1 100644 --- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT_impl.hh +++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/Traits.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/Traits.hh index 06addf8a..377e7adc 100644 --- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/Traits.hh +++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/Traits.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.hh index a1d71f97..2d7d3a60 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT_impl.hh b/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT_impl.hh index e74e99a7..134e0ebf 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT_impl.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh index 6a9b2fb0..21a5634d 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT_impl.hh b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT_impl.hh index c9518ef0..148f977a 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT_impl.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeTraits.hh b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeTraits.hh index 9a90362d..36fb5217 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeTraits.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeTraits.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/CompositeLoopT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/CompositeLoopT.hh index f8266fd2..fc44e24f 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/CompositeLoopT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/CompositeLoopT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/CompositeSqrt3T.hh b/src/OpenMesh/Tools/Subdivider/Uniform/CompositeSqrt3T.hh index bcc72002..24bb94da 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/CompositeSqrt3T.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/CompositeSqrt3T.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/LongestEdgeT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/LongestEdgeT.hh index 3690695a..2da6d333 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/LongestEdgeT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/LongestEdgeT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/LoopT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/LoopT.hh index 4601367c..2576c391 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/LoopT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/LoopT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/ModifiedButterFlyT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/ModifiedButterFlyT.hh index f476ad1f..5a8dec53 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/ModifiedButterFlyT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/ModifiedButterFlyT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3InterpolatingSubdividerLabsikGreinerT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3InterpolatingSubdividerLabsikGreinerT.hh index d3b7199c..a9532676 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3InterpolatingSubdividerLabsikGreinerT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3InterpolatingSubdividerLabsikGreinerT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3T.hh b/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3T.hh index 229bb692..b57e3095 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3T.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3T.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/SubdividerT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/SubdividerT.hh index d39070f8..1cd7f289 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/SubdividerT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/SubdividerT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Utils/Config.hh b/src/OpenMesh/Tools/Utils/Config.hh index c023c908..93493ea2 100644 --- a/src/OpenMesh/Tools/Utils/Config.hh +++ b/src/OpenMesh/Tools/Utils/Config.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Utils/GLConstAsString.hh b/src/OpenMesh/Tools/Utils/GLConstAsString.hh index d5c0286f..91d5675c 100644 --- a/src/OpenMesh/Tools/Utils/GLConstAsString.hh +++ b/src/OpenMesh/Tools/Utils/GLConstAsString.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Utils/HeapT.hh b/src/OpenMesh/Tools/Utils/HeapT.hh index 7f1b3a8e..1851251b 100644 --- a/src/OpenMesh/Tools/Utils/HeapT.hh +++ b/src/OpenMesh/Tools/Utils/HeapT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Utils/MeshCheckerT.hh b/src/OpenMesh/Tools/Utils/MeshCheckerT.hh index 193359d8..323f67eb 100644 --- a/src/OpenMesh/Tools/Utils/MeshCheckerT.hh +++ b/src/OpenMesh/Tools/Utils/MeshCheckerT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Utils/MeshCheckerT_impl.hh b/src/OpenMesh/Tools/Utils/MeshCheckerT_impl.hh index a8c533f1..5c1ff24a 100644 --- a/src/OpenMesh/Tools/Utils/MeshCheckerT_impl.hh +++ b/src/OpenMesh/Tools/Utils/MeshCheckerT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Utils/NumLimitsT.hh b/src/OpenMesh/Tools/Utils/NumLimitsT.hh index 9c679f36..dd3e1d60 100644 --- a/src/OpenMesh/Tools/Utils/NumLimitsT.hh +++ b/src/OpenMesh/Tools/Utils/NumLimitsT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Utils/StripifierT.hh b/src/OpenMesh/Tools/Utils/StripifierT.hh index 21ebc00c..24aa3fa1 100644 --- a/src/OpenMesh/Tools/Utils/StripifierT.hh +++ b/src/OpenMesh/Tools/Utils/StripifierT.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Utils/StripifierT_impl.hh b/src/OpenMesh/Tools/Utils/StripifierT_impl.hh index 3f86d1f3..65541ede 100644 --- a/src/OpenMesh/Tools/Utils/StripifierT_impl.hh +++ b/src/OpenMesh/Tools/Utils/StripifierT_impl.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Utils/TestingFramework.hh b/src/OpenMesh/Tools/Utils/TestingFramework.hh index ee34f721..a68b7ee2 100644 --- a/src/OpenMesh/Tools/Utils/TestingFramework.hh +++ b/src/OpenMesh/Tools/Utils/TestingFramework.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Utils/Timer.cc b/src/OpenMesh/Tools/Utils/Timer.cc index 459db75d..393f932e 100644 --- a/src/OpenMesh/Tools/Utils/Timer.cc +++ b/src/OpenMesh/Tools/Utils/Timer.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Utils/Timer.hh b/src/OpenMesh/Tools/Utils/Timer.hh index 12fa6be0..554cb0ec 100644 --- a/src/OpenMesh/Tools/Utils/Timer.hh +++ b/src/OpenMesh/Tools/Utils/Timer.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Utils/conio.cc b/src/OpenMesh/Tools/Utils/conio.cc index 9b0debf9..21db2112 100644 --- a/src/OpenMesh/Tools/Utils/conio.cc +++ b/src/OpenMesh/Tools/Utils/conio.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/Utils/conio.hh b/src/OpenMesh/Tools/Utils/conio.hh index 58fe5408..4eade3ac 100644 --- a/src/OpenMesh/Tools/Utils/conio.hh +++ b/src/OpenMesh/Tools/Utils/conio.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/VDPM/MeshTraits.hh b/src/OpenMesh/Tools/VDPM/MeshTraits.hh index 79acb9ac..0fa18a95 100644 --- a/src/OpenMesh/Tools/VDPM/MeshTraits.hh +++ b/src/OpenMesh/Tools/VDPM/MeshTraits.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/VDPM/StreamingDef.hh b/src/OpenMesh/Tools/VDPM/StreamingDef.hh index bd187856..375ee1e9 100644 --- a/src/OpenMesh/Tools/VDPM/StreamingDef.hh +++ b/src/OpenMesh/Tools/VDPM/StreamingDef.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * @@ -37,54 +37,54 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * * - * ========================================================================= */ - - - -//============================================================================= -// -// CLASS newClass -// -//============================================================================= - - -#ifndef OPENMESH_VDPM_STREAMINGDEF_HH -#define OPENMESH_VDPM_STREAMINGDEF_HH - -//== INCLUDES ================================================================= - -//== FORWARDDECLARATIONS ====================================================== - -//== NAMESPACES =============================================================== - -namespace OpenMesh { -namespace VDPM { - - -//== CLASS DEFINITION ========================================================= - -#define VDPM_STREAMING_PORT 4096 - -//#define DEBUG_COUT -//#define QDATASTREAM - -#ifdef DEBUG_COUT -static bool debug_print_; -static bool debug_print() { return debug_print_; } -static void set_debug_print(bool flag) { debug_print_ = flag; } -#endif - -enum VDPMDownLinkStatus { kStarted, kFinished, kStartable }; -enum VDPMStreamingPhase { kBaseMesh, kVSplitHeader, kVSplits }; -enum VDPMClientMode { kStatic, kDynamic }; -enum VHierarchySearchMode { kBruteForce, kUseHashing }; - - -//============================================================================= -} // namespace VDPM -} // namespace OpenMesh -//============================================================================= -#endif // OPENMESH_VDPROGMESH_VDPMSTREAMINGDEF_HH defined -//============================================================================= - - + * ========================================================================= */ + + + +//============================================================================= +// +// CLASS newClass +// +//============================================================================= + + +#ifndef OPENMESH_VDPM_STREAMINGDEF_HH +#define OPENMESH_VDPM_STREAMINGDEF_HH + +//== INCLUDES ================================================================= + +//== FORWARDDECLARATIONS ====================================================== + +//== NAMESPACES =============================================================== + +namespace OpenMesh { +namespace VDPM { + + +//== CLASS DEFINITION ========================================================= + +#define VDPM_STREAMING_PORT 4096 + +//#define DEBUG_COUT +//#define QDATASTREAM + +#ifdef DEBUG_COUT +static bool debug_print_; +static bool debug_print() { return debug_print_; } +static void set_debug_print(bool flag) { debug_print_ = flag; } +#endif + +enum VDPMDownLinkStatus { kStarted, kFinished, kStartable }; +enum VDPMStreamingPhase { kBaseMesh, kVSplitHeader, kVSplits }; +enum VDPMClientMode { kStatic, kDynamic }; +enum VHierarchySearchMode { kBruteForce, kUseHashing }; + + +//============================================================================= +} // namespace VDPM +} // namespace OpenMesh +//============================================================================= +#endif // OPENMESH_VDPROGMESH_VDPMSTREAMINGDEF_HH defined +//============================================================================= + + diff --git a/src/OpenMesh/Tools/VDPM/VFront.cc b/src/OpenMesh/Tools/VDPM/VFront.cc index b83a9704..16232984 100644 --- a/src/OpenMesh/Tools/VDPM/VFront.cc +++ b/src/OpenMesh/Tools/VDPM/VFront.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * @@ -37,78 +37,78 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * * - * ========================================================================= */ - - - -//============================================================================= -// -// CLASS newClass - IMPLEMENTATION -// -//============================================================================= - - -//== INCLUDES ================================================================= - -#include - -//== NAMESPACES =============================================================== - -namespace OpenMesh { -namespace VDPM { - -//== IMPLEMENTATION ========================================================== - - -VFront::VFront() -{ -} - - -void -VFront:: -add(VHierarchyNodeHandle _node_handle) -{ - front_location_[_node_handle.idx()] = front_.insert(front_.end(), _node_handle); -} - - -void -VFront:: -remove(VHierarchyNodeHandle _node_handle) -{ - VHierarchyNodeHandleListIter node_it = front_location_[_node_handle.idx()]; - const bool isFront = (front_it_ == node_it); - VHierarchyNodeHandleListIter next_it = front_.erase(node_it); - front_location_[_node_handle.idx()] = front_.end(); - - if (isFront) - front_it_ = next_it; -} - -bool -VFront:: -is_active(VHierarchyNodeHandle _node_handle) -{ - return (front_location_[_node_handle.idx()] != front_.end()) ? true : false; -} - -void -VFront:: -init(VHierarchyNodeHandleContainer &_roots, unsigned int _n_details) -{ - unsigned int i; - - front_location_.resize(_roots.size() + 2*_n_details); - for (i=0; i + +//== NAMESPACES =============================================================== + +namespace OpenMesh { +namespace VDPM { + +//== IMPLEMENTATION ========================================================== + + +VFront::VFront() +{ +} + + +void +VFront:: +add(VHierarchyNodeHandle _node_handle) +{ + front_location_[_node_handle.idx()] = front_.insert(front_.end(), _node_handle); +} + + +void +VFront:: +remove(VHierarchyNodeHandle _node_handle) +{ + VHierarchyNodeHandleListIter node_it = front_location_[_node_handle.idx()]; + const bool isFront = (front_it_ == node_it); + VHierarchyNodeHandleListIter next_it = front_.erase(node_it); + front_location_[_node_handle.idx()] = front_.end(); + + if (isFront) + front_it_ = next_it; +} + +bool +VFront:: +is_active(VHierarchyNodeHandle _node_handle) +{ + return (front_location_[_node_handle.idx()] != front_.end()) ? true : false; +} + +void +VFront:: +init(VHierarchyNodeHandleContainer &_roots, unsigned int _n_details) +{ + unsigned int i; + + front_location_.resize(_roots.size() + 2*_n_details); + for (i=0; i -#include -#include - - -//== FORWARDDECLARATIONS ====================================================== - - -//== NAMESPACES =============================================================== - -namespace OpenMesh { -namespace VDPM { - -//== CLASS DEFINITION ========================================================= - - -/** Active nodes in vertex hierarchy. - \todo VFront documentation -*/ -class OPENMESHDLLEXPORT VFront -{ -private: - - typedef VHierarchyNodeHandleList::iterator VHierarchyNodeHandleListIter; - enum VHierarchyNodeStatus { kSplit, kActive, kCollapse }; - - VHierarchyNodeHandleList front_; - VHierarchyNodeHandleListIter front_it_; - std::vector front_location_; - -public: - - VFront(); - - void clear() { front_.clear(); front_location_.clear(); } - void begin() { front_it_ = front_.begin(); } - bool end() { return (front_it_ == front_.end()) ? true : false; } - void next() { ++front_it_; } - int size() { return (int) front_.size(); } - VHierarchyNodeHandle node_handle() { return *front_it_; } - - void add(VHierarchyNodeHandle _node_handle); - void remove(VHierarchyNodeHandle _node_handle); - bool is_active(VHierarchyNodeHandle _node_handle); - void init(VHierarchyNodeHandleContainer &_roots, unsigned int _n_details); -}; - - -//============================================================================= -} // namespace VDPM -} // namespace OpenMesh -//============================================================================= -#endif // OPENMESH_VDPROGMESH_VFRONT_HH defined -//============================================================================= + * ========================================================================= */ + + + +//============================================================================= +// +// CLASS VFront +// +//============================================================================= + +#ifndef OPENMESH_VDPROGMESH_VFRONT_HH +#define OPENMESH_VDPROGMESH_VFRONT_HH + + +//== INCLUDES ================================================================= + +#include +#include +#include + + +//== FORWARDDECLARATIONS ====================================================== + + +//== NAMESPACES =============================================================== + +namespace OpenMesh { +namespace VDPM { + +//== CLASS DEFINITION ========================================================= + + +/** Active nodes in vertex hierarchy. + \todo VFront documentation +*/ +class OPENMESHDLLEXPORT VFront +{ +private: + + typedef VHierarchyNodeHandleList::iterator VHierarchyNodeHandleListIter; + enum VHierarchyNodeStatus { kSplit, kActive, kCollapse }; + + VHierarchyNodeHandleList front_; + VHierarchyNodeHandleListIter front_it_; + std::vector front_location_; + +public: + + VFront(); + + void clear() { front_.clear(); front_location_.clear(); } + void begin() { front_it_ = front_.begin(); } + bool end() { return (front_it_ == front_.end()) ? true : false; } + void next() { ++front_it_; } + int size() { return (int) front_.size(); } + VHierarchyNodeHandle node_handle() { return *front_it_; } + + void add(VHierarchyNodeHandle _node_handle); + void remove(VHierarchyNodeHandle _node_handle); + bool is_active(VHierarchyNodeHandle _node_handle); + void init(VHierarchyNodeHandleContainer &_roots, unsigned int _n_details); +}; + + +//============================================================================= +} // namespace VDPM +} // namespace OpenMesh +//============================================================================= +#endif // OPENMESH_VDPROGMESH_VFRONT_HH defined +//============================================================================= diff --git a/src/OpenMesh/Tools/VDPM/VHierarchy.cc b/src/OpenMesh/Tools/VDPM/VHierarchy.cc index 233abb73..8225c4b7 100644 --- a/src/OpenMesh/Tools/VDPM/VHierarchy.cc +++ b/src/OpenMesh/Tools/VDPM/VHierarchy.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/VDPM/VHierarchy.hh b/src/OpenMesh/Tools/VDPM/VHierarchy.hh index 66d5a02e..296810f4 100644 --- a/src/OpenMesh/Tools/VDPM/VHierarchy.hh +++ b/src/OpenMesh/Tools/VDPM/VHierarchy.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * @@ -37,152 +37,152 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * * - * ========================================================================= */ - - - -//============================================================================= -// -// CLASS newClass -// -//============================================================================= - -#ifndef OPENMESH_VDPROGMESH_VHIERARCHY_HH -#define OPENMESH_VDPROGMESH_VHIERARCHY_HH - - -//== INCLUDES ================================================================= - -#include -#include - - -//== FORWARDDECLARATIONS ====================================================== - - -//== NAMESPACES =============================================================== - -namespace OpenMesh { -namespace VDPM { - -//== CLASS DEFINITION ========================================================= - - -/** Keeps the vertex hierarchy build during analyzing a progressive mesh. - */ -class OPENMESHDLLEXPORT VHierarchy -{ -public: - - typedef unsigned int id_t; ///< Type for tree and node ids - -private: - - VHierarchyNodeContainer nodes_; - unsigned int n_roots_; - unsigned char tree_id_bits_; // node_id_bits_ = 32-tree_id_bits_; - -public: - - VHierarchy(); - - void clear() { nodes_.clear(); n_roots_ = 0; } - unsigned char tree_id_bits() const { return tree_id_bits_; } - unsigned int num_roots() const { return n_roots_; } - size_t num_nodes() const { return nodes_.size(); } - - VHierarchyNodeIndex generate_node_index(id_t _tree_id, id_t _node_id) - { - return VHierarchyNodeIndex(_tree_id, _node_id, tree_id_bits_); - } - - - void set_num_roots(unsigned int _n_roots); - - VHierarchyNodeHandle root_handle(unsigned int i) const - { - return VHierarchyNodeHandle( (int)i ); - } - - - const VHierarchyNode& node(VHierarchyNodeHandle _vhierarchynode_handle) const - { - return nodes_[_vhierarchynode_handle.idx()]; - } - - - VHierarchyNode& node(VHierarchyNodeHandle _vhierarchynode_handle) - { - return nodes_[_vhierarchynode_handle.idx()]; - } - - VHierarchyNodeHandle add_node(); - VHierarchyNodeHandle add_node(const VHierarchyNode &_node); - - void make_children(VHierarchyNodeHandle &_parent_handle); - - bool is_ancestor(VHierarchyNodeIndex _ancestor_index, - VHierarchyNodeIndex _descendent_index); - - bool is_leaf_node(VHierarchyNodeHandle _node_handle) - { return nodes_[_node_handle.idx()].is_leaf(); } - - bool is_root_node(VHierarchyNodeHandle _node_handle) - { return nodes_[_node_handle.idx()].is_root(); } - - - const OpenMesh::Vec3f& normal(VHierarchyNodeHandle _node_handle) const - { - return nodes_[_node_handle.idx()].normal(); - } - - const VHierarchyNodeIndex& - node_index(VHierarchyNodeHandle _node_handle) const - { return nodes_[_node_handle.idx()].node_index(); } - - VHierarchyNodeIndex& node_index(VHierarchyNodeHandle _node_handle) - { return nodes_[_node_handle.idx()].node_index(); } - - const VHierarchyNodeIndex& - fund_lcut_index(VHierarchyNodeHandle _node_handle) const - { return nodes_[_node_handle.idx()].fund_lcut_index(); } - - VHierarchyNodeIndex& fund_lcut_index(VHierarchyNodeHandle _node_handle) - { return nodes_[_node_handle.idx()].fund_lcut_index(); } - - const VHierarchyNodeIndex& - fund_rcut_index(VHierarchyNodeHandle _node_handle) const - { return nodes_[_node_handle.idx()].fund_rcut_index(); } - - VHierarchyNodeIndex& fund_rcut_index(VHierarchyNodeHandle _node_handle) - { return nodes_[_node_handle.idx()].fund_rcut_index(); } - - VertexHandle vertex_handle(VHierarchyNodeHandle _node_handle) - { return nodes_[_node_handle.idx()].vertex_handle(); } - - VHierarchyNodeHandle parent_handle(VHierarchyNodeHandle _node_handle) - { return nodes_[_node_handle.idx()].parent_handle(); } - - VHierarchyNodeHandle lchild_handle(VHierarchyNodeHandle _node_handle) - { return nodes_[_node_handle.idx()].lchild_handle(); } - - VHierarchyNodeHandle rchild_handle(VHierarchyNodeHandle _node_handle) - { return nodes_[_node_handle.idx()].rchild_handle(); } - - VHierarchyNodeHandle node_handle(VHierarchyNodeIndex _node_index); - -private: - - VHierarchyNodeHandle compute_dependency(VHierarchyNodeIndex index0, - VHierarchyNodeIndex index1); - -}; - - - -//============================================================================= -} // namespace VDPM -} // namespace OpenMesh -//============================================================================= -#endif // OPENMESH_VDPROGMESH_VHIERARCHY_HH defined -//============================================================================= + * ========================================================================= */ + + + +//============================================================================= +// +// CLASS newClass +// +//============================================================================= + +#ifndef OPENMESH_VDPROGMESH_VHIERARCHY_HH +#define OPENMESH_VDPROGMESH_VHIERARCHY_HH + + +//== INCLUDES ================================================================= + +#include +#include + + +//== FORWARDDECLARATIONS ====================================================== + + +//== NAMESPACES =============================================================== + +namespace OpenMesh { +namespace VDPM { + +//== CLASS DEFINITION ========================================================= + + +/** Keeps the vertex hierarchy build during analyzing a progressive mesh. + */ +class OPENMESHDLLEXPORT VHierarchy +{ +public: + + typedef unsigned int id_t; ///< Type for tree and node ids + +private: + + VHierarchyNodeContainer nodes_; + unsigned int n_roots_; + unsigned char tree_id_bits_; // node_id_bits_ = 32-tree_id_bits_; + +public: + + VHierarchy(); + + void clear() { nodes_.clear(); n_roots_ = 0; } + unsigned char tree_id_bits() const { return tree_id_bits_; } + unsigned int num_roots() const { return n_roots_; } + size_t num_nodes() const { return nodes_.size(); } + + VHierarchyNodeIndex generate_node_index(id_t _tree_id, id_t _node_id) + { + return VHierarchyNodeIndex(_tree_id, _node_id, tree_id_bits_); + } + + + void set_num_roots(unsigned int _n_roots); + + VHierarchyNodeHandle root_handle(unsigned int i) const + { + return VHierarchyNodeHandle( (int)i ); + } + + + const VHierarchyNode& node(VHierarchyNodeHandle _vhierarchynode_handle) const + { + return nodes_[_vhierarchynode_handle.idx()]; + } + + + VHierarchyNode& node(VHierarchyNodeHandle _vhierarchynode_handle) + { + return nodes_[_vhierarchynode_handle.idx()]; + } + + VHierarchyNodeHandle add_node(); + VHierarchyNodeHandle add_node(const VHierarchyNode &_node); + + void make_children(VHierarchyNodeHandle &_parent_handle); + + bool is_ancestor(VHierarchyNodeIndex _ancestor_index, + VHierarchyNodeIndex _descendent_index); + + bool is_leaf_node(VHierarchyNodeHandle _node_handle) + { return nodes_[_node_handle.idx()].is_leaf(); } + + bool is_root_node(VHierarchyNodeHandle _node_handle) + { return nodes_[_node_handle.idx()].is_root(); } + + + const OpenMesh::Vec3f& normal(VHierarchyNodeHandle _node_handle) const + { + return nodes_[_node_handle.idx()].normal(); + } + + const VHierarchyNodeIndex& + node_index(VHierarchyNodeHandle _node_handle) const + { return nodes_[_node_handle.idx()].node_index(); } + + VHierarchyNodeIndex& node_index(VHierarchyNodeHandle _node_handle) + { return nodes_[_node_handle.idx()].node_index(); } + + const VHierarchyNodeIndex& + fund_lcut_index(VHierarchyNodeHandle _node_handle) const + { return nodes_[_node_handle.idx()].fund_lcut_index(); } + + VHierarchyNodeIndex& fund_lcut_index(VHierarchyNodeHandle _node_handle) + { return nodes_[_node_handle.idx()].fund_lcut_index(); } + + const VHierarchyNodeIndex& + fund_rcut_index(VHierarchyNodeHandle _node_handle) const + { return nodes_[_node_handle.idx()].fund_rcut_index(); } + + VHierarchyNodeIndex& fund_rcut_index(VHierarchyNodeHandle _node_handle) + { return nodes_[_node_handle.idx()].fund_rcut_index(); } + + VertexHandle vertex_handle(VHierarchyNodeHandle _node_handle) + { return nodes_[_node_handle.idx()].vertex_handle(); } + + VHierarchyNodeHandle parent_handle(VHierarchyNodeHandle _node_handle) + { return nodes_[_node_handle.idx()].parent_handle(); } + + VHierarchyNodeHandle lchild_handle(VHierarchyNodeHandle _node_handle) + { return nodes_[_node_handle.idx()].lchild_handle(); } + + VHierarchyNodeHandle rchild_handle(VHierarchyNodeHandle _node_handle) + { return nodes_[_node_handle.idx()].rchild_handle(); } + + VHierarchyNodeHandle node_handle(VHierarchyNodeIndex _node_index); + +private: + + VHierarchyNodeHandle compute_dependency(VHierarchyNodeIndex index0, + VHierarchyNodeIndex index1); + +}; + + + +//============================================================================= +} // namespace VDPM +} // namespace OpenMesh +//============================================================================= +#endif // OPENMESH_VDPROGMESH_VHIERARCHY_HH defined +//============================================================================= diff --git a/src/OpenMesh/Tools/VDPM/VHierarchyNode.hh b/src/OpenMesh/Tools/VDPM/VHierarchyNode.hh index ba892b94..df4d2a5b 100644 --- a/src/OpenMesh/Tools/VDPM/VHierarchyNode.hh +++ b/src/OpenMesh/Tools/VDPM/VHierarchyNode.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.cc b/src/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.cc index 4c553064..60115cf8 100644 --- a/src/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.cc +++ b/src/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * @@ -37,37 +37,37 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * * - * ========================================================================= */ - - - -//============================================================================= -// -// CLASS newClass - IMPLEMENTATION -// -//============================================================================= - - -//== INCLUDES ================================================================= - -#include - - -//== NAMESPACES =============================================================== - -namespace OpenMesh { -namespace VDPM { - - -//== IMPLEMENTATION ========================================================== - - -const VHierarchyNodeIndex -VHierarchyNodeIndex::InvalidIndex = VHierarchyNodeIndex(); - - -//============================================================================= -} // namespace VDPM -} // namespace OpenMesh -//============================================================================= - + * ========================================================================= */ + + + +//============================================================================= +// +// CLASS newClass - IMPLEMENTATION +// +//============================================================================= + + +//== INCLUDES ================================================================= + +#include + + +//== NAMESPACES =============================================================== + +namespace OpenMesh { +namespace VDPM { + + +//== IMPLEMENTATION ========================================================== + + +const VHierarchyNodeIndex +VHierarchyNodeIndex::InvalidIndex = VHierarchyNodeIndex(); + + +//============================================================================= +} // namespace VDPM +} // namespace OpenMesh +//============================================================================= + diff --git a/src/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.hh b/src/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.hh index 70fc7fdf..24108f34 100644 --- a/src/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.hh +++ b/src/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc b/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc index 4a97cda7..642520b3 100644 --- a/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc +++ b/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/VDPM/VHierarchyWindow.hh b/src/OpenMesh/Tools/VDPM/VHierarchyWindow.hh index 9aff879e..8947953e 100644 --- a/src/OpenMesh/Tools/VDPM/VHierarchyWindow.hh +++ b/src/OpenMesh/Tools/VDPM/VHierarchyWindow.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/VDPM/ViewingParameters.cc b/src/OpenMesh/Tools/VDPM/ViewingParameters.cc index ab878b7a..b910e1e7 100644 --- a/src/OpenMesh/Tools/VDPM/ViewingParameters.cc +++ b/src/OpenMesh/Tools/VDPM/ViewingParameters.cc @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org * diff --git a/src/OpenMesh/Tools/VDPM/ViewingParameters.hh b/src/OpenMesh/Tools/VDPM/ViewingParameters.hh index a1ff2f1f..fb4f3ea2 100644 --- a/src/OpenMesh/Tools/VDPM/ViewingParameters.hh +++ b/src/OpenMesh/Tools/VDPM/ViewingParameters.hh @@ -1,7 +1,7 @@ /* ========================================================================= * * * * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * + * Copyright (c) 2001-2022, RWTH-Aachen University * * Department of Computer Graphics and Multimedia * * All rights reserved. * * www.openmesh.org *