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
Thomas Pitiot
CGoGN
Commits
7af03e77
Commit
7af03e77
authored
Mar 29, 2011
by
Kenneth Vanhoey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Comment cleanup
parent
569bf731
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
13 deletions
+9
-13
include/Algo/Decimation/lightfieldApproximator.hpp
include/Algo/Decimation/lightfieldApproximator.hpp
+9
-12
include/Utils/quadricRGBfunctions.hpp
include/Utils/quadricRGBfunctions.hpp
+0
-1
No files found.
include/Algo/Decimation/lightfieldApproximator.hpp
View file @
7af03e77
...
...
@@ -249,27 +249,24 @@ void Approximator_RGBfunctions<PFP>::approximate(Dart d)
REAL
alpha1
=
((
n
*
j1pr
)
>
0
?
-
1
:
1
)
*
acos
(
std
::
max
(
std
::
min
(
1.0
f
,
n
*
n1
),
-
1.0
f
)
)
;
// angle positif ssi
REAL
alpha2
=
((
n
*
j2pr
)
>
0
?
-
1
:
1
)
*
acos
(
std
::
max
(
std
::
min
(
1.0
f
,
n
*
n2
),
-
1.0
f
)
)
;
// PI/2 < angle(j1',n) < -PI/2 ssi j1'*n < 0
assert
(
-
3.15
<
gamma1
&&
gamma1
<=
3.15
)
;
assert
(
-
3.15
<
gamma2
&&
gamma2
<=
3.15
)
;
assert
(
-
3.15
<
alpha1
&&
alpha1
<=
3.15
)
;
assert
(
-
3.15
<
alpha2
&&
alpha2
<=
3.15
)
;
//
assert (-3.15 < gamma1 && gamma1 <= 3.15) ;
//
assert (-3.15 < gamma2 && gamma2 <= 3.15) ;
//
assert (-3.15 < alpha1 && alpha1 <= 3.15) ;
//
assert (-3.15 < alpha2 && alpha2 <= 3.15) ;
MATRIX36
&
f1
=
this
->
m_attrV
[
d
]
;
MATRIX36
&
f2
=
this
->
m_attrV
[
dd
]
;
//
MATRIX36 &f1 = this->m_attrV[d] ;
//
MATRIX36 &f2 = this->m_attrV[dd] ;
// Create and sum quadrics
// std::cout << "angles1 : " << gamma1 << " " << alpha1 << std::endl ;
// std::cout << "angles2 : " << gamma2 << " " << alpha2 << std::endl ;
QuadricRGBfunctions
<
REAL
>
q
(
f1
,
gamma1
/*, alpha1*/
)
;
m_quadricRGBfunctions
[
d
].
zero
()
;
m_quadricRGBfunctions
[
d
]
+=
QuadricRGBfunctions
<
REAL
>
(
this
->
m_attrV
[
d
],
gamma1
/*, alpha1*/
)
;
m_quadricRGBfunctions
[
d
]
+=
QuadricRGBfunctions
<
REAL
>
(
this
->
m_attrV
[
dd
],
gamma2
/*, alpha2*/
)
;
m_quadricRGBfunctions
[
d
]
+=
QuadricRGBfunctions
<
REAL
>
(
this
->
m_attrV
[
d
],
gamma1
,
alpha1
)
;
m_quadricRGBfunctions
[
d
]
+=
QuadricRGBfunctions
<
REAL
>
(
this
->
m_attrV
[
dd
],
gamma2
,
alpha2
)
;
// Compute new function
if
(
!
m_quadricRGBfunctions
[
d
].
findOptimizedRGBfunctions
(
this
->
m_approx
[
d
]))
{
this
->
m_approx
[
d
]
=
this
->
m_attrV
[
d
];
// if fail take first one
}
MATRIX36
&
newF
=
this
->
m_approx
[
d
]
;
//
MATRIX36 &newF = this->m_approx[d] ;
// std::cout << "Approx of : " <<std::endl ;
// std::cout << "Frame1 : " << m_frame[d] << std::endl ;
// std::cout << "Function1 : "<< this->m_attrV[d] << std::endl ;
...
...
include/Utils/quadricRGBfunctions.hpp
View file @
7af03e77
...
...
@@ -71,7 +71,6 @@ QuadricRGBfunctions<REAL>::QuadricRGBfunctions(const MATRIX36& cf, const REAL ga
MATRIX66
R1
,
R2_b
,
R2_c
;
buildRotateMatrix
(
R1
,
gamma
);
// Rotation 1
// R1.transpose() ;
buildIntegralMatrix_A
(
A
,
alpha
);
// Parameterized integral matrix A
buildIntegralMatrix_b
(
R2_b
,
alpha
);
// Parameterized integral matrix b
...
...
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