Commit cb353692 authored by Sylvain Thery's avatar Sylvain Thery

linux compil

parent b009736c
......@@ -33,13 +33,13 @@ template void Algo::Surface::Filtering::filterSUSAN<PFP1>(PFP1::MAP& map, float
template void Algo::Surface::Filtering::filterBilateral<PFP1>(PFP1::MAP& map,
const VertexAttribute<PFP1::VEC3, PFP1::MAP>& positionIn, VertexAttribute<PFP1::VEC3, PFP1::MAP>& positionOut,
const VertexAttribute<PFP1::VEC3, PFP1::MAP>& normal);
template void Algo::Surface::Filtering::filterBilateral<PFP2>(PFP2::MAP& map,
const VertexAttribute<PFP2::VEC3, PFP2::MAP>& positionIn, VertexAttribute<PFP2::VEC3, PFP2::MAP>& positionOut,
const VertexAttribute<PFP2::VEC3, PFP2::MAP>& normal);
template void Algo::Surface::Filtering::filterSUSAN<PFP1>(PFP1::MAP& map, float SUSANthreshold,
const VertexAttribute<PFP1::VEC3, PFP1::MAP>& position, VertexAttribute<PFP1::VEC3, PFP1::MAP>& position2,
const VertexAttribute<PFP1::VEC3, PFP1::MAP>& normal);
template void Algo::Surface::Filtering::filterSUSAN<PFP2>(PFP2::MAP& map, float SUSANthreshold,
const VertexAttribute<PFP2::VEC3, PFP2::MAP>& position, VertexAttribute<PFP2::VEC3, PFP2::MAP>& position2,
const VertexAttribute<PFP2::VEC3, PFP2::MAP>& normal);
......@@ -56,4 +56,4 @@ int test_bilateral()
{
return 0;
}
\ No newline at end of file
}
......@@ -4,7 +4,7 @@
#include "Topology/gmap/embeddedGMap2.h"
#include "Algo/Selection/rayselector.h"
#include "Algo/Selection/raySelector.h"
using namespace CGoGN;
......
......@@ -710,7 +710,7 @@ void sqrt3Vol(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typena
for(Dart ditWF = tWF.begin() ; ditWF != tWF.end() ; ditWF = tWF.next())
{
if(!map.isBoundaryFace(ditWF) && !m.isMarked(ditWF))
m.markOrbit<FACE>(ditWF);
m.template markOrbit<FACE>(ditWF);
}
VEC3 volCenter(0.0);
......@@ -732,7 +732,7 @@ void sqrt3Vol(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typena
{
if(m.isMarked(dit))
{
m.unmarkOrbit<FACE>(dit);
m.template unmarkOrbit<FACE>(dit);
Volume::Modelisation::Tetrahedralization::swap2To3<PFP>(map, dit);
}
}
......@@ -750,7 +750,7 @@ void sqrt3Vol(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typena
for(Dart ditWE = tWE.begin() ; ditWE != tWE.end() ; ditWE = tWE.next())
{
if(map.isBoundaryEdge(ditWE) && !m.isMarked(ditWE))
m.markOrbit<EDGE>(ditWE);
m.template markOrbit<EDGE>(ditWE);
}
VEC3 faceCenter(0.0);
......@@ -762,7 +762,7 @@ void sqrt3Vol(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typena
Dart dres = Volume::Modelisation::Tetrahedralization::flip1To3<PFP>(map, dit);
position[dres] = faceCenter;
newBoundaryV.markOrbit<VERTEX>(dres);
newBoundaryV.template markOrbit<VERTEX>(dres);
}
}
......
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