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
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hurstel
CGoGN
Commits
6a61546b
Commit
6a61546b
authored
Aug 21, 2014
by
Sauvage
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correction avec Pierre du vertexQuadraticFitting
parent
2112a0e2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
include/Algo/Geometry/curvature.h
include/Algo/Geometry/curvature.h
+1
-1
include/Algo/Geometry/curvature.hpp
include/Algo/Geometry/curvature.hpp
+3
-3
No files found.
include/Algo/Geometry/curvature.h
View file @
6a61546b
...
...
@@ -79,7 +79,7 @@ void vertexQuadraticFitting(
typename
PFP
::
MATRIX33
&
localFrame
,
const
VertexAttribute
<
typename
PFP
::
VEC3
,
typename
PFP
::
MAP
>&
position
,
const
VertexAttribute
<
typename
PFP
::
VEC3
,
typename
PFP
::
MAP
>&
normal
,
float
&
a
,
float
&
b
,
float
&
c
,
float
&
d
,
float
&
e
)
;
typename
PFP
::
REAL
&
a
,
typename
PFP
::
REAL
&
b
,
typename
PFP
::
REAL
&
c
,
typename
PFP
::
REAL
&
d
,
typename
PFP
::
REAL
&
e
)
;
template
<
typename
PFP
>
void
quadraticFittingAddVertexPos
(
...
...
include/Algo/Geometry/curvature.hpp
View file @
6a61546b
...
...
@@ -136,7 +136,7 @@ void vertexQuadraticFitting(
typename
PFP
::
MATRIX33
&
localFrame
,
const
VertexAttribute
<
typename
PFP
::
VEC3
,
typename
PFP
::
MAP
>&
position
,
const
VertexAttribute
<
typename
PFP
::
VEC3
,
typename
PFP
::
MAP
>&
normal
,
float
&
a
,
float
&
b
,
float
&
c
,
float
&
d
,
float
&
e
)
typename
PFP
::
REAL
&
a
,
typename
PFP
::
REAL
&
b
,
typename
PFP
::
REAL
&
c
,
typename
PFP
::
REAL
&
d
,
typename
PFP
::
REAL
&
e
)
{
typename
PFP
::
VEC3
p
=
position
[
v
]
;
...
...
@@ -148,7 +148,7 @@ void vertexQuadraticFitting(
nlBegin
(
NL_MATRIX
)
;
foreach_adjacent2
<
EDGE
>
(
map
,
v
,
[
&
]
(
Vertex
it
)
{
typename
PFP
::
VEC3
itp
=
position
[
it
]
;
// quadraticFittingAddVertexPos<PFP>(v
, itp, localFrame) ;
quadraticFittingAddVertexPos
<
PFP
>
(
p
,
itp
,
localFrame
)
;
typename
PFP
::
VEC3
itn
=
normal
[
it
]
;
quadraticFittingAddVertexNormal
<
PFP
>
(
itp
,
itn
,
p
,
localFrame
)
;
});
...
...
@@ -629,7 +629,7 @@ void normalCycles_SortTensor(Geom::Matrix<3,3,typename PFP::REAL>& tensor, unsig
}
template
<
typename
PFP
>
void
normalCycles_ProjectTensor
(
Geom
::
Matrix
<
3
,
3
,
typename
PFP
::
REAL
>&
tensor
,
const
typename
PFP
::
VEC3
&
normal_vector
,
unsigned
int
thread
)
void
normalCycles_ProjectTensor
(
Geom
::
Matrix
<
3
,
3
,
typename
PFP
::
REAL
>&
tensor
,
const
typename
PFP
::
VEC3
&
normal_vector
,
unsigned
int
/*thread*/
)
{
Geom
::
Matrix
<
3
,
3
,
typename
PFP
::
REAL
>
proj
;
proj
.
identity
();
...
...
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