Commit abc26d95 authored by untereiner's avatar untereiner

bug correction : mr dart duplication in container

parent ab23f706
......@@ -279,20 +279,9 @@ public:
void operator() ()
{
std::cout << "lerp edges" << std::endl;
TraversorE<typename PFP::MAP> trav(m_map) ;
std::cout << "begin = " << m_map.begin() << std::endl;
std::cout << "end = " << m_map.end() << std::endl;
std::cout << "begin = " << trav.begin() << std::endl;
std::cout << "end = " << trav.end() << std::endl;
std::cout << "next = " << trav.next() << std::endl;
for (Dart d = trav.begin(); d != trav.end(); d = trav.next())
{
std::cout << "edges" << std::endl;
typename PFP::VEC3 p = (m_position[d] + m_position[m_map.phi2(d)]) * typename PFP::REAL(0.5);
m_map.incCurrentLevel() ;
......@@ -318,7 +307,6 @@ public:
void operator() ()
{
std::cout << "lerp faces" << std::endl;
TraversorF<typename PFP::MAP> trav(m_map) ;
for (Dart d = trav.begin(); d != trav.end(); d = trav.next())
{
......@@ -349,7 +337,6 @@ public:
void operator() ()
{
std::cout << "lerp volumes" << std::endl;
TraversorW<typename PFP::MAP> trav(m_map) ;
for (Dart d = trav.begin(); d != trav.end(); d = trav.next())
{
......
......@@ -85,7 +85,7 @@ public:
//!
/*
*/
//void addNewLevelHexa(bool embedNewVertices);
void addNewLevelHexa(bool embedNewVertices);
//!
/*
......
......@@ -74,7 +74,7 @@ public:
template<typename PFP, unsigned int ORBIT>
void updateVBO(Utils::VBO& vboPosition, Utils::VBO& vboNormals, Utils::VBO& vboColor, typename PFP::MAP& map,
constVertexAttribute<typename PFP::VEC3>& positions, const VertexAttribute<typename PFP::VEC3>& normals, const AttributeHandler<typename PFP::VEC3, ORBIT>& colorPerXXX, const FunctorSelect& good = allDarts) ;
const VertexAttribute<typename PFP::VEC3>& positions, const VertexAttribute<typename PFP::VEC3>& normals, const AttributeHandler<typename PFP::VEC3, ORBIT>& colorPerXXX, const FunctorSelect& good = allDarts) ;
/**
......
......@@ -62,7 +62,7 @@ void ColorPerFaceRender::updateVBO(Utils::VBO& vboPosition, Utils::VBO& vboColor
std::vector<VEC3> bufferColors;
bufferColors.reserve(16384);
TraversorCell<typename PFP::MAP> traFace(map, FACE,good);
TraversorCell<typename PFP::MAP, FACE> traFace(map, good);
for (Dart d=traFace.begin(); d!=traFace.end(); d=traFace.next())
{
......@@ -115,7 +115,7 @@ void ColorPerFaceRender::updateVBO(Utils::VBO& vboPosition, Utils::VBO& vboNorma
std::vector<VEC3> bufferColors;
bufferColors.reserve(16384);
TraversorCell<typename PFP::MAP> traFace(map, FACE,good);
TraversorCell<typename PFP::MAP, FACE> traFace(map, good);
for (Dart d=traFace.begin(); d!=traFace.end(); d=traFace.next())
{
......
......@@ -205,7 +205,7 @@ void GenericMap::addLevel()
for(unsigned int i = m_mrattribs.begin(); i != m_mrattribs.end(); m_mrattribs.next(i))
{
++(*m_mrLevels)[i]; // increase the insertion level of the darts
//++(*m_mrLevels)[i]; // increase the insertion level of the darts
unsigned int oldi = (*prevAttrib)[i] ; // get the index of the dart in previous level
(*newAttrib)[i] = copyDartLine(oldi) ; // copy the dart and affect it to the new level
}
......
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