Commit c1eda75a authored by Pierre Kraemer's avatar Pierre Kraemer
Browse files

some missing Surface namespace

parent e79991db
...@@ -43,7 +43,7 @@ void ComputeNormalDialog::cb_selectedMapChanged() ...@@ -43,7 +43,7 @@ void ComputeNormalDialog::cb_selectedMapChanged()
std::vector<std::string> types; std::vector<std::string> types;
cont.getAttributesNames(names); cont.getAttributesNames(names);
cont.getAttributesTypes(types); cont.getAttributesTypes(types);
std::string vec3TypeName = VEC3::CGoGNnameOfType(); std::string vec3TypeName = nameOfType(VEC3());
unsigned int j = 0; unsigned int j = 0;
for(unsigned int i = 0; i < names.size(); ++i) for(unsigned int i = 0; i < names.size(); ++i)
{ {
......
...@@ -138,9 +138,9 @@ void DifferentialPropertiesPlugin::cb_computeCurvature() ...@@ -138,9 +138,9 @@ void DifferentialPropertiesPlugin::cb_computeCurvature()
EdgeAttribute<REAL> edgeAngle = map->getAttribute<REAL, EDGE>("edgeAngle"); EdgeAttribute<REAL> edgeAngle = map->getAttribute<REAL, EDGE>("edgeAngle");
if(!edgeAngle.isValid()) if(!edgeAngle.isValid())
edgeAngle = map->addAttribute<REAL, EDGE>("edgeAngle"); edgeAngle = map->addAttribute<REAL, EDGE>("edgeAngle");
Algo::Geometry::computeAnglesBetweenNormalsOnEdges<PFP>(*map, position, edgeAngle); Algo::Surface::Geometry::computeAnglesBetweenNormalsOnEdges<PFP>(*map, position, edgeAngle);
Algo::Geometry::computeCurvatureVertices_NormalCycles_Projected<PFP>(*map, 0.01f * mh->getBBdiagSize(), position, normal, edgeAngle, kmax, kmin, Kmax, Kmin, Knormal); Algo::Surface::Geometry::computeCurvatureVertices_NormalCycles_Projected<PFP>(*map, 0.01f * mh->getBBdiagSize(), position, normal, edgeAngle, kmax, kmin, Kmax, Kmin, Knormal);
if(m_computeCurvatureDialog->check_KmaxCreateVBO->checkState() == Qt::Checked) if(m_computeCurvatureDialog->check_KmaxCreateVBO->checkState() == Qt::Checked)
mh->createVBO(Kmax); mh->createVBO(Kmax);
......
...@@ -17,7 +17,7 @@ bool ImportSurfacePlugin::enable() ...@@ -17,7 +17,7 @@ bool ImportSurfacePlugin::enable()
void ImportSurfacePlugin::cb_import() void ImportSurfacePlugin::cb_import()
{ {
QString fileName = QFileDialog::getOpenFileName(m_window, "Import file", m_window->getAppPath(), "Mesh Files (*.ply *.off)"); QString fileName = QFileDialog::getOpenFileName(m_window, "Import file", m_window->getAppPath(), "Mesh Files (*.ply *.off *.trian)");
QFileInfo fi(fileName); QFileInfo fi(fileName);
if(fi.exists()) if(fi.exists())
......
...@@ -215,7 +215,6 @@ void RenderVectorDockTab::refreshUI(ParameterSet* params) ...@@ -215,7 +215,6 @@ void RenderVectorDockTab::refreshUI(ParameterSet* params)
PerMapParameterSet& p = params->perMap[map->getName()]; PerMapParameterSet& p = params->perMap[map->getName()];
// QList<Utils::VBO*> vbos = map->getVBOList(nameOfType(VEC3()));
QList<Utils::VBO*> vbos = map->getVBOList(); QList<Utils::VBO*> vbos = map->getVBOList();
for(int i = 0; i < vbos.count(); ++i) for(int i = 0; i < vbos.count(); ++i)
{ {
......
...@@ -173,7 +173,7 @@ void Collector_OneRing<PFP>::computeNormalCyclesTensor (const VertexAttribute<VE ...@@ -173,7 +173,7 @@ void Collector_OneRing<PFP>::computeNormalCyclesTensor (const VertexAttribute<VE
// TODO : not boundary safe // TODO : not boundary safe
for (std::vector<Dart>::const_iterator it = this->border.begin(); it != this->border.end(); ++it) for (std::vector<Dart>::const_iterator it = this->border.begin(); it != this->border.end(); ++it)
{ {
const VEC3 e = Algo::Geometry::vectorOutOfDart<PFP>(this->map, *it, pos) ; const VEC3 e = Algo::Surface::Geometry::vectorOutOfDart<PFP>(this->map, *it, pos) ;
tensor += Geom::transposed_vectors_mult(e,e) * edgeangle[*it] * (1 / e.norm()) ; tensor += Geom::transposed_vectors_mult(e,e) * edgeangle[*it] * (1 / e.norm()) ;
} }
...@@ -199,8 +199,8 @@ void Collector_OneRing<PFP>::computeNormalCyclesTensor (const VertexAttribute<VE ...@@ -199,8 +199,8 @@ void Collector_OneRing<PFP>::computeNormalCyclesTensor (const VertexAttribute<VE
// TODO : not boundary safe // TODO : not boundary safe
for (std::vector<Dart>::const_iterator it = this->border.begin(); it != this->border.end(); ++it) for (std::vector<Dart>::const_iterator it = this->border.begin(); it != this->border.end(); ++it)
{ {
const VEC3 e = Algo::Geometry::vectorOutOfDart<PFP>(this->map, *it, pos) ; const VEC3 e = Algo::Surface::Geometry::vectorOutOfDart<PFP>(this->map, *it, pos) ;
const REAL edgeangle = Algo::Geometry::computeAngleBetweenNormalsOnEdge<PFP>(this->map, *it, pos) ; const REAL edgeangle = Algo::Surface::Geometry::computeAngleBetweenNormalsOnEdge<PFP>(this->map, *it, pos) ;
tensor += Geom::transposed_vectors_mult(e,e) * edgeangle * (1 / e.norm()) ; tensor += Geom::transposed_vectors_mult(e,e) * edgeangle * (1 / e.norm()) ;
} }
...@@ -298,7 +298,7 @@ void Collector_OneRing_AroundEdge<PFP>::computeNormalCyclesTensor (const VertexA ...@@ -298,7 +298,7 @@ void Collector_OneRing_AroundEdge<PFP>::computeNormalCyclesTensor (const VertexA
// TODO : not boundary safe // TODO : not boundary safe
for (std::vector<Dart>::const_iterator it = this->border.begin(); it != this->border.end(); ++it) for (std::vector<Dart>::const_iterator it = this->border.begin(); it != this->border.end(); ++it)
{ {
const VEC3 e = Algo::Geometry::vectorOutOfDart<PFP>(this->map, *it, pos) ; const VEC3 e = Algo::Surface::Geometry::vectorOutOfDart<PFP>(this->map, *it, pos) ;
tensor += Geom::transposed_vectors_mult(e,e) * edgeangle[*it] * (1 / e.norm()) ; tensor += Geom::transposed_vectors_mult(e,e) * edgeangle[*it] * (1 / e.norm()) ;
} }
...@@ -324,8 +324,8 @@ void Collector_OneRing_AroundEdge<PFP>::computeNormalCyclesTensor (const VertexA ...@@ -324,8 +324,8 @@ void Collector_OneRing_AroundEdge<PFP>::computeNormalCyclesTensor (const VertexA
// TODO : not boundary safe // TODO : not boundary safe
for (std::vector<Dart>::const_iterator it = this->border.begin(); it != this->border.end(); ++it) for (std::vector<Dart>::const_iterator it = this->border.begin(); it != this->border.end(); ++it)
{ {
const VEC3 e = Algo::Geometry::vectorOutOfDart<PFP>(this->map, *it, pos) ; const VEC3 e = Algo::Surface::Geometry::vectorOutOfDart<PFP>(this->map, *it, pos) ;
const REAL edgeangle = Algo::Geometry::computeAngleBetweenNormalsOnEdge<PFP>(this->map, *it, pos) ; const REAL edgeangle = Algo::Surface::Geometry::computeAngleBetweenNormalsOnEdge<PFP>(this->map, *it, pos) ;
tensor += Geom::transposed_vectors_mult(e,e) * edgeangle * (1 / e.norm()) ; tensor += Geom::transposed_vectors_mult(e,e) * edgeangle * (1 / e.norm()) ;
} }
......
Supports Markdown
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