Commit 2e16f9c5 authored by Sylvain Thery's avatar Sylvain Thery

SCHNApps modif for compil pb

parent 595b28b3
......@@ -2,6 +2,7 @@
#include "Algo/Geometry/normal.h"
#include "Algo/Geometry/laplacian.h"
#include "Algo/LinearSolving/basic.h"
#include "Algo/Topo/basic.h"
......@@ -405,13 +406,13 @@ void Surface_Deformation_Plugin::matchDiffCoord(MapHandlerGen* mh)
nlBegin(NL_SYSTEM) ;
for (int coord = 0; coord < 3; ++coord)
{
LinearSolving::setupVariables<PFP2>(*map, p.vIndex, p.freeSelector->getMarker(), p.positionAttribute, coord);
Algo::LinearSolving::setupVariables<PFP2>(*map, p.vIndex, p.freeSelector->getMarker(), p.positionAttribute, coord);
nlBegin(NL_MATRIX);
LinearSolving::addRowsRHS_Laplacian_Topo<PFP2>(*map, p.vIndex, p.diffCoord, coord);
Algo::LinearSolving::addRowsRHS_Laplacian_Topo<PFP2>(*map, p.vIndex, p.diffCoord, coord);
nlEnd(NL_MATRIX);
nlEnd(NL_SYSTEM);
nlSolve();
LinearSolving::getResult<PFP2>(*map, p.vIndex, p.positionAttribute, coord);
Algo::LinearSolving::getResult<PFP2>(*map, p.vIndex, p.positionAttribute, coord);
nlReset(NL_TRUE);
}
}
......@@ -535,14 +536,14 @@ void Surface_Deformation_Plugin::asRigidAsPossible(MapHandlerGen* mh)
nlBegin(NL_SYSTEM);
for (int coord = 0; coord < 3; ++coord)
{
LinearSolving::setupVariables<PFP2>(*map, p.vIndex, p.freeSelector->getMarker(), p.positionAttribute, coord);
Algo::LinearSolving::setupVariables<PFP2>(*map, p.vIndex, p.freeSelector->getMarker(), p.positionAttribute, coord);
nlBegin(NL_MATRIX);
// LinearSolving::addRowsRHS_Laplacian_Cotan<PFP2>(*map, p.vIndex, p.edgeWeight, p.vertexArea, p.rotatedDiffCoord, coord);
LinearSolving::addRowsRHS_Laplacian_Topo<PFP2>(*map, p.vIndex, p.rotatedDiffCoord, coord);
Algo::LinearSolving::addRowsRHS_Laplacian_Topo<PFP2>(*map, p.vIndex, p.rotatedDiffCoord, coord);
nlEnd(NL_MATRIX);
nlEnd(NL_SYSTEM);
nlSolve();
LinearSolving::getResult<PFP2>(*map, p.vIndex, p.positionAttribute, coord);
Algo::LinearSolving::getResult<PFP2>(*map, p.vIndex, p.positionAttribute, coord);
nlReset(NL_TRUE);
}
}
......
......@@ -281,7 +281,7 @@ void Surface_DifferentialProperties_Plugin::computeCurvature(
Algo::Surface::Geometry::computeAnglesBetweenNormalsOnEdges<PFP2>(*map, position, edgeAngle);
Algo::Surface::Geometry::computeAreaEdges<PFP2>(*map, position, edgeArea);
PFP2::REAL meanEdgeLength = Algo::Surface::Geometry::meanEdgeLength<PFP2>(*map, position);
PFP2::REAL meanEdgeLength = Algo::Geometry::meanEdgeLength<PFP2>(*map, position);
float radius = 2.0f * meanEdgeLength;
Algo::Surface::Geometry::computeCurvatureVertices_NormalCycles_Projected<PFP2>(*map, radius, position, normal, edgeAngle, edgeArea, kmax, kmin, Kmax, Kmin, Knormal);
......
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