Commit af0fbf87 authored by untereiner's avatar untereiner

some changes

parent 9c952903
...@@ -172,7 +172,7 @@ void MyQT::cb_Open() ...@@ -172,7 +172,7 @@ void MyQT::cb_Open()
for (Dart d = tra.begin(); d != tra.end(); d = tra.next()) for (Dart d = tra.begin(); d != tra.end(); d = tra.next())
{ {
// float v = Algo::Geometry::tetrahedronVolume<PFP>(myMap, d, position); // float v = Algo::Geometry::tetrahedronVolume<PFP>(myMap, d, position);
// color[d] = PFP::VEC3(v,0,0); color[d] = PFP::VEC3(1.0,0,0);
// if (v>maxV) // if (v>maxV)
// maxV=v; // maxV=v;
...@@ -417,14 +417,14 @@ int main(int argc, char **argv) ...@@ -417,14 +417,14 @@ int main(int argc, char **argv)
for (Dart d = tra.begin(); d != tra.end(); d = tra.next()) for (Dart d = tra.begin(); d != tra.end(); d = tra.next())
{ {
// float v = Algo::Geometry::tetrahedronVolume<PFP>(myMap, d, position); // float v = Algo::Geometry::tetrahedronVolume<PFP>(myMap, d, position);
// color[d] = PFP::VEC3(v,0,0); color[d] = PFP::VEC3(1.0,0,0);
// if (v>maxV) // if (v>maxV)
// maxV=v; // maxV=v;
if(myMap.isVolumeIncidentToBoundary(d)) if(myMap.isVolumeIncidentToBoundary(d))
color[d] = PFP::VEC3(0,0,0); color[d] = PFP::VEC3(0,0,0);
else //else
color[d] = PFP::VEC3(1.0,0,0); // color[d] = PFP::VEC3(1.0,0,0);
} }
// for (unsigned int i = color.begin(); i != color.end(); color.next(i)) // for (unsigned int i = color.begin(); i != color.end(); color.next(i))
// { // {
......
...@@ -922,7 +922,7 @@ Dart edgeBisection(typename PFP::MAP& map, Dart d) ...@@ -922,7 +922,7 @@ Dart edgeBisection(typename PFP::MAP& map, Dart d)
std::vector<Dart> edges; std::vector<Dart> edges;
do do
{ {
if(!map.isBoundaryMarked3(dit)) if(!map.isBoundaryMarked(3,dit))
{ {
edges.push_back(map.phi_1(dit)); edges.push_back(map.phi_1(dit));
edges.push_back(map.phi_1(map.phi2(map.phi_1(edges[0])))); edges.push_back(map.phi_1(map.phi2(map.phi_1(edges[0]))));
......
...@@ -1338,7 +1338,7 @@ unsigned int Map3<MAP_IMPL>::closeMap() ...@@ -1338,7 +1338,7 @@ unsigned int Map3<MAP_IMPL>::closeMap()
if (phi3(d) == d) if (phi3(d) == d)
{ {
++nb ; ++nb ;
closeHole(d); closeHole(d,true);
} }
} }
return nb ; return nb ;
......
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