Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix actor worlds #682

Closed
wants to merge 1 commit into from
Closed

Fix actor worlds #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions examples/worlds/actor.sdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,6 @@
</link>
</model>

<include>
<name>demo_actor</name>
<!-- override actor's pose, which has 1m in Z -->
<pose>0 0 0 0 0 0</pose>
<uri>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor</uri>
</include>

<actor name="actor_talking">
<skin>
<filename>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor/tip/files/meshes/talk_b.dae</filename>
Expand Down
5 changes: 3 additions & 2 deletions examples/worlds/actor_crowd.sdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@

</plugin>

<!-- Entity tree -->
<!-- Entity tree -->
<plugin filename="EntityTree" name="Entity tree">
<ignition-gui>
<property type="bool" key="showTitleBar">false</property>
Expand Down Expand Up @@ -134,6 +134,7 @@
</model>


<!--
<include>
<name>demo_actor_0_0</name>
<pose>-5 -5 0 0 0 0</pose>
Expand Down Expand Up @@ -859,7 +860,7 @@
<pose>5 5 0 0 0 0</pose>
<uri>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor</uri>
</include>

-->

</world>
</sdf>
110 changes: 55 additions & 55 deletions examples/worlds/follow_actor.sdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,63 +302,63 @@
</link>
</model>

<include>
<name>walker_slow_red</name>
<!-- Root node pose (torso) -->
<pose>0 -2 1.0 0 0 0</pose>
<uri>https://fuel.ignitionrobotics.org/1.0/chapulina/models/Walking actor</uri>
<plugin filename="ignition-gazebo-follow-actor-system"
name="ignition::gazebo::systems::FollowActor">
<target>red_box</target>
<min_distance>1.0</min_distance>
<max_distance>8.0</max_distance>
<velocity>1</velocity>
<animation_x_vel>4.58837</animation_x_vel>
</plugin>
</include>
<!--<include>-->
<!--<name>walker_slow_red</name>-->
<!--[> Root node pose (torso) <]-->
<!--<pose>0 -2 1.0 0 0 0</pose>-->
<!--<uri>https://fuel.ignitionrobotics.org/1.0/chapulina/models/Walking actor</uri>-->
<!--<plugin filename="ignition-gazebo-follow-actor-system"-->
<!--name="ignition::gazebo::systems::FollowActor">-->
<!--<target>red_box</target>-->
<!--<min_distance>1.0</min_distance>-->
<!--<max_distance>8.0</max_distance>-->
<!--<velocity>1</velocity>-->
<!--<animation_x_vel>4.58837</animation_x_vel>-->
<!--</plugin>-->
<!--</include>-->

<include>
<name>walker_fast_green</name>
<pose>0 0 1.0 0 0 0</pose>
<uri>https://fuel.ignitionrobotics.org/1.0/chapulina/models/Walking actor</uri>
<plugin filename="ignition-gazebo-follow-actor-system"
name="ignition::gazebo::systems::FollowActor">
<target>green_box</target>
<min_distance>1.0</min_distance>
<max_distance>8.0</max_distance>
<velocity>4</velocity>
<animation_x_vel>4.58837</animation_x_vel>
</plugin>
</include>
<!--<include>-->
<!--<name>walker_fast_green</name>-->
<!--<pose>0 0 1.0 0 0 0</pose>-->
<!--<uri>https://fuel.ignitionrobotics.org/1.0/chapulina/models/Walking actor</uri>-->
<!--<plugin filename="ignition-gazebo-follow-actor-system"-->
<!--name="ignition::gazebo::systems::FollowActor">-->
<!--<target>green_box</target>-->
<!--<min_distance>1.0</min_distance>-->
<!--<max_distance>8.0</max_distance>-->
<!--<velocity>4</velocity>-->
<!--<animation_x_vel>4.58837</animation_x_vel>-->
<!--</plugin>-->
<!--</include>-->

<include>
<name>runner_slow_blue</name>
<pose>0 2 1.0 0 0 0</pose>
<uri>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor</uri>
<plugin filename="ignition-gazebo-follow-actor-system"
name="ignition::gazebo::systems::FollowActor">
<target>blue_box</target>
<min_distance>1.0</min_distance>
<max_distance>8.0</max_distance>
<velocity>1</velocity>
<animation>run</animation>
<animation_x_vel>1.5</animation_x_vel>
</plugin>
</include>
<!--<include>-->
<!--<name>runner_slow_blue</name>-->
<!--<pose>0 2 1.0 0 0 0</pose>-->
<!--<uri>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor</uri>-->
<!--<plugin filename="ignition-gazebo-follow-actor-system"-->
<!--name="ignition::gazebo::systems::FollowActor">-->
<!--<target>blue_box</target>-->
<!--<min_distance>1.0</min_distance>-->
<!--<max_distance>8.0</max_distance>-->
<!--<velocity>1</velocity>-->
<!--<animation>run</animation>-->
<!--<animation_x_vel>1.5</animation_x_vel>-->
<!--</plugin>-->
<!--</include>-->

<include>
<name>runner_fast_yellow</name>
<pose>0 4 1.0 0 0 0</pose>
<uri>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor</uri>
<plugin filename="ignition-gazebo-follow-actor-system"
name="ignition::gazebo::systems::FollowActor">
<target>yellow_box</target>
<min_distance>1.0</min_distance>
<max_distance>8.0</max_distance>
<velocity>4</velocity>
<animation>run</animation>
<animation_x_vel>1.5</animation_x_vel>
</plugin>
</include>
<!--<include>-->
<!--<name>runner_fast_yellow</name>-->
<!--<pose>0 4 1.0 0 0 0</pose>-->
<!--<uri>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor</uri>-->
<!--<plugin filename="ignition-gazebo-follow-actor-system"-->
<!--name="ignition::gazebo::systems::FollowActor">-->
<!--<target>yellow_box</target>-->
<!--<min_distance>1.0</min_distance>-->
<!--<max_distance>8.0</max_distance>-->
<!--<velocity>4</velocity>-->
<!--<animation>run</animation>-->
<!--<animation_x_vel>1.5</animation_x_vel>-->
<!--</plugin>-->
<!--</include>-->
</world>
</sdf>