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
CeTI
ROS
ROS Packages
gazebo-pkgs
Commits
a65493df
Commit
a65493df
authored
Feb 27, 2016
by
Jennifer Buehler
Browse files
small adjustments for tutorial
parent
f868f990
Changes
2
Hide whitespace changes
Inline
Side-by-side
gazebo_grasp_plugin/src/GazeboGraspFix.cpp
View file @
a65493df
...
@@ -92,7 +92,10 @@ void GazeboGraspFix::InitValues(){
...
@@ -92,7 +92,10 @@ void GazeboGraspFix::InitValues(){
}
}
void
GazeboGraspFix
::
Load
(
physics
::
ModelPtr
_parent
,
sdf
::
ElementPtr
_sdf
)
{
void
GazeboGraspFix
::
Load
(
physics
::
ModelPtr
_parent
,
sdf
::
ElementPtr
_sdf
)
{
std
::
cout
<<
"Loading grasp-fix plugin"
<<
std
::
endl
;
this
->
model
=
_parent
;
this
->
model
=
_parent
;
this
->
world
=
this
->
model
->
GetWorld
();
this
->
world
=
this
->
model
->
GetWorld
();
this
->
physics
=
this
->
model
->
GetWorld
()
->
GetPhysicsEngine
();
this
->
physics
=
this
->
model
->
GetWorld
()
->
GetPhysicsEngine
();
...
...
gazebo_test_tools/src/cube_spawner_node.cpp
View file @
a65493df
...
@@ -6,7 +6,7 @@ int main(int argc, char** argv) {
...
@@ -6,7 +6,7 @@ int main(int argc, char** argv) {
if
(
argc
<
5
)
if
(
argc
<
5
)
{
{
ROS_INFO
(
"Usage: %s <name> [x y z]."
,
argv
[
0
]);
ROS_INFO
(
"Usage: %s <name> [x y z]
[frame_id]
."
,
argv
[
0
]);
return
0
;
return
0
;
}
}
...
@@ -22,11 +22,14 @@ int main(int argc, char** argv) {
...
@@ -22,11 +22,14 @@ int main(int argc, char** argv) {
float
y
=
0
;
float
y
=
0
;
float
z
=
0
;
float
z
=
0
;
std
::
string
frame_id
=
"world"
;
if
(
argc
>
2
)
x
=
atof
(
argv
[
2
]);
if
(
argc
>
2
)
x
=
atof
(
argv
[
2
]);
if
(
argc
>
3
)
y
=
atof
(
argv
[
3
]);
if
(
argc
>
3
)
y
=
atof
(
argv
[
3
]);
if
(
argc
>
4
)
z
=
atof
(
argv
[
4
]);
if
(
argc
>
4
)
z
=
atof
(
argv
[
4
]);
if
(
argc
>
5
)
frame_id
=
argv
[
5
];
spawner
.
spawnCube
(
name
,
"world"
,
x
,
y
,
z
,
0
,
0
,
0
,
1
);
spawner
.
spawnCube
(
name
,
frame_id
,
x
,
y
,
z
,
0
,
0
,
0
,
1
);
return
0
;
return
0
;
}
}
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