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
4b26d77d
Commit
4b26d77d
authored
Apr 27, 2012
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
orbit as template -> remeshing
parent
0ba912f1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
include/Algo/Decimation/lightfieldApproximator.h
include/Algo/Decimation/lightfieldApproximator.h
+1
-1
include/Algo/Decimation/lightfieldApproximator.hpp
include/Algo/Decimation/lightfieldApproximator.hpp
+2
-2
include/Algo/Remeshing/pliant.h
include/Algo/Remeshing/pliant.h
+1
-1
include/Algo/Remeshing/pliant.hpp
include/Algo/Remeshing/pliant.hpp
+7
-7
No files found.
include/Algo/Decimation/lightfieldApproximator.h
View file @
4b26d77d
...
...
@@ -99,7 +99,7 @@ public:
protected:
AttributeHandler
<
VEC3
,
VERTEX
>
m_position
;
AttributeHandler
<
VEC3
,
VERTEX
>
m_approxPosition
;
AttributeHandler
<
VEC3
,
EDGE
>
m_approxPosition
;
public:
Approximator_Frame
(
MAP
&
m
,
AttributeHandler
<
MATRIX33
,
VERTEX
>&
frame
,
Predictor
<
PFP
,
MATRIX33
>*
pred
=
NULL
)
:
...
...
include/Algo/Decimation/lightfieldApproximator.hpp
View file @
4b26d77d
...
...
@@ -128,8 +128,8 @@ void Approximator_RGBfunctionsHalf<PFP>::approximate(Dart d)
template
<
typename
PFP
>
bool
Approximator_Frame
<
PFP
>::
init
()
{
m_position
=
this
->
m_map
.
template
getAttribute
<
VEC3
>(
VERTEX
,
"position"
)
;
m_approxPosition
=
this
->
m_map
.
template
getAttribute
<
VEC3
>(
EDGE
,
"approx_position"
)
;
m_position
=
this
->
m_map
.
template
getAttribute
<
VEC3
,
VERTEX
>(
"position"
)
;
m_approxPosition
=
this
->
m_map
.
template
getAttribute
<
VEC3
,
EDGE
>(
"approx_position"
)
;
if
(
!
m_position
.
isValid
()
||
!
m_approxPosition
.
isValid
())
{
...
...
include/Algo/Remeshing/pliant.h
View file @
4b26d77d
...
...
@@ -35,7 +35,7 @@ namespace Remeshing
{
template
<
typename
PFP
>
void
pliantRemeshing
(
typename
PFP
::
MAP
&
map
,
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
normal
)
;
void
pliantRemeshing
(
typename
PFP
::
MAP
&
map
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>&
position
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>
&
normal
)
;
}
// namespace Remeshing
...
...
include/Algo/Remeshing/pliant.hpp
View file @
4b26d77d
...
...
@@ -35,7 +35,7 @@ namespace Remeshing
{
template
<
typename
PFP
>
void
pliantRemeshing
(
typename
PFP
::
MAP
&
map
,
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
normal
)
void
pliantRemeshing
(
typename
PFP
::
MAP
&
map
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>&
position
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>
&
normal
)
{
typedef
typename
PFP
::
VEC3
VEC3
;
typedef
typename
PFP
::
REAL
REAL
;
...
...
@@ -81,12 +81,12 @@ void pliantRemeshing(typename PFP::MAP& map, typename PFP::TVEC3& position, type
}
// compute feature edges
CellMarker
featureEdge
(
map
,
EDGE
)
;
CellMarker
<
EDGE
>
featureEdge
(
map
)
;
Algo
::
Geometry
::
featureEdgeDetection
<
PFP
>
(
map
,
position
,
featureEdge
)
;
// compute feature vertices
CellMarker
featureVertex
(
map
,
VERTEX
)
;
CellMarker
cornerVertex
(
map
,
VERTEX
)
;
CellMarker
<
VERTEX
>
featureVertex
(
map
)
;
CellMarker
<
VERTEX
>
cornerVertex
(
map
)
;
DartMarker
m3
(
map
)
;
for
(
Dart
d
=
map
.
begin
();
d
!=
map
.
end
();
map
.
next
(
d
))
{
...
...
@@ -178,10 +178,10 @@ void pliantRemeshing(typename PFP::MAP& map, typename PFP::TVEC3& position, type
Algo
::
Geometry
::
computeNormalVertices
<
PFP
>
(
map
,
position
,
normal
)
;
// tangential relaxation
AttributeHandler
<
VEC3
>
centroid
=
map
.
template
addAttribute
<
VEC3
>(
VERTEX
,
"centroid"
)
;
AttributeHandler
<
VEC3
,
VERTEX
>
centroid
=
map
.
template
addAttribute
<
VEC3
,
VERTEX
>(
"centroid"
)
;
Algo
::
Geometry
::
computeNeighborhoodCentroidVertices
<
PFP
>
(
map
,
position
,
centroid
)
;
CellMarker
vm
(
map
,
VERTEX
)
;
CellMarker
<
VERTEX
>
vm
(
map
)
;
for
(
Dart
d
=
map
.
begin
();
d
!=
map
.
end
();
map
.
next
(
d
))
{
if
(
!
vm
.
isMarked
(
d
))
...
...
@@ -197,7 +197,7 @@ void pliantRemeshing(typename PFP::MAP& map, typename PFP::TVEC3& position, type
}
}
map
.
template
removeAttribute
<
VEC3
>
(
centroid
)
;
map
.
removeAttribute
(
centroid
)
;
}
}
// namespace Remeshing
...
...
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