From 2e16f9c550ee2a19c86ed25796a079c785e5eddf Mon Sep 17 00:00:00 2001 From: Sylvain Thery Date: Thu, 4 Jun 2015 15:16:32 +0200 Subject: [PATCH] SCHNApps modif for compil pb --- .../surface_deformation/src/surface_deformation.cpp | 13 +++++++------ .../src/surface_differentialProperties.cpp | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/SCHNApps/Plugins/surface_deformation/src/surface_deformation.cpp b/SCHNApps/Plugins/surface_deformation/src/surface_deformation.cpp index d2f387bca..541671545 100644 --- a/SCHNApps/Plugins/surface_deformation/src/surface_deformation.cpp +++ b/SCHNApps/Plugins/surface_deformation/src/surface_deformation.cpp @@ -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(*map, p.vIndex, p.freeSelector->getMarker(), p.positionAttribute, coord); + Algo::LinearSolving::setupVariables(*map, p.vIndex, p.freeSelector->getMarker(), p.positionAttribute, coord); nlBegin(NL_MATRIX); - LinearSolving::addRowsRHS_Laplacian_Topo(*map, p.vIndex, p.diffCoord, coord); + Algo::LinearSolving::addRowsRHS_Laplacian_Topo(*map, p.vIndex, p.diffCoord, coord); nlEnd(NL_MATRIX); nlEnd(NL_SYSTEM); nlSolve(); - LinearSolving::getResult(*map, p.vIndex, p.positionAttribute, coord); + Algo::LinearSolving::getResult(*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(*map, p.vIndex, p.freeSelector->getMarker(), p.positionAttribute, coord); + Algo::LinearSolving::setupVariables(*map, p.vIndex, p.freeSelector->getMarker(), p.positionAttribute, coord); nlBegin(NL_MATRIX); // LinearSolving::addRowsRHS_Laplacian_Cotan(*map, p.vIndex, p.edgeWeight, p.vertexArea, p.rotatedDiffCoord, coord); - LinearSolving::addRowsRHS_Laplacian_Topo(*map, p.vIndex, p.rotatedDiffCoord, coord); + Algo::LinearSolving::addRowsRHS_Laplacian_Topo(*map, p.vIndex, p.rotatedDiffCoord, coord); nlEnd(NL_MATRIX); nlEnd(NL_SYSTEM); nlSolve(); - LinearSolving::getResult(*map, p.vIndex, p.positionAttribute, coord); + Algo::LinearSolving::getResult(*map, p.vIndex, p.positionAttribute, coord); nlReset(NL_TRUE); } } diff --git a/SCHNApps/Plugins/surface_differentialProperties/src/surface_differentialProperties.cpp b/SCHNApps/Plugins/surface_differentialProperties/src/surface_differentialProperties.cpp index 8b807c82f..109f2dae0 100644 --- a/SCHNApps/Plugins/surface_differentialProperties/src/surface_differentialProperties.cpp +++ b/SCHNApps/Plugins/surface_differentialProperties/src/surface_differentialProperties.cpp @@ -281,7 +281,7 @@ void Surface_DifferentialProperties_Plugin::computeCurvature( Algo::Surface::Geometry::computeAnglesBetweenNormalsOnEdges(*map, position, edgeAngle); Algo::Surface::Geometry::computeAreaEdges(*map, position, edgeArea); - PFP2::REAL meanEdgeLength = Algo::Surface::Geometry::meanEdgeLength(*map, position); + PFP2::REAL meanEdgeLength = Algo::Geometry::meanEdgeLength(*map, position); float radius = 2.0f * meanEdgeLength; Algo::Surface::Geometry::computeCurvatureVertices_NormalCycles_Projected(*map, radius, position, normal, edgeAngle, edgeArea, kmax, kmin, Kmax, Kmin, Knormal); -- GitLab