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
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
5b11d645
Commit
5b11d645
authored
Oct 12, 2015
by
reichenbach
Browse files
[FIX] changes needed for the latest version of eigen3
parent
d8801b11
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
src/core/common/math/WLinearAlgebraFunctions.h
src/core/common/math/WLinearAlgebraFunctions.h
+1
-1
src/core/dataHandler/WDataTexture3D.cpp
src/core/dataHandler/WDataTexture3D.cpp
+4
-1
No files found.
src/core/common/math/WLinearAlgebraFunctions.h
View file @
5b11d645
...
...
@@ -123,7 +123,7 @@ void computeSVD( const WMatrix< T >& A,
WMatrix
<
T
>&
V
,
WValue
<
T
>&
S
)
{
Eigen
::
Matrix
<
T
,
Eigen
::
Dynamic
,
Eigen
::
Dynamic
>
eigenA
(
A
)
;
Eigen
::
Matrix
<
T
,
Eigen
::
Dynamic
,
Eigen
::
Dynamic
>
eigenA
=
A
;
Eigen
::
JacobiSVD
<
Eigen
::
Matrix
<
T
,
Eigen
::
Dynamic
,
Eigen
::
Dynamic
>
>
svd
(
eigenA
,
Eigen
::
ComputeFullU
|
Eigen
::
ComputeFullV
);
U
=
WMatrix
<
T
>
(
svd
.
matrixU
()
);
V
=
WMatrix
<
T
>
(
svd
.
matrixV
()
);
...
...
src/core/dataHandler/WDataTexture3D.cpp
View file @
5b11d645
...
...
@@ -65,7 +65,10 @@ WDataTexture3D::WDataTexture3D( boost::shared_ptr< WValueSetBase > valueSet, boo
offset
(
3
,
1
)
=
0.5
/
grid
->
getNbCoordsY
();
offset
(
3
,
2
)
=
0.5
/
grid
->
getNbCoordsZ
();
transformation
()
->
set
(
invert
(
static_cast
<
WMatrix4d
>
(
grid
->
getTransform
()
)
)
*
scale
*
offset
);
WMatrix4d
const
m
=
grid
->
getTransform
();
// implicit cast
Eigen
::
Matrix4d
em
=
m
;
transformation
()
->
set
(
WMatrix4d
(
em
)
*
scale
*
offset
);
// set the size
WGETexture3D
::
initTextureSize
(
this
,
grid
->
getNbCoordsX
(),
grid
->
getNbCoordsY
(),
grid
->
getNbCoordsZ
()
);
...
...
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