Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilhem Saurel
pinocchio
Commits
96e8b57a
Commit
96e8b57a
authored
Jan 24, 2017
by
Rohan Budhiraja
Browse files
[C++][Minor] Use fixed size eigen vectors instead of dynamic size vectorxd
parent
06f1a24b
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/multibody/fcl.hpp
View file @
96e8b57a
...
...
@@ -128,9 +128,9 @@ struct GeometryObject
const
JointIndex
parentJ
,
const
boost
::
shared_ptr
<
fcl
::
CollisionGeometry
>
&
collision
,
const
SE3
&
placement
,
const
std
::
string
&
meshPath
=
""
,
const
Eigen
::
Vector3d
&
meshScale
=
Eigen
::
Vector
X
d
::
Ones
(
3
),
const
Eigen
::
Vector3d
&
meshScale
=
Eigen
::
Vector
3
d
::
Ones
(),
const
bool
overrideMaterial
=
false
,
const
Eigen
::
Vector4d
&
meshColor
=
Eigen
::
Vector
X
d
::
Zero
(
4
),
const
Eigen
::
Vector4d
&
meshColor
=
Eigen
::
Vector
4
d
::
Zero
(),
const
std
::
string
&
meshTexturePath
=
""
)
:
name
(
name
)
,
parentFrame
(
parentF
)
...
...
src/parsers/urdf/geometry.cpp
View file @
96e8b57a
...
...
@@ -165,15 +165,15 @@ namespace se3
* @param[in] package_dirs A vector containing the different directories where to search for packages
*
*/
template
<
typename
T
>
inline
bool
getVisualMaterial
(
const
boost
::
shared_ptr
<
T
>
urdf_object
,
std
::
string
&
meshTexturePath
,
template
<
typename
urdfObject
>
inline
bool
getVisualMaterial
(
const
boost
::
shared_ptr
<
urdfObject
>
urdf_object
,
std
::
string
&
meshTexturePath
,
Eigen
::
Vector4d
&
meshColor
,
const
std
::
vector
<
std
::
string
>
&
package_dirs
);
template
<
>
inline
bool
getVisualMaterial
<
::
urdf
::
Collision
>
(
const
boost
::
shared_ptr
<
::
urdf
::
Collision
>
,
std
::
string
&
meshTexturePath
,
Eigen
::
Vector4d
&
meshColor
,
const
std
::
vector
<
std
::
string
>
&
)
{
meshColor
=
Eigen
::
VectorXd
::
Zero
(
4
);
meshColor
.
set
Zero
();
meshTexturePath
=
""
;
return
false
;
}
...
...
@@ -182,7 +182,7 @@ namespace se3
inline
bool
getVisualMaterial
<
::
urdf
::
Visual
>
(
const
boost
::
shared_ptr
<
::
urdf
::
Visual
>
urdf_visual
,
std
::
string
&
meshTexturePath
,
Eigen
::
Vector4d
&
meshColor
,
const
std
::
vector
<
std
::
string
>
&
package_dirs
)
{
meshColor
=
Eigen
::
VectorXd
::
Zero
(
4
);
meshColor
.
set
Zero
();
meshTexturePath
=
""
;
bool
overrideMaterial
=
false
;
if
(
urdf_visual
->
material
!=
NULL
)
{
...
...
Write
Preview
Supports
Markdown
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