Commit 012c4270 authored by Thomas Pitiot 's avatar Thomas Pitiot

rdy to test surfaces

parent 61fbdd93
......@@ -542,15 +542,13 @@ void ParticleCell3D<PFP>::edgeState(const VEC3& current)
}
else { // sur le sommet de l'arete
this->m_position = position[2];
std::cout << "edgeState va dans sommet cas 1 position :"<< this->m_position << std::endl;
vertexState(current);
}
}
else { // sur l'autre sommet de l'arete
d=m.phi1(d);
std::cout << "edgeState va dans sommet cas 1 position :"<< this->m_position << std::endl;
vertexState(current);
vertexState(current);
}
}
else { // on est sur la face
......
......@@ -75,11 +75,11 @@ public:
* ATTRIBUTES MANAGEMENT *
***************************************************/
template <typename T, unsigned int ORBIT>
AttributeHandler_IHM<T, ORBIT> addAttribute(const std::string& nameAttr) ;
// template <typename T, unsigned int ORBIT>
// AttributeHandler_IHM<T, ORBIT> addAttribute(const std::string& nameAttr) ;
template <typename T, unsigned int ORBIT>
AttributeHandler_IHM<T, ORBIT> getAttribute(const std::string& nameAttr) ;
// template <typename T, unsigned int ORBIT>
// AttributeHandler_IHM<T, ORBIT> getAttribute(const std::string& nameAttr) ;
/***************************************************
* MAP TRAVERSAL *
......
......@@ -29,33 +29,33 @@ namespace CGoGN
* ATTRIBUTES MANAGEMENT *
***************************************************/
template <typename T, unsigned int ORBIT>
AttributeHandler_IHM<T, ORBIT> ImplicitHierarchicalMap2::addAttribute(const std::string& nameAttr)
{
bool addNextLevelCell = false ;
if(!isOrbitEmbedded<ORBIT>())
addNextLevelCell = true ;
//template <typename T, unsigned int ORBIT>
//AttributeHandler_IHM<T, ORBIT> ImplicitHierarchicalMap2::addAttribute(const std::string& nameAttr)
//{
// bool addNextLevelCell = false ;
// if(!isOrbitEmbedded<ORBIT>())
// addNextLevelCell = true ;
AttributeHandler<T, ORBIT, ImplicitHierarchicalMap2> h = TOPO_MAP::addAttribute<T, ORBIT>(nameAttr) ;
// AttributeHandler<T, ORBIT, ImplicitHierarchicalMap2> h = TOPO_MAP::addAttribute<T, ORBIT>(nameAttr) ;
if(addNextLevelCell)
{
AttributeContainer& cellCont = m_attribs[ORBIT] ;
AttributeMultiVector<unsigned int>* amv = cellCont.addAttribute<unsigned int>("nextLevelCell") ;
m_nextLevelCell[ORBIT] = amv ;
for(unsigned int i = cellCont.begin(); i < cellCont.end(); cellCont.next(i))
amv->operator[](i) = EMBNULL ;
}
// if(addNextLevelCell)
// {
// AttributeContainer& cellCont = m_attribs[ORBIT] ;
// AttributeMultiVector<unsigned int>* amv = cellCont.addAttribute<unsigned int>("nextLevelCell") ;
// m_nextLevelCell[ORBIT] = amv ;
// for(unsigned int i = cellCont.begin(); i < cellCont.end(); cellCont.next(i))
// amv->operator[](i) = EMBNULL ;
// }
return AttributeHandler_IHM<T, ORBIT>(this, h.getDataVector()) ;
}
// return AttributeHandler_IHM<T, ORBIT>(this, h.getDataVector()) ;
//}
template <typename T, unsigned int ORBIT>
AttributeHandler_IHM<T, ORBIT> ImplicitHierarchicalMap2::getAttribute(const std::string& nameAttr)
{
AttributeHandler<T, ORBIT, ImplicitHierarchicalMap2> h = TOPO_MAP::getAttribute<T, ORBIT, ImplicitHierarchicalMap2>(nameAttr) ;
return AttributeHandler_IHM<T, ORBIT>(this, h.getDataVector()) ;
}
//template <typename T, unsigned int ORBIT>
//AttributeHandler_IHM<T, ORBIT> ImplicitHierarchicalMap2::getAttribute(const std::string& nameAttr)
//{
// AttributeHandler<T, ORBIT, ImplicitHierarchicalMap2> h = TOPO_MAP::getAttribute<T, ORBIT, ImplicitHierarchicalMap2>(nameAttr) ;
// return AttributeHandler_IHM<T, ORBIT>(this, h.getDataVector()) ;
//}
inline void ImplicitHierarchicalMap2::update_topo_shortcuts()
......
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