Commit 9826957a authored by thery's avatar thery

on linux...

parent 4b50f19b
......@@ -17,7 +17,6 @@ template bool Algo::Surface::Export::exportPLY<PFP1>(PFP1::MAP& map, const Verte
template bool Algo::Surface::Export::exportPLYnew<PFP1>(PFP1::MAP& map, const std::vector<VertexAttribute<PFP1::VEC3, PFP1::MAP>* >& attributeHandlers, const char* filename, const bool binary);
template bool Algo::Surface::Export::exportOFF<PFP1>(PFP1::MAP& map, const VertexAttribute<PFP1::VEC3, PFP1::MAP>& position, const char* filename);
template bool Algo::Surface::Export::exportOBJ<PFP1>(PFP1::MAP& map, const VertexAttribute<PFP1::VEC3, PFP1::MAP>& position, const char* filename);
template bool Algo::Surface::Export::exportTrian<PFP1>(PFP1::MAP& map, const VertexAttribute<PFP1::VEC3, PFP1::MAP>& position, char* filename);
template bool Algo::Surface::Export::exportChoupi<PFP1>(PFP1::MAP& map, const VertexAttribute<PFP1::VEC3, PFP1::MAP>& position, const char* filename);
......@@ -30,7 +29,6 @@ template bool Algo::Surface::Export::exportPLY<PFP2>(PFP2::MAP& map, const Verte
template bool Algo::Surface::Export::exportPLYnew<PFP2>(PFP2::MAP& map, const std::vector<VertexAttribute<PFP2::VEC3, PFP2::MAP>* >& attributeHandlers, const char* filename, const bool binary);
template bool Algo::Surface::Export::exportOFF<PFP2>(PFP2::MAP& map, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& position, const char* filename);
template bool Algo::Surface::Export::exportOBJ<PFP2>(PFP2::MAP& map, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& position, const char* filename);
template bool Algo::Surface::Export::exportTrian<PFP2>(PFP2::MAP& map, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& position, char* filename);
template bool Algo::Surface::Export::exportChoupi<PFP2>(PFP2::MAP& map, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& position, const char* filename);
......@@ -43,7 +41,6 @@ template bool Algo::Surface::Export::exportPLY<PFP3>(PFP3::MAP& map, const Verte
template bool Algo::Surface::Export::exportPLYnew<PFP3>(PFP3::MAP& map, const std::vector<VertexAttribute<PFP3::VEC3, PFP3::MAP>* >& attributeHandlers, const char* filename, const bool binary);
template bool Algo::Surface::Export::exportOFF<PFP3>(PFP3::MAP& map, const VertexAttribute<PFP3::VEC3, PFP3::MAP>& position, const char* filename);
template bool Algo::Surface::Export::exportOBJ<PFP3>(PFP3::MAP& map, const VertexAttribute<PFP3::VEC3, PFP3::MAP>& position, const char* filename);
template bool Algo::Surface::Export::exportTrian<PFP3>(PFP3::MAP& map, const VertexAttribute<PFP3::VEC3, PFP3::MAP>& position, char* filename);
template bool Algo::Surface::Export::exportChoupi<PFP3>(PFP3::MAP& map, const VertexAttribute<PFP3::VEC3, PFP3::MAP>& position, const char* filename);
......@@ -51,4 +48,4 @@ int test_export()
{
return 0;
}
\ No newline at end of file
}
......@@ -15,3 +15,4 @@ importObjTex.cpp
target_link_libraries( test_algo_import
${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
qt_use_cgogn_modules(test_algo_import)
......@@ -15,7 +15,7 @@ struct PFP1 : public PFP_STANDARD
template bool Algo::Surface::Import::importMesh<PFP1>(PFP1::MAP& map, const std::string& filename, std::vector<std::string>& attrNames, bool mergeCloseVertices);
template bool Algo::Surface::Import::importVoxellisation<PFP1>(PFP1::MAP& map, Algo::Surface::Modelisation::Voxellisation& voxellisation, std::vector<std::string>& attrNames, bool mergeCloseVertices);
template bool Algo::Surface::Import::importChoupi<PFP1>(const std::string& filename, const std::vector<PFP1::VEC3>& tabV, const std::vector<unsigned int>& tabE);
//template bool Algo::Surface::Import::importChoupi<PFP1>(const std::string& filename, const std::vector<PFP1::VEC3>& tabV, const std::vector<unsigned int>& tabE);
struct PFP2 : public PFP_DOUBLE
{
......@@ -24,7 +24,7 @@ struct PFP2 : public PFP_DOUBLE
template bool Algo::Surface::Import::importMesh<PFP2>(PFP2::MAP& map, const std::string& filename, std::vector<std::string>& attrNames, bool mergeCloseVertices);
template bool Algo::Surface::Import::importVoxellisation<PFP2>(PFP2::MAP& map, Algo::Surface::Modelisation::Voxellisation& voxellisation, std::vector<std::string>& attrNames, bool mergeCloseVertices);
template bool Algo::Surface::Import::importChoupi<PFP2>(const std::string& filename, const std::vector<PFP2::VEC3>& tabV, const std::vector<unsigned int>& tabE);
//template bool Algo::Surface::Import::importChoupi<PFP2>(const std::string& filename, const std::vector<PFP2::VEC3>& tabV, const std::vector<unsigned int>& tabE);
struct PFP3 : public PFP_DOUBLE
{
......@@ -33,7 +33,7 @@ struct PFP3 : public PFP_DOUBLE
template bool Algo::Surface::Import::importMesh<PFP3>(PFP3::MAP& map, const std::string& filename, std::vector<std::string>& attrNames, bool mergeCloseVertices);
template bool Algo::Surface::Import::importVoxellisation<PFP3>(PFP3::MAP& map, Algo::Surface::Modelisation::Voxellisation& voxellisation, std::vector<std::string>& attrNames, bool mergeCloseVertices);
template bool Algo::Surface::Import::importChoupi<PFP3>(const std::string& filename, const std::vector<PFP3::VEC3>& tabV, const std::vector<unsigned int>& tabE);
//template bool Algo::Surface::Import::importChoupi<PFP3>(const std::string& filename, const std::vector<PFP3::VEC3>& tabV, const std::vector<unsigned int>& tabE);
......@@ -45,7 +45,7 @@ struct PFP4 : public PFP_STANDARD
template bool Algo::Volume::Import::importMesh<PFP4>(PFP4::MAP& map, const std::string& filename, std::vector<std::string>& attrNames);
template bool Algo::Volume::Import::importMeshToExtrude<PFP4>(PFP4::MAP& map, const std::string& filename, std::vector<std::string>& attrNames, float scale, unsigned int nbStage);
template bool Algo::Volume::Import::importMeshSAsV<PFP4>(PFP4::MAP& map, const std::string& filename, std::vector<std::string>& attrNames);
//template bool Algo::Volume::Import::importMeshSAsV<PFP4>(PFP4::MAP& map, const std::string& filename, std::vector<std::string>& attrNames);
struct PFP5 : public PFP_DOUBLE
{
......@@ -54,7 +54,7 @@ struct PFP5 : public PFP_DOUBLE
template bool Algo::Volume::Import::importMesh<PFP5>(PFP5::MAP& map, const std::string& filename, std::vector<std::string>& attrNames);
template bool Algo::Volume::Import::importMeshToExtrude<PFP5>(PFP5::MAP& map, const std::string& filename, std::vector<std::string>& attrNames, float scale, unsigned int nbStage);
template bool Algo::Volume::Import::importMeshSAsV<PFP5>(PFP5::MAP& map, const std::string& filename, std::vector<std::string>& attrNames);
//template bool Algo::Volume::Import::importMeshSAsV<PFP5>(PFP5::MAP& map, const std::string& filename, std::vector<std::string>& attrNames);
......@@ -62,4 +62,4 @@ int test_import()
{
return 0;
}
\ No newline at end of file
}
......@@ -9,8 +9,8 @@
using namespace CGoGN;
template Algo::LinearSolving::Coeff<float>;
template Algo::LinearSolving::Coeff<double>;
template class Algo::LinearSolving::Coeff<float>;
template class Algo::LinearSolving::Coeff<double>;
// Vec3 ?
......@@ -135,8 +135,6 @@ template void Algo::LinearSolving::addRowsRHS_Equality<PFP1, VEC_2>(PFP1::MAP& m
float weight,
unsigned int coord);
template void Algo::LinearSolving::addRows_Laplacian_Topo<PFP1>(PFP1::MAP& m,
const VertexAttribute<unsigned int, PFP1::MAP>& index);
template void Algo::LinearSolving::addRowsRHS_Laplacian_Topo<PFP1, SCAL_2>(PFP1::MAP& m,
const VertexAttribute<unsigned int, PFP1::MAP>& index,
......@@ -147,10 +145,6 @@ template void Algo::LinearSolving::addRowsRHS_Laplacian_Topo<PFP1, VEC_2>(PFP1::
const VertexAttribute<VEC_2, PFP1::MAP>& attr,
unsigned int coord);
template void Algo::LinearSolving::addRows_Laplacian_Cotan<PFP1>(PFP1::MAP& m,
const VertexAttribute<unsigned int, PFP1::MAP>& index,
const EdgeAttribute<PFP1::REAL, PFP1::MAP>& edgeWeight,
const VertexAttribute<PFP1::REAL, PFP1::MAP>& vertexArea);
template void Algo::LinearSolving::addRowsRHS_Laplacian_Cotan<PFP1, SCAL_2>(PFP1::MAP& m,
const VertexAttribute<unsigned int, PFP1::MAP>& index,
......@@ -180,4 +174,4 @@ int test_basic()
{
return 0;
}
\ No newline at end of file
}
......@@ -24,7 +24,7 @@ template Dart Algo::Surface::Modelisation::createQuadrangularPyramid<PFP1>(PFP1:
template Dart Algo::Surface::Modelisation::createOctahedron<PFP1>(PFP1::MAP& map, bool withBoundary);
template bool Algo::Surface::Modelisation::isPyra<PFP1>(PFP1::MAP& map, Dart d);
template bool Algo::Surface::Modelisation::isPrism<PFP1>(PFP1::MAP& map, Dart d);
template bool Algo::Surface::Modelisation::isHexahedron<PFP1>(PFP1::MAP& the_map, Dart d, unsigned int thread );
template bool Algo::Surface::Modelisation::isHexahedron<PFP1>(PFP1::MAP& the_map, Dart d);
template Dart Algo::Surface::Modelisation::embedPrism<PFP1>(PFP1::MAP& map, VertexAttribute<PFP1::VEC3, PFP1::MAP>& position, unsigned int n, bool withBoundary, float bottom_radius, float top_radius, float height);
template Dart Algo::Surface::Modelisation::embedPyramid<PFP1>(PFP1::MAP& map, VertexAttribute<PFP1::VEC3, PFP1::MAP>& position, unsigned int n, bool withBoundary, float radius, float height);
......@@ -46,7 +46,7 @@ template Dart Algo::Surface::Modelisation::createQuadrangularPyramid<PFP2>(PFP2:
template Dart Algo::Surface::Modelisation::createOctahedron<PFP2>(PFP2::MAP& map, bool withBoundary);
template bool Algo::Surface::Modelisation::isPyra<PFP2>(PFP2::MAP& map, Dart d);
template bool Algo::Surface::Modelisation::isPrism<PFP2>(PFP2::MAP& map, Dart d);
template bool Algo::Surface::Modelisation::isHexahedron<PFP2>(PFP2::MAP& the_map, Dart d, unsigned int thread);
template bool Algo::Surface::Modelisation::isHexahedron<PFP2>(PFP2::MAP& the_map, Dart d);
template Dart Algo::Surface::Modelisation::embedPrism<PFP2>(PFP2::MAP& map, VertexAttribute<PFP2::VEC3, PFP2::MAP>& position, unsigned int n, bool withBoundary, float bottom_radius, float top_radius, float height);
template Dart Algo::Surface::Modelisation::embedPyramid<PFP2>(PFP2::MAP& map, VertexAttribute<PFP2::VEC3, PFP2::MAP>& position, unsigned int n, bool withBoundary, float radius, float height);
......@@ -68,7 +68,7 @@ template Dart Algo::Surface::Modelisation::embedPyramid<PFP2>(PFP2::MAP& map, Ve
//template Dart Algo::Surface::Modelisation::createOctahedron<PFP3>(PFP3::MAP& map, bool withBoundary);
//template bool Algo::Surface::Modelisation::isPyra<PFP3>(PFP3::MAP& map, Dart d);
//template bool Algo::Surface::Modelisation::isPrism<PFP3>(PFP3::MAP& map, Dart d);
//template bool Algo::Surface::Modelisation::isHexahedron<PFP3>(PFP3::MAP& the_map, Dart d, unsigned int thread);
//template bool Algo::Surface::Modelisation::isHexahedron<PFP3>(PFP3::MAP& the_map, Dart d);
//template Dart Algo::Surface::Modelisation::embedPrism<PFP3>(PFP3::MAP& map, VertexAttribute<PFP3::VEC3, PFP3::MAP>& position, unsigned int n, bool withBoundary, float bottom_radius, float top_radius, float height);
//template Dart Algo::Surface::Modelisation::embedPyramid<PFP3>(PFP3::MAP& map, VertexAttribute<PFP3::VEC3, PFP3::MAP>& position, unsigned int n, bool withBoundary, float radius, float height);
......@@ -77,4 +77,4 @@ int test_polyhedron()
{
return 0;
}
\ No newline at end of file
}
......@@ -13,8 +13,8 @@ struct PFP1 : public PFP_STANDARD
typedef EmbeddedMap2 MAP;
};
template void Algo::Render::drawerCells<PFP1>(unsigned int cell, Utils::Drawer& dr, PFP1::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP1::VEC3, PFP1::MAP>& positions);
template void Algo::Render::drawerCell<PFP1>(unsigned int cell, Utils::Drawer& dr, PFP1::MAP& map, Dart d, const VertexAttribute<PFP1::VEC3, PFP1::MAP>& positions);
template void Algo::Render::drawerCells<PFP1>(unsigned int cell, Utils::Drawer& dr, PFP1::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP1::VEC3, PFP1::MAP>& positions,float k);
template void Algo::Render::drawerCell<PFP1>(unsigned int cell, Utils::Drawer& dr, PFP1::MAP& map, Dart d, const VertexAttribute<PFP1::VEC3, PFP1::MAP>& positions, float k);
template void Algo::Render::drawerVertices<PFP1>(Utils::Drawer& dr, PFP1::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP1::VEC3, PFP1::MAP>& positions);
template void Algo::Render::drawerEdges<PFP1>(Utils::Drawer& dr, PFP1::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP1::VEC3, PFP1::MAP>& positions, float k);
template void Algo::Render::drawerFaces<PFP1>(Utils::Drawer& dr, PFP1::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP1::VEC3, PFP1::MAP>& positions, float k);
......@@ -34,8 +34,8 @@ struct PFP2 : public PFP_DOUBLE
typedef EmbeddedMap2 MAP;
};
template void Algo::Render::drawerCells<PFP2>(unsigned int cell, Utils::Drawer& dr, PFP2::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions);
template void Algo::Render::drawerCell<PFP2>(unsigned int cell, Utils::Drawer& dr, PFP2::MAP& map, Dart d, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions);
template void Algo::Render::drawerCells<PFP2>(unsigned int cell, Utils::Drawer& dr, PFP2::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions, float k);
template void Algo::Render::drawerCell<PFP2>(unsigned int cell, Utils::Drawer& dr, PFP2::MAP& map, Dart d, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions, float k);
template void Algo::Render::drawerVertices<PFP2>(Utils::Drawer& dr, PFP2::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions);
template void Algo::Render::drawerEdges<PFP2>(Utils::Drawer& dr, PFP2::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions, float k);
template void Algo::Render::drawerFaces<PFP2>(Utils::Drawer& dr, PFP2::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions, float k);
......@@ -56,8 +56,8 @@ struct PFP3 : public PFP_DOUBLE
typedef EmbeddedGMap2 MAP;
};
template void Algo::Render::drawerCells<PFP3>(unsigned int cell, Utils::Drawer& dr, PFP3::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP3::VEC3, PFP3::MAP>& positions);
template void Algo::Render::drawerCell<PFP3>(unsigned int cell, Utils::Drawer& dr, PFP3::MAP& map, Dart d, const VertexAttribute<PFP3::VEC3, PFP3::MAP>& positions);
template void Algo::Render::drawerCells<PFP3>(unsigned int cell, Utils::Drawer& dr, PFP3::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP3::VEC3, PFP3::MAP>& positions, float k);
template void Algo::Render::drawerCell<PFP3>(unsigned int cell, Utils::Drawer& dr, PFP3::MAP& map, Dart d, const VertexAttribute<PFP3::VEC3, PFP3::MAP>& positions, float k);
template void Algo::Render::drawerVertices<PFP3>(Utils::Drawer& dr, PFP3::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP3::VEC3, PFP3::MAP>& positions);
template void Algo::Render::drawerEdges<PFP3>(Utils::Drawer& dr, PFP3::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP3::VEC3, PFP3::MAP>& positions, float k);
template void Algo::Render::drawerFaces<PFP3>(Utils::Drawer& dr, PFP3::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP3::VEC3, PFP3::MAP>& positions, float k);
......@@ -77,8 +77,8 @@ struct PFP4 : public PFP_DOUBLE
typedef EmbeddedMap3 MAP;
};
template void Algo::Render::drawerCells<PFP4>(unsigned int cell, Utils::Drawer& dr, PFP4::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP4::VEC3, PFP4::MAP>& positions);
template void Algo::Render::drawerCell<PFP4>(unsigned int cell, Utils::Drawer& dr, PFP4::MAP& map, Dart d, const VertexAttribute<PFP4::VEC3, PFP4::MAP>& positions);
template void Algo::Render::drawerCells<PFP4>(unsigned int cell, Utils::Drawer& dr, PFP4::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP4::VEC3, PFP4::MAP>& positions, float k);
template void Algo::Render::drawerCell<PFP4>(unsigned int cell, Utils::Drawer& dr, PFP4::MAP& map, Dart d, const VertexAttribute<PFP4::VEC3, PFP4::MAP>& positions, float k);
template void Algo::Render::drawerVertices<PFP4>(Utils::Drawer& dr, PFP4::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP4::VEC3, PFP4::MAP>& positions);
template void Algo::Render::drawerEdges<PFP4>(Utils::Drawer& dr, PFP4::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP4::VEC3, PFP4::MAP>& positions, float k);
template void Algo::Render::drawerFaces<PFP4>(Utils::Drawer& dr, PFP4::MAP& map, std::vector<Dart>& vd, const VertexAttribute<PFP4::VEC3, PFP4::MAP>& positions, float k);
......@@ -97,4 +97,4 @@ int test_drawerCells()
{
return 0;
}
\ No newline at end of file
}
......@@ -34,19 +34,10 @@ struct PFP2 : public PFP_DOUBLE
{
typedef EmbeddedMap2 MAP;
};
typedef PFP2::MAP MAP2;
template void Algo::Render::GL2::TopoRender::overdrawDart<MAP2>(MAP2& map, Dart d, float width, float r, float g, float b);
template Dart Algo::Render::GL2::TopoRender::picking<MAP2>(MAP2& map, int x, int y, bool withBoundary = false);
template Dart Algo::Render::GL2::TopoRender::coneSelection<MAP2>(MAP2& map, const Geom::Vec3f& rayA, const Geom::Vec3f& rayAB, float angle);
template Dart Algo::Render::GL2::TopoRender::raySelection<MAP2>(MAP2& map, const Geom::Vec3f& rayA, const Geom::Vec3f& rayAB, float distmax);
template void Algo::Render::GL2::TopoRender::updateData<PFP2>(PFP2::MAP &map, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions, float ke, float kf, bool withBoundary, bool onlyBoundary);
template void Algo::Render::GL2::TopoRender::updateData<PFP2>(PFP2::MAP &map, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions, bool onlyBoundary);
template void Algo::Render::GL2::TopoRender::updateDataBoundary<PFP2>(PFP2::MAP& map, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions, float ke, float kf, float ns);
template void Algo::Render::GL2::TopoRender::updateDataBoundary<PFP2>(PFP2::MAP& map, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions);
//template void Algo::Render::GL2::TopoRender::updateDataGMap<PFP2>(PFP2::MAP &map, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions, float ke, float kf, bool withBoundary, bool onlyBoundary);
//template void Algo::Render::GL2::TopoRender::updateDataGMap<PFP2>(PFP2::MAP &map, const VertexAttribute<PFP2::VEC3, PFP2::MAP>& positions, bool onlyBoundary);
template void Algo::Render::GL2::TopoRender::drawColoredDarts<MAP2>(MAP2& map);
struct PFPG1 : public PFP_STANDARD
......@@ -59,10 +50,6 @@ template void Algo::Render::GL2::TopoRender::overdrawDart<GMAP1>(GMAP1& map, Dar
template Dart Algo::Render::GL2::TopoRender::picking<GMAP1>(GMAP1& map, int x, int y, bool withBoundary);
template Dart Algo::Render::GL2::TopoRender::coneSelection<GMAP1>(GMAP1& map, const Geom::Vec3f& rayA, const Geom::Vec3f& rayAB, float angle);
template Dart Algo::Render::GL2::TopoRender::raySelection<GMAP1>(GMAP1& map, const Geom::Vec3f& rayA, const Geom::Vec3f& rayAB, float distmax);
//template void Algo::Render::GL2::TopoRender::updateData<PFPG1>(PFPG1::MAP &map, const VertexAttribute<PFPG1::VEC3, PFPG1::MAP>& positions, float ke, float kf, bool withBoundary, bool onlyBoundary);
//template void Algo::Render::GL2::TopoRender::updateData<PFPG1>(PFPG1::MAP &map, const VertexAttribute<PFPG1::VEC3, PFPG1::MAP>& positions, bool onlyBoundary);
//template void Algo::Render::GL2::TopoRender::updateDataBoundary<PFPG1>(PFPG1::MAP& map, const VertexAttribute<PFPG1::VEC3, PFPG1::MAP>& positions, float ke, float kf, float ns);
//template void Algo::Render::GL2::TopoRender::updateDataBoundary<PFPG1>(PFPG1::MAP& map, const VertexAttribute<PFPG1::VEC3, PFPG1::MAP>& positions);
template void Algo::Render::GL2::TopoRender::updateDataGMap<PFPG1>(PFPG1::MAP &map, const VertexAttribute<PFPG1::VEC3, PFPG1::MAP>& positions, float ke, float kf, bool withBoundary, bool onlyBoundary);
template void Algo::Render::GL2::TopoRender::updateDataGMap<PFPG1>(PFPG1::MAP &map, const VertexAttribute<PFPG1::VEC3, PFPG1::MAP>& positions, bool onlyBoundary);
template void Algo::Render::GL2::TopoRender::drawColoredDarts<GMAP1>(GMAP1& map);
......@@ -74,18 +61,8 @@ struct PFPG2 : public PFP_DOUBLE
typedef EmbeddedGMap2 MAP;
};
typedef PFPG2::MAP GMAP2;
template void Algo::Render::GL2::TopoRender::overdrawDart<GMAP2>(GMAP2& map, Dart d, float width, float r, float g, float b);
template Dart Algo::Render::GL2::TopoRender::picking<GMAP2>(GMAP2& map, int x, int y, bool withBoundary = false);
template Dart Algo::Render::GL2::TopoRender::coneSelection<GMAP2>(GMAP2& map, const Geom::Vec3f& rayA, const Geom::Vec3f& rayAB, float angle);
template Dart Algo::Render::GL2::TopoRender::raySelection<GMAP2>(GMAP2& map, const Geom::Vec3f& rayA, const Geom::Vec3f& rayAB, float distmax);
//template void Algo::Render::GL2::TopoRender::updateData<PFPG2>(PFPG2::MAP &map, const VertexAttribute<PFPG2::VEC3, PFPG2::MAP>& positions, float ke, float kf, bool withBoundary, bool onlyBoundary);
//template void Algo::Render::GL2::TopoRender::updateData<PFPG2>(PFPG2::MAP &map, const VertexAttribute<PFPG2::VEC3, PFPG2::MAP>& positions, bool onlyBoundary);
//template void Algo::Render::GL2::TopoRender::updateDataBoundary<PFPG2>(PFPG2::MAP& map, const VertexAttribute<PFPG2::VEC3, PFPG2::MAP>& positions, float ke, float kf, float ns);
//template void Algo::Render::GL2::TopoRender::updateDataBoundary<PFPG2>(PFPG2::MAP& map, const VertexAttribute<PFPG2::VEC3, PFPG2::MAP>& positions);
template void Algo::Render::GL2::TopoRender::updateDataGMap<PFPG2>(PFPG2::MAP &map, const VertexAttribute<PFPG2::VEC3, PFPG2::MAP>& positions, float ke, float kf, bool withBoundary, bool onlyBoundary);
template void Algo::Render::GL2::TopoRender::updateDataGMap<PFPG2>(PFPG2::MAP &map, const VertexAttribute<PFPG2::VEC3, PFPG2::MAP>& positions, bool onlyBoundary);
template void Algo::Render::GL2::TopoRender::drawColoredDarts<GMAP2>(GMAP2& map);
......
......@@ -27,10 +27,16 @@ int test_matrix()
Geom::Matrix<3, 3, float> Cf = Af*Bf;
Geom::Matrix<2, 2, float> Df = Bf*Af;
std::cout << Cf << std::endl;
std::cout << Df << std::endl;
Geom::Matrix<3, 2, double> Ad;
Geom::Matrix<2, 3, double> Bd;
Geom::Matrix<3, 3, double> Cd = Ad*Bd;
Geom::Matrix<2, 2, double> Dd = Bd*Ad;
std::cout << Cd << std::endl;
std::cout << Dd << std::endl;
return 0;
}
......@@ -87,18 +87,20 @@ int decimate(
approximators.push_back(new Approximator_ColorNaive<PFP>(map, attribs[1], attribs[0], attrib0ApproxResult)) ;
}
break ;
// case A_ColorQEMext : {
case A_ColorQEMext :
// {
// // pos + col
// assert(attribs.size() >= 2 || !"Decimate: A_ColorQEMext --> not enough attribs provided") ;
// approximators.push_back(new Approximator_ColorQEMext<PFP>(map, attribs)) ;
// }
// break;
// case A_GeomColorOpt : {
break;
case A_GeomColorOpt :
// {
// // pos + col
// assert(attribs.size() >= 2 || !"Decimate: A_GeomColorOpt --> not enough attribs provided") ;
// approximators.push_back(new Approximator_GeomColOpt<PFP>(map, attribs)) ;
// }
// break ;
break ;
case A_hQEM :
// pos
approximators.push_back(new Approximator_QEMhalfEdge<PFP>(map, attribs[0])) ;
......
......@@ -89,8 +89,8 @@ bool exportOBJ(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3,
* @param filename filename of trian file
* @return true
*/
template <typename PFP>
bool exportTrian(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& position, char* filename) ;
//template <typename PFP>
//bool exportTrian(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& position, char* filename) ;
......
......@@ -103,13 +103,13 @@ void export3MeshPlainSmooth(std::ofstream& out, typename PFP::MAP& map, VertexAt
if(!markF.isMarked(d) && map.phi3(d)==d)
{
markF.markOrbit<FACE>(d) ;
markF.template markOrbit<FACE>(d) ;
std::vector<unsigned int> fidx ;
fidx.reserve(4) ;
Dart dd = d ;
do
{
unsigned int vNum = map.getEmbedding<VERTEX>(dd) ;
unsigned int vNum = map.template getEmbedding<VERTEX>(dd) ;
if(!markV.isMarked(dd))
{
markV.mark(dd) ;
......
......@@ -274,7 +274,7 @@ bool isPointOnHalfEdge(typename PFP::MAP& map, Dart d, const VertexAttribute<typ
}
template <typename PFP>
bool isPointOnVertex(typename PFP::MAP& map, Vertex v, const VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& position, const typename PFP::VEC3& point)
bool isPointOnVertex(typename PFP::MAP& /*map*/, Vertex v, const VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& position, const typename PFP::VEC3& point)
{
return Geom::arePointsEquals(point, position[v]);
}
......
......@@ -399,7 +399,7 @@ void getResult(
{
foreach_cell<VERTEX>(m, [&] (Dart d)
{
attr[d] = typename ATTR_TYPE(nlGetVariable(index[d]));
attr[d] = ATTR_TYPE(nlGetVariable(index[d]));
});
}
......
......@@ -27,7 +27,7 @@
#include <string.h>
#include <vector>
#include <cmath>
//#include <typeinfo>
#include <typeinfo>
#include <algorithm>
#include "Utils/cgognStream.h"
......
......@@ -1184,7 +1184,7 @@ void MarchingCube<DataType, Windowing, PFP>::removeFacesOfBoundary(VertexAttribu
DartMarker<L_MAP> mf(*m_map);
for (Dart d = m_map->begin(); d != m_map->end();) // next done inside loop because of deleteFace
{
if (!mf.isMarked(d) && !m_map->isBoundaryMarked<2>(d))
if (!mf.isMarked(d) && !m_map->template isBoundaryMarked<2>(d))
{
Dart dd = d;
Dart e = m_map->phi1(d);
......@@ -1197,7 +1197,7 @@ void MarchingCube<DataType, Windowing, PFP>::removeFacesOfBoundary(VertexAttribu
if ((boundVertices[dd]!=0) && (boundVertices[e]!=0) && (boundVertices[f]!=0))
m_map->deleteFace(dd);
else
mf.markOrbit<FACE>(dd);
mf.template markOrbit<FACE>(dd);
}
else m_map->next(d);
}
......
......@@ -287,7 +287,7 @@ typename PFP::VEC3 MarchingCubeGen<DataType, ImgT, Windowing, PFP>::recalPoint(c
template< typename DataType, typename ImgT, template < typename D2 > class Windowing, class PFP >
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge0(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int _lZ, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge0(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int /*_lZ*/, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
{
// TODO parametre _LZ not used => a supprimer ?
......@@ -306,7 +306,7 @@ void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge0(const uns
template< typename DataType, typename ImgT, template < typename D2 > class Windowing, class PFP >
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge1(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int _lZ, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge1(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int /*_lZ*/, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
{
// TODO parametre _LZ not used => a supprimer ?
......@@ -322,7 +322,7 @@ void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge1(const uns
template< typename DataType, typename ImgT, template < typename D2 > class Windowing, class PFP >
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge2(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int _lZ, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge2(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int /*_lZ*/, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
{
// TODO parametre _LZ not used => a supprimer ?
......@@ -338,7 +338,7 @@ void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge2(const uns
template< typename DataType, typename ImgT, template < typename D2 > class Windowing, class PFP >
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge3(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int _lZ, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge3(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int /*_lZ*/, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
{
// TODO parametre _LZ not used => a supprimer ?
if (accelMCTable::m_EdgeTable[_ucCubeIndex] & 8)
......@@ -353,7 +353,7 @@ void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge3(const uns
template< typename DataType, typename ImgT, template < typename D2 > class Windowing, class PFP >
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge4(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int _lZ, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge4(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int /*_lZ*/, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
{
// TODO parametre _LZ not used => a supprimer ?
......@@ -369,7 +369,7 @@ void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge4(const uns
template< typename DataType, typename ImgT, template < typename D2 > class Windowing, class PFP >
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge5(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int _lZ, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge5(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int /*_lZ*/, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
{
// TODO parametre _LZ not used => a supprimer ?
......@@ -385,7 +385,7 @@ void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge5(const uns
template< typename DataType, typename ImgT, template < typename D2 > class Windowing, class PFP >
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge6(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int _lZ, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge6(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int /*_lZ*/, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
{
// TODO parametre _LZ not used => a supprimer ?
......@@ -401,7 +401,7 @@ void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge6(const uns
template< typename DataType, typename ImgT, template < typename D2 > class Windowing, class PFP >
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge7(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int _lZ, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge7(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int /*_lZ*/, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
{
// TODO parametre _LZ not used => a supprimer ?
......@@ -418,7 +418,7 @@ void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge7(const uns
template< typename DataType, typename ImgT, template < typename D2 > class Windowing, class PFP >
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge8(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int _lZ, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge8(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int /*_lZ*/, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
{
// TODO parametre _LZ not used => a supprimer ?
......@@ -434,7 +434,7 @@ void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge8(const uns
template< typename DataType, typename ImgT, template < typename D2 > class Windowing, class PFP >
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge9(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int _lZ, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge9(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int /*_lZ*/, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
{
// TODO parametre _LZ not used => a supprimer ?
......@@ -450,7 +450,7 @@ void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge9(const uns
template< typename DataType, typename ImgT, template < typename D2 > class Windowing, class PFP >
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge10(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int _lZ, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge10(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int /*_lZ*/, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
{
// TODO parametre _LZ not used => a supprimer ?
......@@ -466,7 +466,7 @@ void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge10(const un
template< typename DataType, typename ImgT, template < typename D2 > class Windowing, class PFP >
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge11(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int _lZ, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createPointEdge11(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int /*_lZ*/, unsigned int* const lVertTable, const typename PFP::VEC3& vPos)
{
// TODO parametre _LZ not used => a supprimer ?
......@@ -1023,7 +1023,7 @@ void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::setNeighbour(L_DART d1, L_
template< typename DataType, typename ImgT, template < typename D2 > class Windowing, class PFP >
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createLocalFaces(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int _lZ, unsigned int const *_lVertTable, const unsigned short _usMask, float curv, unsigned char tag)
void MarchingCubeGen<DataType, ImgT, Windowing, PFP>::createLocalFaces(const unsigned char _ucCubeIndex, const int _lX, const int _lY, const int /*_lZ*/, unsigned int const *_lVertTable, const unsigned short _usMask, float /*curv*/, unsigned char /*tag*/)
{
// TODO parametre _LZ not used => a supprimer ?
// TODO parametre curv not used => a supprimer ?
......
......@@ -123,7 +123,7 @@ public:
* @param val1 voxel first value
* @param val2 voxel second value
*/
float interpole(DataType val1, DataType val2) const {
float interpole(DataType /*val1*/, DataType /*val2*/) const {
return 0.5f;
}
};
......
......@@ -137,7 +137,7 @@ template <typename PFP>
bool isPrism(typename PFP::MAP& map, Dart d);
template <typename PFP>
bool isHexahedron(typename PFP::MAP& the_map, Dart d, unsigned int thread=0);
bool isHexahedron(typename PFP::MAP& the_map, Dart d);
template <typename PFP>
Dart embedPrism(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& position, unsigned int n, bool withBoundary, float bottom_radius, float top_radius, float height);
......
......@@ -418,7 +418,7 @@ bool isPrism(typename PFP::MAP& map, Dart d)
}
template <typename PFP>
bool isHexahedron(typename PFP::MAP& the_map, Dart d, unsigned int thread)
bool isHexahedron(typename PFP::MAP& the_map, Dart d)
{
unsigned int nbFaces = 0;
......
......@@ -161,6 +161,8 @@ void LoopSubdivisionAttribName(typename PFP::MAP& map, const std::string& nameAt
case CGoGNVEC4D:
return LoopSubdivisionAttribNameTyped<PFP,Geom::Vec4d>(map,nameAttrib);
break;
default:
break;
}
CGoGNerr << "LoopSubdivision not supported on attribute "<< nameAttrib << CGoGNendl;
}
......
......@@ -897,7 +897,7 @@ void DooSabin(typename PFP::MAP& map, EMBV& position)
for (std::vector<Dart>::iterator di=faces.begin(); di != faces.end(); ++di)
{
Dart e = *di;
typename PFP::VEC3 center = Geometry::faceCentroid<PFP>(map,e,position);
// typename PFP::VEC3 center = Geometry::faceCentroid<PFP>(map,e,position);
do
{
......
......@@ -209,7 +209,7 @@ void ParticleCell2DAndHalfMemo<PFP>::edgeState(VEC3 current, CellMarkerMemo<MAP,
VEC3 n2 = Geometry::faceNormal<PFP>(this->m, this->m.phi2(this->d), this->m_positions);
VEC3 axis = n1 ^ n2 ;
REAL angle = Geom::angle(n1, n2) ;
typename PFP::REAL angle = Geom::angle(n1, n2) ;
displ = Geom::rotate(axis, angle, displ) ;
current = this->getPosition() + displ;
......
......@@ -46,7 +46,7 @@ namespace Render
* @param k shrinking factor
*/
template<typename PFP>
void drawerCells(unsigned int cell, Utils::Drawer& dr, typename PFP::MAP& map, std::vector<Dart>& vd, const VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& positions);
void drawerCells(unsigned int cell, Utils::Drawer& dr, typename PFP::MAP& map, std::vector<Dart>& vd, const VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& positions, float k);
/**
* add a set of volumes to a drawer
......@@ -58,7 +58,7 @@ void drawerCells(unsigned int cell, Utils::Drawer& dr, typename PFP::MAP& map, s
* @param k shrinking factor
*/
template<typename PFP>
void drawerCell(unsigned int cell, Utils::Drawer& dr, typename PFP::MAP& map, Dart d, const VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& positions);
void drawerCell(unsigned int cell, Utils::Drawer& dr, typename PFP::MAP& map, Dart d, const VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& positions, float k);
/**
* add a set of vertices to a drawer
......
......@@ -483,7 +483,7 @@ void TopoPrimalRender<PFP>::updateData(MAP& map, const VertexAttribute<VEC3, MAP
*positionDartBuf++ = P;
*positionDartBuf++ = PP;
if (map.isBoundaryMarked<2>(d))
if (map.template isBoundaryMarked<2>(d))
{
*colorDartBuf++ = m_boundaryDartsColor;
*colorDartBuf++ = m_boundaryDartsColor;
......@@ -502,7 +502,7 @@ void TopoPrimalRender<PFP>::updateData(MAP& map, const VertexAttribute<VEC3, MAP
*positionDartBuf++ = QQ;
Dart dx = map.phi2(d);
if (map.isBoundaryMarked<2>(dx))
if (map.template isBoundaryMarked<2>(dx))
{
*colorDartBuf++ = m_boundaryDartsColor;
*colorDartBuf++ = m_boundaryDartsColor;
......
......@@ -154,7 +154,7 @@ inline Dart GMap2<MAP_IMPL>::phi2_1(Dart d) const
template <typename MAP_IMPL>
inline Dart GMap2<MAP_IMPL>::alpha_1(Dart d) const
{
return beta1(beta2(d)) ;
return this->beta1(beta2(d)) ;
}
template <typename MAP_IMPL>
......
......@@ -158,7 +158,7 @@ inline Dart GMap3<MAP_IMPL>::alpha2(Dart d) const
template <typename MAP_IMPL>
inline Dart GMap3<MAP_IMPL>::alpha_2(Dart d) const
{
return beta2(beta3(d)) ;
return this->beta2(beta3(d)) ;
}
template <typename MAP_IMPL>
......
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