Commit edc52443 authored by Mike Kremer's avatar Mike Kremer

Added color attrib class plus unit tests.

git-svn-id: http://www.openvolumemesh.org/svnrepo/OpenVolumeMesh/trunk@102 66977474-1d4b-4f09-8fe9-267525286df2
parent a62018a2
/*===========================================================================*\
* *
* OpenVolumeMesh *
* Copyright (C) 2011 by Computer Graphics Group, RWTH Aachen *
* www.openvolumemesh.org *
* *
*---------------------------------------------------------------------------*
* This file is part of OpenVolumeMesh. *
* *
* OpenVolumeMesh is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Lesser General Public License as *
* published by the Free Software Foundation, either version 3 of *
* the License, or (at your option) any later version with the *
* following exceptions: *
* *
* If other files instantiate templates or use macros *
* or inline functions from this file, or you compile this file and *
* link it with other files to produce an executable, this file does *
* not by itself cause the resulting executable to be covered by the *
* GNU Lesser General Public License. This exception does not however *
* invalidate any other reasons why the executable file might be *
* covered by the GNU Lesser General Public License. *
* *
* OpenVolumeMesh is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU LesserGeneral Public *
* License along with OpenVolumeMesh. If not, *
* see <http://www.gnu.org/licenses/>. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 36 $ *
* $Date: 2012-01-10 18:00:06 +0100 (Di, 10 Jan 2012) $ *
* $LastChangedBy: kremer $ *
* *
\*===========================================================================*/
#ifndef COLORATTRIB_HH_
#define COLORATTRIB_HH_
#include <cassert>
#include "../Core/OpenVolumeMeshHandle.hh"
#include "OpenVolumeMeshStatus.hh"
#include "../Core/PropertyDefines.hh"
#include "../Core/TopologyKernel.hh"
namespace OpenVolumeMesh {
//== CLASS DEF ================================================================
template <class ColT>
class ColorAttrib {
public:
ColorAttrib(TopologyKernel& _kernel);
virtual ~ColorAttrib();
//==================
// Vertices
//==================
const ColT& operator[](const VertexHandle& _h) const {
assert((unsigned int)_h.idx() < vcolor_prop_.size());
return vcolor_prop_[_h.idx()];
}
ColT& operator[](const VertexHandle& _h) {
assert((unsigned int)_h.idx() < kernel_.n_vertices());
return vcolor_prop_[_h.idx()];
}
//==================
// Edges
//==================
const ColT& operator[](const EdgeHandle& _h) const {
assert((unsigned int)_h.idx() < ecolor_prop_.size());
return ecolor_prop_[_h.idx()];
}
ColT& operator[](const EdgeHandle& _h) {
assert((unsigned int)_h.idx() < kernel_.n_edges());
return ecolor_prop_[_h.idx()];
}
//==================
// Half-Edges
//==================
const ColT& operator[](const HalfEdgeHandle& _h) const {
assert((unsigned int)_h.idx() < hecolor_prop_.size());
return hecolor_prop_[_h.idx()];
}
ColT& operator[](const HalfEdgeHandle& _h) {
assert((unsigned int)_h.idx() < kernel_.n_halfedges());
return hecolor_prop_[_h.idx()];
}
//==================
// Faces
//==================
const ColT& operator[](const FaceHandle& _h) const {
assert((unsigned int)_h.idx() < fcolor_prop_.size());
return fcolor_prop_[_h.idx()];
}
ColT& operator[](const FaceHandle& _h) {
assert((unsigned int)_h.idx() < kernel_.n_faces());
return fcolor_prop_[_h.idx()];
}
//==================
// Half-Faces
//==================
const ColT& operator[](const HalfFaceHandle& _h) const {
assert((unsigned int)_h.idx() < hfcolor_prop_.size());
return hfcolor_prop_[_h.idx()];
}
ColT& operator[](const HalfFaceHandle& _h) {
assert((unsigned int)_h.idx() < kernel_.n_halffaces());
return hfcolor_prop_[_h.idx()];
}
//==================
// Cells
//==================
const ColT& operator[](const CellHandle& _h) const {
assert((unsigned int)_h.idx() < ccolor_prop_.size());
return ccolor_prop_[_h.idx()];
}
ColT& operator[](const CellHandle& _h) {
assert((unsigned int)_h.idx() < kernel_.n_cells());
return ccolor_prop_[_h.idx()];
}
private:
VertexPropertyT<ColT> vcolor_prop_;
EdgePropertyT<ColT> ecolor_prop_;
HalfEdgePropertyT<ColT> hecolor_prop_;
FacePropertyT<ColT> fcolor_prop_;
HalfFacePropertyT<ColT> hfcolor_prop_;
CellPropertyT<ColT> ccolor_prop_;
TopologyKernel& kernel_;
};
} // Namespace OpenVolumeMesh
#if defined(INCLUDE_TEMPLATES) && !defined(COLORATTRIBT_CC)
#include "ColorAttribT.cc"
#endif
#endif /* COLORATTRIB_HH_ */
/*===========================================================================*\
* *
* OpenVolumeMesh *
* Copyright (C) 2011 by Computer Graphics Group, RWTH Aachen *
* www.openvolumemesh.org *
* *
*---------------------------------------------------------------------------*
* This file is part of OpenVolumeMesh. *
* *
* OpenVolumeMesh is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Lesser General Public License as *
* published by the Free Software Foundation, either version 3 of *
* the License, or (at your option) any later version with the *
* following exceptions: *
* *
* If other files instantiate templates or use macros *
* or inline functions from this file, or you compile this file and *
* link it with other files to produce an executable, this file does *
* not by itself cause the resulting executable to be covered by the *
* GNU Lesser General Public License. This exception does not however *
* invalidate any other reasons why the executable file might be *
* covered by the GNU Lesser General Public License. *
* *
* OpenVolumeMesh is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU LesserGeneral Public *
* License along with OpenVolumeMesh. If not, *
* see <http://www.gnu.org/licenses/>. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 36 $ *
* $Date: 2012-01-10 18:00:06 +0100 (Di, 10 Jan 2012) $ *
* $LastChangedBy: kremer $ *
* *
\*===========================================================================*/
#define COLORATTRIBT_CC
#include "ColorAttrib.hh"
namespace OpenVolumeMesh {
template <class ColT>
ColorAttrib<ColT>::ColorAttrib(TopologyKernel& _kernel) :
vcolor_prop_(_kernel.request_vertex_property<ColT>("vertex_color")),
ecolor_prop_(_kernel.request_edge_property<ColT>("edge_color")),
hecolor_prop_(_kernel.request_halfedge_property<ColT>("halfedge_color")),
fcolor_prop_(_kernel.request_face_property<ColT>("face_color")),
hfcolor_prop_(_kernel.request_halfface_property<ColT>("halfface_color")),
ccolor_prop_(_kernel.request_cell_property<ColT>("cell_color")),
kernel_(_kernel) {
}
template <class ColT>
ColorAttrib<ColT>::~ColorAttrib() {
}
} // Namespace OpenVolumeMesh
......@@ -76,17 +76,17 @@ public:
void update_face_normals();
const typename GeomKernelT::PointT& operator[](const VertexHandle& _h) const {
assert((unsigned int)_h.idx < v_normals_.size());
assert((unsigned int)_h.idx() < v_normals_.size());
return v_normals_[_h.idx()];
}
const typename GeomKernelT::PointT& operator[](const FaceHandle& _h) const {
assert((unsigned int)_h.idx < f_normals_.size());
assert((unsigned int)_h.idx() < f_normals_.size());
return f_normals_[_h.idx()];
}
typename GeomKernelT::PointT& operator[](const VertexHandle& _h) {
assert((unsigned int)_h.idx < kernel_.n_vertices());
assert((unsigned int)_h.idx() < kernel_.n_vertices());
return v_normals_[_h.idx()];
}
......
......@@ -6,6 +6,7 @@
#include <OpenVolumeMesh/Attribs/StatusAttrib.hh>
#include <OpenVolumeMesh/Attribs/NormalAttrib.hh>
#include <OpenVolumeMesh/Attribs/ColorAttrib.hh>
using namespace OpenVolumeMesh;
......@@ -609,6 +610,48 @@ TEST_F(PolyhedralMeshBase, PolyhedralMeshStatusTest) {
EXPECT_FALSE(status[VertexHandle(9)].selected());
}
TEST_F(PolyhedralMeshBase, PolyhedralMeshColoTest) {
generatePolyhedralMesh(mesh_);
typedef OpenVolumeMesh::Geometry::Vec4f Vec4f;
// Request colors
ColorAttrib<Vec4f> colors(mesh_);
colors[VertexHandle(7)] = Vec4f(1.0f, 1.0f, 0.0f, 1.0f);
colors[EdgeHandle(6)] = Vec4f(1.0f, 1.0f, 0.0f, 1.0f);
colors[HalfEdgeHandle(5)] = Vec4f(1.0f, 1.0f, 0.0f, 1.0f);
colors[FaceHandle(4)] = Vec4f(1.0f, 1.0f, 0.0f, 1.0f);
colors[HalfFaceHandle(3)] = Vec4f(1.0f, 1.0f, 0.0f, 1.0f);
colors[CellHandle(1)] = Vec4f(1.0f, 1.0f, 0.0f, 1.0f);
EXPECT_FLOAT_EQ(1.0f, colors[VertexHandle(7)][0]);
EXPECT_FLOAT_EQ(1.0f, colors[VertexHandle(7)][1]);
EXPECT_FLOAT_EQ(0.0f, colors[VertexHandle(7)][2]);
EXPECT_FLOAT_EQ(1.0f, colors[VertexHandle(7)][3]);
EXPECT_FLOAT_EQ(1.0f, colors[EdgeHandle(6)][0]);
EXPECT_FLOAT_EQ(1.0f, colors[EdgeHandle(6)][1]);
EXPECT_FLOAT_EQ(0.0f, colors[EdgeHandle(6)][2]);
EXPECT_FLOAT_EQ(1.0f, colors[EdgeHandle(6)][3]);
EXPECT_FLOAT_EQ(1.0f, colors[HalfEdgeHandle(5)][0]);
EXPECT_FLOAT_EQ(1.0f, colors[HalfEdgeHandle(5)][1]);
EXPECT_FLOAT_EQ(0.0f, colors[HalfEdgeHandle(5)][2]);
EXPECT_FLOAT_EQ(1.0f, colors[HalfEdgeHandle(5)][3]);
EXPECT_FLOAT_EQ(1.0f, colors[FaceHandle(4)][0]);
EXPECT_FLOAT_EQ(1.0f, colors[FaceHandle(4)][1]);
EXPECT_FLOAT_EQ(0.0f, colors[FaceHandle(4)][2]);
EXPECT_FLOAT_EQ(1.0f, colors[FaceHandle(4)][3]);
EXPECT_FLOAT_EQ(1.0f, colors[HalfFaceHandle(3)][0]);
EXPECT_FLOAT_EQ(1.0f, colors[HalfFaceHandle(3)][1]);
EXPECT_FLOAT_EQ(0.0f, colors[HalfFaceHandle(3)][2]);
EXPECT_FLOAT_EQ(1.0f, colors[HalfFaceHandle(3)][3]);
EXPECT_FLOAT_EQ(1.0f, colors[CellHandle(1)][0]);
EXPECT_FLOAT_EQ(1.0f, colors[CellHandle(1)][1]);
EXPECT_FLOAT_EQ(0.0f, colors[CellHandle(1)][2]);
EXPECT_FLOAT_EQ(1.0f, colors[CellHandle(1)][3]);
}
TEST_F(PolyhedralMeshBase, PolyhedralMeshProperties) {
generatePolyhedralMesh(mesh_);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment