Commit 07db9767 authored by Sylvain Thery's avatar Sylvain Thery

update topoRender because of phi2/phi3 rendring problem due to lack of phixed points ;))

Use SelectorDartNoBoundary for rendering without boundary, example:
        SelectorDartNoBoundary<PFP::MAP> nb(myMap);
        m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f,nb);
parent d758f4b9
...@@ -236,7 +236,7 @@ void Topo3RenderMapD::updateData(typename PFP::MAP& map, const FunctorSelect& go ...@@ -236,7 +236,7 @@ void Topo3RenderMapD::updateData(typename PFP::MAP& map, const FunctorSelect& go
m_nbRel2++; m_nbRel2++;
} }
e = map.phi3(d); e = map.phi3(d);
if (d < e) if (!map.isBoundaryFace(d) && (d < e))
{ {
*positionF3++ = fv2[d]; *positionF3++ = fv2[d];
*positionF3++ = fv2x[e]; *positionF3++ = fv2x[e];
......
...@@ -158,7 +158,8 @@ void TopoRenderMapD::updateData(typename PFP::MAP& map, const typename PFP::TVEC ...@@ -158,7 +158,8 @@ void TopoRenderMapD::updateData(typename PFP::MAP& map, const typename PFP::TVEC
Dart d = *id; Dart d = *id;
Dart e = map.phi2(d); Dart e = map.phi2(d);
if (e.index > d.index)
if (good(e) && (e.index > d.index))
{ {
*positionF2++ = fv2[d]; *positionF2++ = fv2[d];
*positionF2++ = fv2[e]; *positionF2++ = fv2[e];
......
...@@ -146,6 +146,32 @@ public: ...@@ -146,6 +146,32 @@ public:
FunctorSelect* copy() const { return new SelectorEdgeNoBoundary(m_map);} FunctorSelect* copy() const { return new SelectorEdgeNoBoundary(m_map);}
}; };
template <typename MAP>
class SelectorDartBoundary : public FunctorSelect
{
public:
protected:
MAP& m_map;
public:
SelectorDartBoundary(MAP& m): m_map(m) {}
bool operator()(Dart d) const { return m_map.isBoundaryMarked(d); }
FunctorSelect* copy() const { return new SelectorDartBoundary(m_map);}
};
template <typename MAP>
class SelectorDartNoBoundary : public FunctorSelect
{
public:
protected:
MAP& m_map;
public:
SelectorDartNoBoundary(MAP& m): m_map(m) {}
bool operator()(Dart d) const { return !m_map.isBoundaryMarked(d); }
FunctorSelect* copy() const { return new SelectorDartNoBoundary(m_map);}
};
// //
//class SelectorDartMarked : public FunctorSelect //class SelectorDartMarked : public FunctorSelect
//{ //{
......
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