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
42e522b2
Commit
42e522b2
authored
Jan 28, 2013
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of cgogn:~vanhoey/CGoGN
parents
b753071a
4df69175
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
7 deletions
+17
-7
include/Algo/Decimation/halfEdgeSelector.h
include/Algo/Decimation/halfEdgeSelector.h
+2
-2
include/Algo/Decimation/halfEdgeSelector.hpp
include/Algo/Decimation/halfEdgeSelector.hpp
+15
-5
No files found.
include/Algo/Decimation/halfEdgeSelector.h
View file @
42e522b2
...
...
@@ -466,9 +466,9 @@ public:
(
*
errors
)[
d
]
=
halfEdgeInfo
[
d
].
it
->
first
;
}
Dart
dd
=
this
->
m_map
.
phi2
(
d
)
;
if
(
halfEdgeInfo
[
dd
].
valid
&&
halfEdgeInfo
[
dd
].
it
->
first
<
(
*
errors
)[
d
])
if
(
halfEdgeInfo
[
dd
].
valid
&&
halfEdgeInfo
[
dd
].
it
->
first
>
(
*
errors
)[
d
])
{
(
*
errors
)[
d
]
=
halfEdgeInfo
[
dd
].
it
->
first
;
(
*
errors
)[
d
d
]
=
halfEdgeInfo
[
dd
].
it
->
first
;
}
//m_avgColor[d] = VEC3(m_visualImportance[d]/6.,m_visualImportance[d]/6.,m_visualImportance[d]/6.) ;
}
...
...
include/Algo/Decimation/halfEdgeSelector.hpp
View file @
42e522b2
...
...
@@ -296,7 +296,6 @@ bool HalfEdgeSelector_QEMextColor<PFP>::init()
{
assert
(
this
->
m_approximators
[
approxindex
]
->
getType
()
==
A_hQEM
||
this
->
m_approximators
[
approxindex
]
->
getType
()
==
A_hHalfCollapse
||
this
->
m_approximators
[
approxindex
]
->
getType
()
!=
A_Lightfield
||
!
"Approximator for selector (HalfEdgeSelector_QEMextColor) must be of a half-edge approximator"
)
;
bool
saved
=
false
;
...
...
@@ -1673,9 +1672,9 @@ void HalfEdgeSelector_LightfieldKCL<PFP>::computeHalfEdgeInfo(Dart d, HalfEdgeIn
// New position
const
VEC3
&
newPos
=
(
this
->
m_approx
[
m_approxindex_pos
]
->
getAttr
(
m_attrindex_pos
))[
d
]
;
// get newPos
const
REAL
geomErr
=
quadGeom
(
newPos
)
;
const
REAL
visualI
=
m_visualImportance
[
dd
]
;
const
REAL
lferr
=
computeLightfieldError
(
d
)
;
const
REAL
&
geomErr
=
quadGeom
(
newPos
)
;
const
REAL
&
visualI
=
m_visualImportance
[
dd
]
;
const
REAL
&
lferr
=
computeLightfieldError
(
d
)
;
//std::cout << lferr/geomErr << std::endl ;
const
REAL
&
err
=
...
...
@@ -1702,8 +1701,19 @@ typename PFP::REAL HalfEdgeSelector_LightfieldKCL<PFP>::computeLightfieldError(D
{
Dart
v1
=
this
->
m_map
.
phi1
(
v0
)
;
//return computeSquaredLightfieldDifference(v0,v1) ;
REAL
err
=
0
;
/*Traversor2VVaE<MAP> tv0(this->m_map,v0) ; // all vertices surrounding vertex v0
for (Dart vi = tv0.begin() ; vi != tv0.end() ; vi = tv0.next())
{
if (vi != v1)
{
err += computeSquaredLightfieldDifference(v1,vi) ;
}
}
return err ;
*/
// return computeSquaredLightfieldDifference(v0,v1) ;
Traversor2VVaE
<
MAP
>
tv
(
this
->
m_map
,
v1
)
;
// all vertices surrounding vertex v0
for
(
Dart
vi
=
tv
.
begin
()
;
vi
!=
tv
.
end
()
;
vi
=
tv
.
next
())
{
...
...
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