Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix property manager property access for bool properties

Browse Source
This commit is contained in:
Max Lyon
2019-11-22 11:00:17 +01:00
parent 5c99f6033b
commit 05c0159387
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/OpenMesh/Core/Utils/PropertyManager.hh
View File

@@ -80,10 +80,12 @@ template<typename PROPTYPE, typename MeshT = int>
class PropertyManager { class PropertyManager {
public: public:
using Value = typename PROPTYPE::Value; using Value = typename PROPTYPE::Value;
using value_type = typename PROPTYPE::value_type; using value_type = typename PROPTYPE::value_type;
using Handle = typename PROPTYPE::Handle; using Handle = typename PROPTYPE::Handle;
using Self = PropertyManager<PROPTYPE, MeshT>; using Self = PropertyManager<PROPTYPE, MeshT>;
using Reference = typename PROPTYPE::reference;
using ConstReference = typename PROPTYPE::const_reference;
private: private:
// Mesh properties (MPropHandleT<...>) are stored differently than the other properties. // Mesh properties (MPropHandleT<...>) are stored differently than the other properties.
@@ -101,10 +103,10 @@ class PropertyManager {
static void swap(PropertyManager<PROPTYPE, MeshT>& from, PropertyManager2& to) { static void swap(PropertyManager<PROPTYPE, MeshT>& from, PropertyManager2& to) {
std::swap(*to, *from); std::swap(*to, *from);
} }
static const Value& access_property_const(PolyConnectivity& mesh, const PROPTYPE& prop_handle, const Handle&) { static ConstReference access_property_const(PolyConnectivity& mesh, const PROPTYPE& prop_handle, const Handle&) {
return mesh.property(prop_handle); return mesh.property(prop_handle);
} }
static Value& access_property(PolyConnectivity& mesh, const PROPTYPE& prop_handle, const Handle&) { static Reference access_property(PolyConnectivity& mesh, const PROPTYPE& prop_handle, const Handle&) {
return mesh.property(prop_handle); return mesh.property(prop_handle);
} }
}; };
@@ -121,10 +123,10 @@ class PropertyManager {
lhs.mesh().property(lhs.prop_).resize(lhs.mesh().template n_elements<Handle>()); lhs.mesh().property(lhs.prop_).resize(lhs.mesh().template n_elements<Handle>());
rhs.mesh().property(rhs.prop_).resize(rhs.mesh().template n_elements<Handle>()); rhs.mesh().property(rhs.prop_).resize(rhs.mesh().template n_elements<Handle>());
} }
static const Value& access_property_const(PolyConnectivity& mesh, const PROPTYPE& prop_handle, const Handle& handle) { static ConstReference access_property_const(PolyConnectivity& mesh, const PROPTYPE& prop_handle, const Handle& handle) {
return mesh.property(prop_handle, handle); return mesh.property(prop_handle, handle);
} }
static Value& access_property(PolyConnectivity& mesh, const PROPTYPE& prop_handle, const Handle& handle) { static Reference access_property(PolyConnectivity& mesh, const PROPTYPE& prop_handle, const Handle& handle) {
return mesh.property(prop_handle, handle); return mesh.property(prop_handle, handle);
} }
}; };