Commit 595b28b3 authored by Sylvain Thery's avatar Sylvain Thery

compil on mac

parent 5b297f16
...@@ -14,8 +14,8 @@ struct PFP1 : public PFP_STANDARD ...@@ -14,8 +14,8 @@ struct PFP1 : public PFP_STANDARD
}; };
template bool Algo::Surface::BooleanOperator::isBetween<PFP1>(PFP1::MAP& map, const VertexAttribute<PFP1::VEC3, PFP1::MAP>& positions, Dart d, Dart e, Dart f); template bool Algo::Surface::BooleanOperator::isBetween<PFP1>(PFP1::MAP& map, const VertexAttribute<PFP1::VEC3, PFP1::MAP>& positions, Dart d, Dart e, Dart f);
template void Algo::Surface::BooleanOperator::mergeVertex<PFP1>(PFP1::MAP& map, VertexAttribute<PFP1::VEC3, PFP1::MAP>& positions, Dart d, Dart e); template void Algo::Surface::BooleanOperator::mergeVertex<PFP1>(PFP1::MAP& map, VertexAttribute<PFP1::VEC3, PFP1::MAP>& positions, Dart d, Dart e, int precision);
template void Algo::Surface::BooleanOperator::mergeVertices<PFP1>(PFP1::MAP& map, VertexAttribute<PFP1::VEC3, PFP1::MAP>& positions); template void Algo::Surface::BooleanOperator::mergeVertices<PFP1>(PFP1::MAP& map, VertexAttribute<PFP1::VEC3, PFP1::MAP>& positions, int precision);
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
...@@ -25,23 +25,24 @@ struct PFP2 : public PFP_DOUBLE ...@@ -25,23 +25,24 @@ struct PFP2 : public PFP_DOUBLE
}; };
template bool Algo::Surface::BooleanOperator::isBetween<PFP2>(PFP2::MAP& map, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions, Dart d, Dart e, Dart f); template bool Algo::Surface::BooleanOperator::isBetween<PFP2>(PFP2::MAP& map, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions, Dart d, Dart e, Dart f);
template void Algo::Surface::BooleanOperator::mergeVertex<PFP2>(PFP2::MAP& map, VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions, Dart d, Dart e); template void Algo::Surface::BooleanOperator::mergeVertex<PFP2>(PFP2::MAP& map, VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions, Dart d, Dart e, int precision);
template void Algo::Surface::BooleanOperator::mergeVertices<PFP2>(PFP2::MAP& map, VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions); template void Algo::Surface::BooleanOperator::mergeVertices<PFP2>(PFP2::MAP& map, VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions, int precision);
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
struct PFP3 : public PFP_STANDARD //struct PFP3 : public PFP_STANDARD
{ //{
typedef EmbeddedGMap2 MAP; // typedef EmbeddedGMap2 MAP;
}; //};
template bool Algo::Surface::BooleanOperator::isBetween<PFP3>(PFP3::MAP& map, const VertexAttribute<PFP3::VEC3, PFP3::MAP>& positions, Dart d, Dart e, Dart f); //template bool Algo::Surface::BooleanOperator::isBetween<PFP3>(PFP3::MAP& map, const VertexAttribute<PFP3::VEC3, PFP3::MAP>& positions, Dart d, Dart e, Dart f);
template void Algo::Surface::BooleanOperator::mergeVertex<PFP3>(PFP3::MAP& map, VertexAttribute<PFP3::VEC3, PFP3::MAP>& positions, Dart d, Dart e); //template void Algo::Surface::BooleanOperator::mergeVertex<PFP3>(PFP3::MAP& map, VertexAttribute<PFP3::VEC3, PFP3::MAP>& positions, Dart d, Dart e, int precision);
template void Algo::Surface::BooleanOperator::mergeVertices<PFP3>(PFP3::MAP& map, VertexAttribute<PFP3::VEC3, PFP3::MAP>& positions); //template void Algo::Surface::BooleanOperator::mergeVertices<PFP3>(PFP3::MAP& map, VertexAttribute<PFP3::VEC3, PFP3::MAP>& positions, int precision);
// TODO add removeEdgeFromVertex & insertEdgeInVertex in GMap2
int test_mergeVertices() int test_mergeVertices()
{ {
return 0; return 0;
} }
\ No newline at end of file
...@@ -22,27 +22,10 @@ template unsigned int Algo::Histogram::Histogram::markCellsOfHistogramColumn<CM1 ...@@ -22,27 +22,10 @@ template unsigned int Algo::Histogram::Histogram::markCellsOfHistogramColumn<CM1
template unsigned int Algo::Histogram::Histogram::markCellsOfQuantilesColumn<CM1>(unsigned int c, CM1& cm) const; template unsigned int Algo::Histogram::Histogram::markCellsOfQuantilesColumn<CM1>(unsigned int c, CM1& cm) const;
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
struct PFP2 : public PFP_STANDARD
{
typedef EmbeddedMap2 MAP;
};
typedef VertexAttribute<double, PFP2::MAP> VA2;
typedef VertexAttribute<Geom::Vec3f, PFP2::MAP> VAC2;
typedef CellMarker<PFP2::MAP, VERTEX> CM2;
template void Algo::Histogram::Histogram::initData<VA2>(const VA2& attr);
template void Algo::Histogram::Histogram::histoColorize<VAC2>(VAC2& colors);
template void Algo::Histogram::Histogram::quantilesColorize<VAC2>(VAC2& colors, const std::vector<Geom::Vec3f>& tc);
template unsigned int Algo::Histogram::Histogram::markCellsOfHistogramColumn<CM2>(unsigned int c, CM2& cm) const;
template unsigned int Algo::Histogram::Histogram::markCellsOfQuantilesColumn<CM2>(unsigned int c, CM2& cm) const;
int test_histogram() int test_histogram()
{ {
return 0; return 0;
} }
\ No newline at end of file
...@@ -45,10 +45,10 @@ template <typename PFP> ...@@ -45,10 +45,10 @@ template <typename PFP>
bool isBetween(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& positions, Dart d, Dart e, Dart f) ; bool isBetween(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& positions, Dart d, Dart e, Dart f) ;
template <typename PFP> template <typename PFP>
void mergeVertex(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& positions, Dart d, Dart e); void mergeVertex(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& positions, Dart d, Dart e, int precision);
template <typename PFP> template <typename PFP>
void mergeVertices(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& positions); void mergeVertices(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& positions, int precision);
} }
......
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