Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CGoGN
CGoGN
Commits
2e16f9c5
Commit
2e16f9c5
authored
Jun 04, 2015
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SCHNApps modif for compil pb
parent
595b28b3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
SCHNApps/Plugins/surface_deformation/src/surface_deformation.cpp
...s/Plugins/surface_deformation/src/surface_deformation.cpp
+7
-6
SCHNApps/Plugins/surface_differentialProperties/src/surface_differentialProperties.cpp
...erentialProperties/src/surface_differentialProperties.cpp
+1
-1
No files found.
SCHNApps/Plugins/surface_deformation/src/surface_deformation.cpp
View file @
2e16f9c5
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
#include "Algo/Geometry/normal.h"
#include "Algo/Geometry/normal.h"
#include "Algo/Geometry/laplacian.h"
#include "Algo/Geometry/laplacian.h"
#include "Algo/LinearSolving/basic.h"
#include "Algo/Topo/basic.h"
#include "Algo/Topo/basic.h"
...
@@ -405,13 +406,13 @@ void Surface_Deformation_Plugin::matchDiffCoord(MapHandlerGen* mh)
...
@@ -405,13 +406,13 @@ void Surface_Deformation_Plugin::matchDiffCoord(MapHandlerGen* mh)
nlBegin
(
NL_SYSTEM
)
;
nlBegin
(
NL_SYSTEM
)
;
for
(
int
coord
=
0
;
coord
<
3
;
++
coord
)
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
);
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_MATRIX
);
nlEnd
(
NL_SYSTEM
);
nlEnd
(
NL_SYSTEM
);
nlSolve
();
nlSolve
();
LinearSolving
::
getResult
<
PFP2
>
(
*
map
,
p
.
vIndex
,
p
.
positionAttribute
,
coord
);
Algo
::
LinearSolving
::
getResult
<
PFP2
>
(
*
map
,
p
.
vIndex
,
p
.
positionAttribute
,
coord
);
nlReset
(
NL_TRUE
);
nlReset
(
NL_TRUE
);
}
}
}
}
...
@@ -535,14 +536,14 @@ void Surface_Deformation_Plugin::asRigidAsPossible(MapHandlerGen* mh)
...
@@ -535,14 +536,14 @@ void Surface_Deformation_Plugin::asRigidAsPossible(MapHandlerGen* mh)
nlBegin
(
NL_SYSTEM
);
nlBegin
(
NL_SYSTEM
);
for
(
int
coord
=
0
;
coord
<
3
;
++
coord
)
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
);
nlBegin
(
NL_MATRIX
);
// LinearSolving::addRowsRHS_Laplacian_Cotan<PFP2>(*map, p.vIndex, p.edgeWeight, p.vertexArea, p.rotatedDiffCoord, coord);
// 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_MATRIX
);
nlEnd
(
NL_SYSTEM
);
nlEnd
(
NL_SYSTEM
);
nlSolve
();
nlSolve
();
LinearSolving
::
getResult
<
PFP2
>
(
*
map
,
p
.
vIndex
,
p
.
positionAttribute
,
coord
);
Algo
::
LinearSolving
::
getResult
<
PFP2
>
(
*
map
,
p
.
vIndex
,
p
.
positionAttribute
,
coord
);
nlReset
(
NL_TRUE
);
nlReset
(
NL_TRUE
);
}
}
}
}
...
...
SCHNApps/Plugins/surface_differentialProperties/src/surface_differentialProperties.cpp
View file @
2e16f9c5
...
@@ -281,7 +281,7 @@ void Surface_DifferentialProperties_Plugin::computeCurvature(
...
@@ -281,7 +281,7 @@ void Surface_DifferentialProperties_Plugin::computeCurvature(
Algo
::
Surface
::
Geometry
::
computeAnglesBetweenNormalsOnEdges
<
PFP2
>
(
*
map
,
position
,
edgeAngle
);
Algo
::
Surface
::
Geometry
::
computeAnglesBetweenNormalsOnEdges
<
PFP2
>
(
*
map
,
position
,
edgeAngle
);
Algo
::
Surface
::
Geometry
::
computeAreaEdges
<
PFP2
>
(
*
map
,
position
,
edgeArea
);
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.0
f
*
meanEdgeLength
;
float
radius
=
2.0
f
*
meanEdgeLength
;
Algo
::
Surface
::
Geometry
::
computeCurvatureVertices_NormalCycles_Projected
<
PFP2
>
(
*
map
,
radius
,
position
,
normal
,
edgeAngle
,
edgeArea
,
kmax
,
kmin
,
Kmax
,
Kmin
,
Knormal
);
Algo
::
Surface
::
Geometry
::
computeCurvatureVertices_NormalCycles_Projected
<
PFP2
>
(
*
map
,
radius
,
position
,
normal
,
edgeAngle
,
edgeArea
,
kmax
,
kmin
,
Kmax
,
Kmin
,
Knormal
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment