Commit 5797d750 authored by Pierre Kraemer's avatar Pierre Kraemer

Merge cgogn:CGoGN

Conflicts:
	include/Algo/Import/import2tables.h
	include/Algo/Import/import2tablesVolume.hpp
parents 6d2bfd06 965a1a05
......@@ -184,10 +184,9 @@ public:
inline unsigned int getEmbIdx(int i) { return m_emb[i]; }
bool importMesh(const std::string& filename, std::vector<std::string>& attrNames, float scaleFactor);
bool importTet(const std::string& filename, std::vector<std::string>& attrNames, float scaleFactor);
bool importMesh(const std::string& filename, std::vector<std::string>& attrNames, float scaleFactor = 1.0f);
bool importTet(const std::string& filename, std::vector<std::string>& attrNames, float scaleFactor = 1.0f);
MeshTablesVolume(typename PFP::MAP& map):
m_map(map)
......
......@@ -47,7 +47,7 @@ ImportVolumique::ImportType MeshTablesVolume<PFP>::getFileType(const std::string
}
template <typename PFP>
bool MeshTablesVolume<PFP>::importMesh(const std::string& filename, std::vector<std::string>& attrNames, float scaleFactor=1.0f)
bool MeshTablesVolume<PFP>::importMesh(const std::string& filename, std::vector<std::string>& attrNames, float scaleFactor = 1.0f)
{
ImportVolumique::ImportType kind = getFileType(filename);
......@@ -68,7 +68,7 @@ bool MeshTablesVolume<PFP>::importMesh(const std::string& filename, std::vector<
}
template <typename PFP>
bool MeshTablesVolume<PFP>::importTet(const std::string& filename, std::vector<std::string>& attrNames, float scaleFactor=1.0f)
bool MeshTablesVolume<PFP>::importTet(const std::string& filename, std::vector<std::string>& attrNames, float scaleFactor)
{
AttributeHandler<VEC3> positions = m_map.template getAttribute<VEC3>(VERTEX, "position") ;
......
......@@ -863,7 +863,7 @@ Filter<DIM>* Filter<DIM>::createGaussian(int radius, double sigma)
break;
case 2:
{
double tot=0.0;
// double tot=0.0;
double coef = 1.0/(sig2*M_PI);
for (int j=0; j< sz; ++j)
for (int i=0; i< sz; ++i)
......
......@@ -60,8 +60,8 @@ PlyImportData::PlyImportData():
flist(NULL),
vert_other(NULL),
face_other(NULL),
per_vertex_color_uint8(0),
per_vertex_color_float32(0),
per_vertex_color_uint8(0),
has_normals(0)
{
}
......
......@@ -112,7 +112,6 @@ SimpleQT::SimpleQT() :
SimpleQT::SimpleQT(const SimpleQT& sqt):
m_dock(NULL),
m_mat(m_mat),
m_projection_matrix(m_mat.m_matrices[0]),
m_modelView_matrix(m_mat.m_matrices[1]),
m_transfo_matrix(m_mat.m_matrices[2])
......
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