Commit 82d4fd2e authored by Sylvain Thery's avatar Sylvain Thery

add -Wextra compilation flag & remove some warnings

parent 20543b8f
...@@ -965,7 +965,7 @@ void Clipping::cb_keyPress(int code) ...@@ -965,7 +965,7 @@ void Clipping::cb_keyPress(int code)
} }
} }
void Clipping::cb_mousePress(int button, int x, int y) void Clipping::cb_mousePress(int /*button*/, int x, int y)
{ {
// Check if no animation is active // Check if no animation is active
if (m_lastAnimatedClippingPreset != NULL) if (m_lastAnimatedClippingPreset != NULL)
......
...@@ -145,7 +145,7 @@ void MyQT::cb_redraw() ...@@ -145,7 +145,7 @@ void MyQT::cb_redraw()
} }
void MyQT::cb_mousePress(int button, int x, int y) void MyQT::cb_mousePress(int /*button*/, int x, int y)
{ {
if (!Shift()) if (!Shift())
return; return;
...@@ -249,7 +249,7 @@ void MyQT::cb_mouseMove(int buttons, int x, int y) ...@@ -249,7 +249,7 @@ void MyQT::cb_mouseMove(int buttons, int x, int y)
} }
void MyQT::cb_wheelEvent(int delta, int x, int y) void MyQT::cb_wheelEvent(int delta, int /*x*/, int /*y*/)
{ {
if (!Shift()) if (!Shift())
return; return;
......
...@@ -33,24 +33,26 @@ ...@@ -33,24 +33,26 @@
#include "Utils/chrono.h" #include "Utils/chrono.h"
#include "Algo/Export/exportVol.h"
PFP::MAP myMap; PFP::MAP myMap;
VertexAttribute<PFP::VEC3> position ; VertexAttribute<PFP::VEC3> position ;
VolumeAttribute<PFP::VEC3> color ; VolumeAttribute<PFP::VEC3> color ;
void MyQT::volumes_onoff(bool x) void MyQT::volumes_onoff(bool /*x*/)
{ {
render_volumes = !render_volumes; render_volumes = !render_volumes;
updateGL(); updateGL();
} }
void MyQT::edges_onoff(bool x) void MyQT::edges_onoff(bool /*x*/)
{ {
render_edges = !render_edges; render_edges = !render_edges;
updateGL(); updateGL();
} }
void MyQT::topo_onoff(bool x) void MyQT::topo_onoff(bool /*x*/)
{ {
render_topo = !render_topo; render_topo = !render_topo;
if (render_topo) if (render_topo)
...@@ -88,7 +90,7 @@ void MyQT::clipping_onoff(bool x) ...@@ -88,7 +90,7 @@ void MyQT::clipping_onoff(bool x)
updateGL(); updateGL();
} }
void MyQT::hide_onoff(bool x) void MyQT::hide_onoff(bool /*x*/)
{ {
hide_clipping = !hide_clipping; hide_clipping = !hide_clipping;
updateGL(); updateGL();
...@@ -270,7 +272,7 @@ void MyQT::cb_redraw() ...@@ -270,7 +272,7 @@ void MyQT::cb_redraw()
} }
void MyQT::cb_mousePress(int button, int x, int y) void MyQT::cb_mousePress(int /*button*/, int x, int y)
{ {
if (!Shift()) if (!Shift())
return; return;
...@@ -299,7 +301,7 @@ void MyQT::cb_mousePress(int button, int x, int y) ...@@ -299,7 +301,7 @@ void MyQT::cb_mousePress(int button, int x, int y)
} }
} }
void MyQT::cb_mouseRelease(int button, int x, int y) void MyQT::cb_mouseRelease(int /*button*/, int /*x*/, int /*y*/)
{ {
if (hide_clipping || !clip_volume) if (hide_clipping || !clip_volume)
...@@ -418,6 +420,12 @@ int main(int argc, char **argv) ...@@ -418,6 +420,12 @@ int main(int argc, char **argv)
color[i][0] /= maxV; color[i][0] /= maxV;
color[i][2] = 1.0f - color[i][0]; color[i][2] = 1.0f - color[i][0];
} }
// Algo::Volume::Export::exportNAS<PFP>(myMap,position,"/tmp/test2.nas");
// Algo::Volume::Export::exportMSH<PFP>(myMap,position,"/tmp/test2.msh");
// Algo::Volume::Export::exportTet<PFP>(myMap,position,"/tmp/test2.tet");
// Algo::Volume::Export::exportNodeEle<PFP>(myMap,position,"/tmp/test2");
// Algo::Volume::Export::exportVTU<PFP>(myMap,position,"/tmp/test4.vtu");
} }
else else
{ {
...@@ -437,6 +445,9 @@ int main(int argc, char **argv) ...@@ -437,6 +445,9 @@ int main(int argc, char **argv)
TraversorW<PFP::MAP> tra(myMap); TraversorW<PFP::MAP> tra(myMap);
for (Dart d = tra.begin(); d != tra.end(); d = tra.next()) for (Dart d = tra.begin(); d != tra.end(); d = tra.next())
color[d] = position[d] + PFP::VEC3(0.5,0.5,0.5); color[d] = position[d] + PFP::VEC3(0.5,0.5,0.5);
// Algo::Volume::Export::exportMSH<PFP>(myMap,position,"/tmp/test2.msh");
// Algo::Volume::Export::exportNAS<PFP>(myMap,position,"/tmp/test1.nas");
// Algo::Volume::Export::exportVTU<PFP>(myMap,position,"/tmp/test3.vtu");
} }
// un peu d'interface // un peu d'interface
QApplication app(argc, argv); QApplication app(argc, argv);
......
...@@ -140,7 +140,7 @@ void MyQT::cb_redraw() ...@@ -140,7 +140,7 @@ void MyQT::cb_redraw()
m_drawer.callList(); m_drawer.callList();
} }
void MyQT::cb_mousePress(int button, int x, int y) void MyQT::cb_mousePress(int /*button*/, int x, int y)
{ {
if (Shift()) if (Shift())
{ {
......
...@@ -38,21 +38,21 @@ MAP myMap; ...@@ -38,21 +38,21 @@ MAP myMap;
VertexAttribute<VEC3> position ; VertexAttribute<VEC3> position ;
Dart dglobal; Dart dglobal;
void MyQT::balls_onoff(bool x) void MyQT::balls_onoff(bool /*x*/)
{ {
render_balls = !render_balls; render_balls = !render_balls;
updateGL(); updateGL();
CGoGNerr << " balls_onoff "<< CGoGNendl; CGoGNerr << " balls_onoff "<< CGoGNendl;
} }
void MyQT::vectors_onoff(bool x) void MyQT::vectors_onoff(bool /*x*/)
{ {
render_vectors = !render_vectors; render_vectors = !render_vectors;
updateGL(); updateGL();
CGoGNerr << " vectors_onoff "<< CGoGNflush; CGoGNerr << " vectors_onoff "<< CGoGNflush;
} }
void MyQT::text_onoff(bool x) void MyQT::text_onoff(bool /*x*/)
{ {
render_text = !render_text; render_text = !render_text;
updateGL(); updateGL();
...@@ -60,7 +60,7 @@ void MyQT::text_onoff(bool x) ...@@ -60,7 +60,7 @@ void MyQT::text_onoff(bool x)
} }
void MyQT::topo_onoff(bool x) void MyQT::topo_onoff(bool /*x*/)
{ {
render_topo = !render_topo; render_topo = !render_topo;
updateGL(); updateGL();
...@@ -211,7 +211,7 @@ void MyQT::cb_redraw() ...@@ -211,7 +211,7 @@ void MyQT::cb_redraw()
} }
} }
void MyQT::cb_mousePress(int button, int x, int y) void MyQT::cb_mousePress(int /*button*/, int x, int y)
{ {
if (Shift()) if (Shift())
{ {
......
...@@ -146,7 +146,7 @@ public: ...@@ -146,7 +146,7 @@ public:
FunctorAttribThreaded(),m_positions(pos),m_positions2(pos2) FunctorAttribThreaded(),m_positions(pos),m_positions2(pos2)
{} {}
void run(unsigned int i, unsigned int threadID) void run(unsigned int i, unsigned int /*threadID*/)
{ {
m_positions2[i] = 1.1f * m_positions[i]; m_positions2[i] = 1.1f * m_positions[i];
} }
...@@ -181,7 +181,7 @@ public: ...@@ -181,7 +181,7 @@ public:
m_positions(pos),m_positions2(pos2) m_positions(pos),m_positions2(pos2)
{} {}
void run(Dart d, unsigned int threadID) void run(Dart d, unsigned int /*threadID*/)
{ {
typename XXX::VEC3 Q(0,0,0); typename XXX::VEC3 Q(0,0,0);
int nb=0; int nb=0;
...@@ -232,7 +232,7 @@ public: ...@@ -232,7 +232,7 @@ public:
unsigned int getNb() { return m_nb;} unsigned int getNb() { return m_nb;}
void run(Dart d, unsigned int threadID) void run(Dart d, unsigned int /*threadID*/)
{ {
Dart dd = this->m_map.phi2(d); Dart dd = this->m_map.phi2(d);
typename XXX::VEC3 V = m_positions[dd] - m_positions[d]; typename XXX::VEC3 V = m_positions[dd] - m_positions[d];
......
...@@ -88,7 +88,7 @@ void MyQT::clipping_onoff(bool x) ...@@ -88,7 +88,7 @@ void MyQT::clipping_onoff(bool x)
updateGL(); updateGL();
} }
void MyQT::hide_onoff(bool x) void MyQT::hide_onoff(bool /*x*/)
{ {
hide_clipping = !hide_clipping; hide_clipping = !hide_clipping;
updateMap(); updateMap();
...@@ -253,7 +253,7 @@ void MyQT::operation(int x) ...@@ -253,7 +253,7 @@ void MyQT::operation(int x)
dock.listOper->setCurrentRow(-1); dock.listOper->setCurrentRow(-1);
} }
void MyQT::createMap(int n) void MyQT::createMap(int /*n*/)
{ {
myMap.clear(true); myMap.clear(true);
position = myMap.getAttribute<VEC3, VERTEX>("position"); position = myMap.getAttribute<VEC3, VERTEX>("position");
...@@ -440,7 +440,7 @@ void MyQT::cb_mousePress(int button, int x, int y) ...@@ -440,7 +440,7 @@ void MyQT::cb_mousePress(int button, int x, int y)
} }
} }
void MyQT::cb_mouseRelease(int button, int x, int y) void MyQT::cb_mouseRelease(int /*button*/, int /*x*/, int /*y*/)
{ {
if (hide_clipping || !clip_volume) if (hide_clipping || !clip_volume)
......
...@@ -42,7 +42,7 @@ VertexAttribute<VEC3> position ; ...@@ -42,7 +42,7 @@ VertexAttribute<VEC3> position ;
DartAttribute<VEC3> middleDarts; DartAttribute<VEC3> middleDarts;
void MyQT::text_onoff(bool x) void MyQT::text_onoff(bool /*x*/)
{ {
render_text = !render_text; render_text = !render_text;
updateGL(); updateGL();
...@@ -162,7 +162,7 @@ void MyQT::cb_redraw() ...@@ -162,7 +162,7 @@ void MyQT::cb_redraw()
} }
void MyQT::cb_mousePress(int button, int x, int y) void MyQT::cb_mousePress(int /*button*/, int x, int y)
{ {
if (Shift()) if (Shift())
{ {
......
...@@ -138,8 +138,9 @@ IF(WIN32) ...@@ -138,8 +138,9 @@ IF(WIN32)
set(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING "Only Release or Debug" FORCE) set(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING "Only Release or Debug" FORCE)
# set(CMAKE_CONFIGURATION_TYPES "Release Debug" CACHE STRING "Only Release or Debug" FORCE) # set(CMAKE_CONFIGURATION_TYPES "Release Debug" CACHE STRING "Only Release or Debug" FORCE)
ELSE(WIN32) ELSE(WIN32)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -fPIC")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fPIC") # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wclobbered -Wempty-body -Wignored-qualifiers -Wmissing-field-initializers -Wsign-compare -Wtype-limits -Wuninitialized -fPIC")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Woverride-init -fPIC")
add_subdirectory(Release) add_subdirectory(Release)
add_subdirectory(Debug) add_subdirectory(Debug)
add_subdirectory(${CGoGN_ROOT_DIR}/Apps Apps) add_subdirectory(${CGoGN_ROOT_DIR}/Apps Apps)
......
...@@ -105,7 +105,7 @@ IF(WIN32) ...@@ -105,7 +105,7 @@ IF(WIN32)
set(CMAKE_CONFIGURATION_TYPES Release Debug) set(CMAKE_CONFIGURATION_TYPES Release Debug)
set(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING "Only Release or Debug" FORCE) set(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING "Only Release or Debug" FORCE)
ELSE(WIN32) ELSE(WIN32)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra ")
ENDIF(WIN32) ENDIF(WIN32)
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin) SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin)
......
...@@ -174,7 +174,7 @@ inline void ImplicitHierarchicalMap::next(Dart& d) const ...@@ -174,7 +174,7 @@ inline void ImplicitHierarchicalMap::next(Dart& d) const
} while(d != Map2::end() && m_dartLevel[d] > m_curLevel) ; } while(d != Map2::end() && m_dartLevel[d] > m_curLevel) ;
} }
inline bool ImplicitHierarchicalMap::foreach_dart_of_vertex(Dart d, FunctorType& f, unsigned int thread) inline bool ImplicitHierarchicalMap::foreach_dart_of_vertex(Dart d, FunctorType& f, unsigned int /*thread*/)
{ {
Dart dNext = d; Dart dNext = d;
do do
...@@ -186,7 +186,7 @@ inline bool ImplicitHierarchicalMap::foreach_dart_of_vertex(Dart d, FunctorType& ...@@ -186,7 +186,7 @@ inline bool ImplicitHierarchicalMap::foreach_dart_of_vertex(Dart d, FunctorType&
return false; return false;
} }
inline bool ImplicitHierarchicalMap::foreach_dart_of_edge(Dart d, FunctorType& f, unsigned int thread) inline bool ImplicitHierarchicalMap::foreach_dart_of_edge(Dart d, FunctorType& f, unsigned int /*thread*/)
{ {
if (f(d)) if (f(d))
return true; return true;
...@@ -198,7 +198,7 @@ inline bool ImplicitHierarchicalMap::foreach_dart_of_edge(Dart d, FunctorType& f ...@@ -198,7 +198,7 @@ inline bool ImplicitHierarchicalMap::foreach_dart_of_edge(Dart d, FunctorType& f
return false; return false;
} }
inline bool ImplicitHierarchicalMap::foreach_dart_of_oriented_face(Dart d, FunctorType& f, unsigned int thread) inline bool ImplicitHierarchicalMap::foreach_dart_of_oriented_face(Dart d, FunctorType& f, unsigned int /*thread*/)
{ {
Dart dNext = d ; Dart dNext = d ;
do do
...@@ -212,12 +212,12 @@ inline bool ImplicitHierarchicalMap::foreach_dart_of_oriented_face(Dart d, Funct ...@@ -212,12 +212,12 @@ inline bool ImplicitHierarchicalMap::foreach_dart_of_oriented_face(Dart d, Funct
inline bool ImplicitHierarchicalMap::foreach_dart_of_face(Dart d, FunctorType& f, unsigned int thread) inline bool ImplicitHierarchicalMap::foreach_dart_of_face(Dart d, FunctorType& f, unsigned int thread)
{ {
return foreach_dart_of_oriented_face(d, f) ; return foreach_dart_of_oriented_face(d, f,thread) ;
} }
inline bool ImplicitHierarchicalMap::foreach_dart_of_oriented_volume(Dart d, FunctorType& f, unsigned int thread) inline bool ImplicitHierarchicalMap::foreach_dart_of_oriented_volume(Dart d, FunctorType& f, unsigned int thread)
{ {
DartMarkerStore mark(*this); // Lock a marker DartMarkerStore mark(*this,thread); // Lock a marker
bool found = false; // Last functor return value bool found = false; // Last functor return value
std::list<Dart> visitedFaces; // Faces that are traversed std::list<Dart> visitedFaces; // Faces that are traversed
...@@ -253,12 +253,12 @@ inline bool ImplicitHierarchicalMap::foreach_dart_of_oriented_volume(Dart d, Fun ...@@ -253,12 +253,12 @@ inline bool ImplicitHierarchicalMap::foreach_dart_of_oriented_volume(Dart d, Fun
inline bool ImplicitHierarchicalMap::foreach_dart_of_volume(Dart d, FunctorType& f, unsigned int thread) inline bool ImplicitHierarchicalMap::foreach_dart_of_volume(Dart d, FunctorType& f, unsigned int thread)
{ {
return foreach_dart_of_oriented_volume(d, f) ; return foreach_dart_of_oriented_volume(d, f, thread) ;
} }
inline bool ImplicitHierarchicalMap::foreach_dart_of_cc(Dart d, FunctorType& f, unsigned int thread) inline bool ImplicitHierarchicalMap::foreach_dart_of_cc(Dart d, FunctorType& f, unsigned int thread)
{ {
return foreach_dart_of_oriented_volume(d, f) ; return foreach_dart_of_oriented_volume(d, f, thread) ;
} }
/*************************************************** /***************************************************
......
...@@ -269,7 +269,7 @@ inline bool ImplicitHierarchicalMap3::foreach_dart_of_edge(Dart d, FunctorType& ...@@ -269,7 +269,7 @@ inline bool ImplicitHierarchicalMap3::foreach_dart_of_edge(Dart d, FunctorType&
return false; return false;
} }
inline bool ImplicitHierarchicalMap3::foreach_dart_of_oriented_face(Dart d, FunctorType& f, unsigned int thread) inline bool ImplicitHierarchicalMap3::foreach_dart_of_oriented_face(Dart d, FunctorType& f, unsigned int /*thread*/)
{ {
Dart dNext = d ; Dart dNext = d ;
do do
...@@ -401,7 +401,7 @@ inline bool ImplicitHierarchicalMap3::foreach_dart_of_cc(Dart d, FunctorType& f, ...@@ -401,7 +401,7 @@ inline bool ImplicitHierarchicalMap3::foreach_dart_of_cc(Dart d, FunctorType& f,
} }
inline bool ImplicitHierarchicalMap3::foreach_dart_of_vertex2(Dart d, FunctorType& f, unsigned int thread) inline bool ImplicitHierarchicalMap3::foreach_dart_of_vertex2(Dart d, FunctorType& f, unsigned int /*thread*/)
{ {
Dart dNext = d; Dart dNext = d;
do do
...@@ -413,7 +413,7 @@ inline bool ImplicitHierarchicalMap3::foreach_dart_of_vertex2(Dart d, FunctorTyp ...@@ -413,7 +413,7 @@ inline bool ImplicitHierarchicalMap3::foreach_dart_of_vertex2(Dart d, FunctorTyp
return false; return false;
} }
inline bool ImplicitHierarchicalMap3::foreach_dart_of_edge2(Dart d, FunctorType& f, unsigned int thread) inline bool ImplicitHierarchicalMap3::foreach_dart_of_edge2(Dart d, FunctorType& f, unsigned int /*thread*/)
{ {
if (f(d)) if (f(d))
return true; return true;
......
...@@ -514,7 +514,7 @@ bool importMesh(typename PFP::MAP& map, MeshTablesVolume<PFP>& mtv) ...@@ -514,7 +514,7 @@ bool importMesh(typename PFP::MAP& map, MeshTablesVolume<PFP>& mtv)
template <typename PFP> template <typename PFP>
bool importMesh(typename PFP::MAP& map, const std::string& filename, std::vector<std::string>& attrNames, bool mergeCloseVertices) bool importMesh(typename PFP::MAP& map, const std::string& filename, std::vector<std::string>& attrNames, bool /*mergeCloseVertices*/)
{ {
ImportType kind = Volume::Import::UNKNOWNVOLUME; ImportType kind = Volume::Import::UNKNOWNVOLUME;
......
...@@ -97,7 +97,7 @@ bool importVTU(typename PFP::MAP& map, const std::string& filename, std::vector< ...@@ -97,7 +97,7 @@ bool importVTU(typename PFP::MAP& map, const std::string& filename, std::vector<
{ {
typename PFP::VEC3 P; typename PFP::VEC3 P;
ss >> P[0]; ss >> P[1]; ss >> P[2]; ss >> P[0]; ss >> P[1]; ss >> P[2];
// std::cout << P << std::endl; P *= scaleFactor;
unsigned int id = container.insertLine(); unsigned int id = container.insertLine();
position[id] = P; position[id] = P;
verticesID.push_back(id); verticesID.push_back(id);
...@@ -110,10 +110,6 @@ bool importVTU(typename PFP::MAP& map, const std::string& filename, std::vector< ...@@ -110,10 +110,6 @@ bool importVTU(typename PFP::MAP& map, const std::string& filename, std::vector<
std::cout <<"CELL NODE = "<< cell_node->name << std::endl; std::cout <<"CELL NODE = "<< cell_node->name << std::endl;
// cell_node = cell_node->children;
// while (strcmp((char*)(cell_node->name),(char*)"DataArray")!=0)
// cell_node = cell_node->next;
std::vector<unsigned char> typeVols; std::vector<unsigned char> typeVols;
typeVols.reserve(nbVolumes); typeVols.reserve(nbVolumes);
...@@ -123,25 +119,6 @@ bool importVTU(typename PFP::MAP& map, const std::string& filename, std::vector< ...@@ -123,25 +119,6 @@ bool importVTU(typename PFP::MAP& map, const std::string& filename, std::vector<
indices.reserve(nbVolumes*4); indices.reserve(nbVolumes*4);
// cell_node = cell_node->children;
// while (strcmp((char*)(cell_node->name),(char*)"DataArray")!=0)
// cell_node = cell_node->next;
// std::cout <<"1NODE = "<< (char*)(cell_node->name) << std::endl;
// xmlChar* type = xmlGetProp(cell_node, BAD_CAST "Name");
// std::cout <<"1NAME = "<< (char*)(type) << std::endl;
// while (strcmp((char*)(cell_node->name),(char*)"DataArray")!=0)
// cell_node = cell_node->next;
// std::cout <<"2NODE = "<< (char*)(cell_node->name) << std::endl;
// type = xmlGetProp(cell_node, BAD_CAST "Name");
// std::cout <<"2NAME = "<< (char*)(type) << std::endl;
// while (strcmp((char*)(cell_node->name),(char*)"DataArray")!=0)
// cell_node = cell_node->next;
// std::cout <<"3NODE = "<< (char*)(cell_node->name) << std::endl;
// type = xmlGetProp(cell_node, BAD_CAST "Name");
// std::cout <<"3NAME = "<< (char*)(type) << std::endl;
for (xmlNode* x_node = cell_node->children; x_node!=NULL; x_node = x_node->next) for (xmlNode* x_node = cell_node->children; x_node!=NULL; x_node = x_node->next)
{ {
while ((x_node!=NULL) && (strcmp((char*)(x_node->name),(char*)"DataArray")!=0)) while ((x_node!=NULL) && (strcmp((char*)(x_node->name),(char*)"DataArray")!=0))
...@@ -152,12 +129,9 @@ bool importVTU(typename PFP::MAP& map, const std::string& filename, std::vector< ...@@ -152,12 +129,9 @@ bool importVTU(typename PFP::MAP& map, const std::string& filename, std::vector<
else else
{ {
xmlChar* type = xmlGetProp(x_node, BAD_CAST "Name"); xmlChar* type = xmlGetProp(x_node, BAD_CAST "Name");
// std::cout <<"NODE = "<< (char*)(x_node->name) << std::endl;
// std::cout <<"NAME = "<< (char*)(type) << std::endl;
if (strcmp((char*)(type),(char*)"connectivity")==0) if (strcmp((char*)(type),(char*)"connectivity")==0)
{ {
// c_indices =(char*)(xmlNodeGetContent(x_node->children));
std::stringstream ss((char*)(xmlNodeGetContent(x_node->children))); std::stringstream ss((char*)(xmlNodeGetContent(x_node->children)));
while (!ss.eof()) while (!ss.eof())
{ {
......
...@@ -955,7 +955,7 @@ void MarchingCube<DataType, Windowing, PFP>::setNeighbour(L_DART d1, L_DART d2) ...@@ -955,7 +955,7 @@ void MarchingCube<DataType, Windowing, PFP>::setNeighbour(L_DART d1, L_DART d2)
} }
template< typename DataType, template < typename D2 > class Windowing, typename PFP > template< typename DataType, template < typename D2 > class Windowing, typename PFP >
void MarchingCube<DataType, 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 MarchingCube<DataType, 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 _LZ not used => a supprimer ?
// TODO parametre curv not used => a supprimer ? // TODO parametre curv not used => a supprimer ?
......
...@@ -78,7 +78,7 @@ void drawerAddVolume(Utils::Drawer& dr, typename PFP::MAP& map, Dart d, const Ve ...@@ -78,7 +78,7 @@ void drawerAddVolume(Utils::Drawer& dr, typename PFP::MAP& map, Dart d, const Ve
} }
template<typename PFP> template<typename PFP>
void drawerVertices(Utils::Drawer& dr, typename PFP::MAP& map, std::vector<Dart>& vd, const VertexAttribute<typename PFP::VEC3>& positions) void drawerVertices(Utils::Drawer& dr, typename PFP::MAP& /*map*/, std::vector<Dart>& vd, const VertexAttribute<typename PFP::VEC3>& positions)
{ {
dr.begin(GL_POINTS); dr.begin(GL_POINTS);
for (std::vector<Dart>::iterator it = vd.begin(); it !=vd.end(); ++it) for (std::vector<Dart>::iterator it = vd.begin(); it !=vd.end(); ++it)
...@@ -113,7 +113,7 @@ void drawerVolumes(Utils::Drawer& dr, typename PFP::MAP& map, std::vector<Dart>& ...@@ -113,7 +113,7 @@ void drawerVolumes(Utils::Drawer& dr, typename PFP::MAP& map, std::vector<Dart>&
} }
template<typename PFP> template<typename PFP>
void drawerVertex(Utils::Drawer& dr, typename PFP::MAP& map, Dart d, const VertexAttribute<typename PFP::VEC3>& positions) void drawerVertex(Utils::Drawer& dr, typename PFP::MAP& /*map*/, Dart d, const VertexAttribute<typename PFP::VEC3>& positions)
{ {
dr.begin(GL_POINTS); dr.begin(GL_POINTS);
dr.vertex(positions[d]); dr.vertex(positions[d]);
......
...@@ -93,7 +93,7 @@ inline ExplodeVolumeRender::~ExplodeVolumeRender() ...@@ -93,7 +93,7 @@ inline ExplodeVolumeRender::~ExplodeVolumeRender()
template<typename PFP> template<typename PFP>
void ExplodeVolumeRender::computeFace(typename PFP::MAP& map, Dart d, const VertexAttribute<typename PFP::VEC3>& positions, void ExplodeVolumeRender::computeFace(typename PFP::MAP& map, Dart d, const VertexAttribute<typename PFP::VEC3>& positions,
const typename PFP::VEC3& centerFace, const typename PFP::VEC3& centerNormalFace, const typename PFP::VEC3& centerFace, const typename PFP::VEC3& /*centerNormalFace*/,
std::vector<typename PFP::VEC3>& vertices, std::vector<typename PFP::VEC3>& normals) std::vector<typename PFP::VEC3>& vertices, std::vector<typename PFP::VEC3>& normals)
{ {
typedef typename PFP::VEC3 VEC3; typedef typename PFP::VEC3 VEC3;
......
...@@ -35,7 +35,7 @@ namespace SVG ...@@ -35,7 +35,7 @@ namespace SVG
{ {
template <typename PFP> template <typename PFP>
void renderVertices(Utils::SVG::SVGOut& svg, typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, unsigned int thread) void renderVertices(Utils::SVG::SVGOut& svg, typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, unsigned int /*thread*/)
{ {
Utils::SVG::SvgGroup* svg1 = new Utils::SVG::SvgGroup("vertices", svg.m_model, svg.m_proj); Utils::SVG::SvgGroup* svg1 = new Utils::SVG::SvgGroup("vertices", svg.m_model, svg.m_proj);
TraversorV<typename PFP::MAP> trac(map); TraversorV<typename PFP::MAP> trac(map);
...@@ -59,7 +59,7 @@ void renderVertices(Utils::SVG::SVGOut& svg, typename PFP::MAP& map, const Verte ...@@ -59,7 +59,7 @@ void renderVertices(Utils::SVG::SVGOut& svg, typename PFP::MAP& map, const Verte
} }
template <typename PFP> template <typename PFP>
void renderEdges(Utils::SVG::SVGOut& svg, typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, unsigned int thread) void renderEdges(Utils::SVG::SVGOut& svg, typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, unsigned int /*thread*/)
{ {
Utils::SVG::SvgGroup* svg1 = new Utils::SVG::SvgGroup("edges", svg.m_model, svg.m_proj); Utils::SVG::SvgGroup* svg1 = new Utils::SVG::SvgGroup("edges", svg.m_model, svg.m_proj);
TraversorE<typename PFP::MAP> trac(map); TraversorE<typename PFP::MAP> trac(map);
......
...@@ -55,7 +55,7 @@ public: ...@@ -55,7 +55,7 @@ public:
}; };
template <typename T> template <typename T>
NoMathAttribute<T> operator*(T a, const NoMathAttribute<T>& v) NoMathAttribute<T> operator*(T /*a*/, const NoMathAttribute<T>& /*v*/)
{ {
return T(); return T();
} }
...@@ -71,15 +71,15 @@ class NoMathNameAttribute : public T ...@@ -71,15 +71,15 @@ class NoMathNameAttribute : public T
{ {
public: public:
NoMathNameAttribute() : T() {} NoMathNameAttribute() : T() {}
NoMathNameAttribute(int i) : T() {} NoMathNameAttribute(int /*i*/) : T() {}