drop VectorDimensionsT metaprogram in favor of vector_traits
(thanks to Marco Centin and Amodio Pesce)
This commit is contained in:
@@ -1,80 +0,0 @@
|
|||||||
/* ========================================================================= *
|
|
||||||
* *
|
|
||||||
* OpenMesh *
|
|
||||||
* Copyright (c) 2001-2015, RWTH-Aachen University *
|
|
||||||
* Department of Computer Graphics and Multimedia *
|
|
||||||
* All rights reserved. *
|
|
||||||
* www.openmesh.org *
|
|
||||||
* *
|
|
||||||
*---------------------------------------------------------------------------*
|
|
||||||
* This file is part of OpenMesh. *
|
|
||||||
*---------------------------------------------------------------------------*
|
|
||||||
* *
|
|
||||||
* Redistribution and use in source and binary forms, with or without *
|
|
||||||
* modification, are permitted provided that the following conditions *
|
|
||||||
* are met: *
|
|
||||||
* *
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, *
|
|
||||||
* this list of conditions and the following disclaimer. *
|
|
||||||
* *
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright *
|
|
||||||
* notice, this list of conditions and the following disclaimer in the *
|
|
||||||
* documentation and/or other materials provided with the distribution. *
|
|
||||||
* *
|
|
||||||
* 3. Neither the name of the copyright holder nor the names of its *
|
|
||||||
* contributors may be used to endorse or promote products derived from *
|
|
||||||
* this software without specific prior written permission. *
|
|
||||||
* *
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS *
|
|
||||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED *
|
|
||||||
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A *
|
|
||||||
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER *
|
|
||||||
* OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, *
|
|
||||||
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, *
|
|
||||||
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR *
|
|
||||||
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF *
|
|
||||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING *
|
|
||||||
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS *
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
|
|
||||||
* *
|
|
||||||
* ========================================================================= */
|
|
||||||
|
|
||||||
//=============================================================================
|
|
||||||
//
|
|
||||||
// CLASS VectorDimensionsT
|
|
||||||
//
|
|
||||||
//=============================================================================
|
|
||||||
|
|
||||||
#ifndef DOXYGEN
|
|
||||||
|
|
||||||
#ifndef OPENMESH_VECTOR_DIMENSIONS_HH
|
|
||||||
#define OPENMESH_VECTOR_DIMENSIONS_HH
|
|
||||||
|
|
||||||
//== INCLUDES =================================================================
|
|
||||||
|
|
||||||
#include <OpenMesh/Core/System/config.h>
|
|
||||||
#include <OpenMesh/Core/Geometry/VectorT.hh>
|
|
||||||
|
|
||||||
//== NAMESPACES ===============================================================
|
|
||||||
|
|
||||||
namespace OpenMesh {
|
|
||||||
|
|
||||||
//== CLASS DEFINITION =========================================================
|
|
||||||
|
|
||||||
template<typename Vector>
|
|
||||||
struct VectorDimensionsT {};
|
|
||||||
|
|
||||||
template<typename Scalar, int Dim>
|
|
||||||
struct VectorDimensionsT< OpenMesh::VectorT<Scalar, Dim> > {
|
|
||||||
enum {
|
|
||||||
value = Dim
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
//=============================================================================
|
|
||||||
} // namespace OpenMesh
|
|
||||||
//=============================================================================
|
|
||||||
|
|
||||||
#endif // OPENMESH_VECTOR_DIMENSIONS_HH defined
|
|
||||||
//=============================================================================
|
|
||||||
#endif // DOXYGEN
|
|
||||||
@@ -61,9 +61,9 @@
|
|||||||
|
|
||||||
#include <OpenMesh/Core/Mesh/PolyMeshT.hh>
|
#include <OpenMesh/Core/Mesh/PolyMeshT.hh>
|
||||||
#include <OpenMesh/Core/Geometry/LoopSchemeMaskT.hh>
|
#include <OpenMesh/Core/Geometry/LoopSchemeMaskT.hh>
|
||||||
#include <OpenMesh/Core/Geometry/VectorDimensionsT.hh>
|
|
||||||
#include <OpenMesh/Core/Utils/GenProg.hh>
|
#include <OpenMesh/Core/Utils/GenProg.hh>
|
||||||
#include <OpenMesh/Core/Utils/vector_cast.hh>
|
#include <OpenMesh/Core/Utils/vector_cast.hh>
|
||||||
|
#include <OpenMesh/Core/Utils/vector_traits.hh>
|
||||||
#include <OpenMesh/Core/System/omstream.hh>
|
#include <OpenMesh/Core/System/omstream.hh>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
@@ -102,7 +102,7 @@ typename PolyMeshT<Kernel>::Normal
|
|||||||
PolyMeshT<Kernel>::calc_face_normal(FaceHandle _fh) const
|
PolyMeshT<Kernel>::calc_face_normal(FaceHandle _fh) const
|
||||||
{
|
{
|
||||||
return calc_face_normal_impl(_fh, typename GenProg::IF<
|
return calc_face_normal_impl(_fh, typename GenProg::IF<
|
||||||
VectorDimensionsT<PolyMeshT<Kernel>::Point>::value == 3,
|
vector_traits<PolyMeshT<Kernel>::Point>::size_ == 3,
|
||||||
PointIs3DTag,
|
PointIs3DTag,
|
||||||
PointIsNot3DTag
|
PointIsNot3DTag
|
||||||
>::Result());
|
>::Result());
|
||||||
@@ -169,7 +169,7 @@ calc_face_normal(const Point& _p0,
|
|||||||
const Point& _p2) const
|
const Point& _p2) const
|
||||||
{
|
{
|
||||||
return calc_face_normal_impl(_p0, _p1, _p2, typename GenProg::IF<
|
return calc_face_normal_impl(_p0, _p1, _p2, typename GenProg::IF<
|
||||||
VectorDimensionsT<PolyMeshT<Kernel>::Point>::value == 3,
|
vector_traits<PolyMeshT<Kernel>::Point>::size_ == 3,
|
||||||
PointIs3DTag,
|
PointIs3DTag,
|
||||||
PointIsNot3DTag
|
PointIsNot3DTag
|
||||||
>::Result());
|
>::Result());
|
||||||
|
|||||||
Reference in New Issue
Block a user