Skip to content

Commit fa2d7cc

Browse files
authored
Merge 8c8c7fa into 39a0ce3
2 parents 39a0ce3 + 8c8c7fa commit fa2d7cc

File tree

17 files changed

+1503
-3
lines changed

17 files changed

+1503
-3
lines changed

Changelog.md

Lines changed: 92 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,98 @@
556556

557557
## Ignition Gazebo 5.x
558558

559-
### Ignition Gazebo 5.X.X (202X-XX-XX)
559+
### Ignition Gazebo 5.4.0 (2022-03-31)
560+
561+
1. Add the Model Photo Shoot system, port of Modelpropshop plugin from Gazebo classic
562+
* [Pull request #1331](https://github.com/ignitionrobotics/ign-gazebo/pull/1331)
563+
564+
1. Add wheel slip user command
565+
* [Pull request #1241](https://github.com/ignitionrobotics/ign-gazebo/pull/1241)
566+
567+
1. Added user command to set multiple entity poses
568+
* [Pull request #1394](https://github.com/ignitionrobotics/ign-gazebo/pull/1394)
569+
570+
1. Component inspector: refactor Pose3d C++ code into a separate class
571+
* [Pull request #1400](https://github.com/ignitionrobotics/ign-gazebo/pull/1400)
572+
573+
1. Toggle Light visuals
574+
* [Pull request #1387](https://github.com/ignitionrobotics/ign-gazebo/pull/1387)
575+
576+
1. Allow to turn on/off lights
577+
* [Pull request #1343](https://github.com/ignitionrobotics/ign-gazebo/pull/1343)
578+
579+
1. Added more sensor properties to scene/info topic
580+
* [Pull request #1344](https://github.com/ignitionrobotics/ign-gazebo/pull/1344)
581+
582+
1. JointStatePublisher publish parent, child and axis data
583+
* [Pull request #1345](https://github.com/ignitionrobotics/ign-gazebo/pull/1345)
584+
585+
1. Fixed light GUI component inspector
586+
* [Pull request #1337](https://github.com/ignitionrobotics/ign-gazebo/pull/1337)
587+
588+
1. Fix `UNIT_SdfGenerator_TEST`
589+
* [Pull request #1319](https://github.com/ignitionrobotics/ign-gazebo/pull/1319)
590+
591+
1. Add elevator system
592+
* [Pull request #535](https://github.com/ignitionrobotics/ign-gazebo/pull/535)
593+
594+
1. Removed unused variables in shapes plugin
595+
* [Pull request #1321](https://github.com/ignitionrobotics/ign-gazebo/pull/1321)
596+
597+
1. Log an error if JointPositionController cannot find the joint. (citadel retarget)
598+
* [Pull request #1314](https://github.com/ignitionrobotics/ign-gazebo/pull/1314)
599+
600+
1. Buoyancy: fix center of volume's reference frame
601+
* [Pull request #1302](https://github.com/ignitionrobotics/ign-gazebo/pull/1302)
602+
603+
1. Remove EachNew calls from sensor PreUpdates
604+
* [Pull request #1281](https://github.com/ignitionrobotics/ign-gazebo/pull/1281)
605+
606+
1. Prevent GzScene3D 💥 if another scene is already loaded
607+
* [Pull request #1294](https://github.com/ignitionrobotics/ign-gazebo/pull/1294)
608+
609+
1. Cleanup update call for non-rendering sensors
610+
* [Pull request #1282](https://github.com/ignitionrobotics/ign-gazebo/pull/1282)
611+
612+
1. Documentation Error
613+
* [Pull request #1285](https://github.com/ignitionrobotics/ign-gazebo/pull/1285)
614+
615+
1. Min and max parameters for velocity, acceleration, and jerk apply to linear and angular separately.
616+
* [Pull request #1229](https://github.com/ignitionrobotics/ign-gazebo/pull/1229)
617+
618+
1. Add project() call to examples
619+
* [Pull request #1274](https://github.com/ignitionrobotics/ign-gazebo/pull/1274)
620+
621+
1. Implement `/server_control::stop`
622+
* [Pull request #1240](https://github.com/ignitionrobotics/ign-gazebo/pull/1240)
623+
624+
1. 👩‍🌾 Make depth camera tests more robust (#897)
625+
* [Pull request #897) (#1257](https://github.com/ignitionrobotics/ign-gazebo/pull/897) (#1257)
626+
627+
1. Support battery draining start via topics
628+
* [Pull request #1255](https://github.com/ignitionrobotics/ign-gazebo/pull/1255)
629+
630+
1. Make tests run as fast as possible
631+
* [Pull request #1194](https://github.com/ignitionrobotics/ign-gazebo/pull/1194)
632+
* [Pull request #1250](https://github.com/ignitionrobotics/ign-gazebo/pull/1250)
633+
634+
1. Fix visualize lidar
635+
* [Pull request #1224](https://github.com/ignitionrobotics/ign-gazebo/pull/1224)
636+
637+
1. Skip failing Windows tests
638+
* [Pull request #1205](https://github.com/ignitionrobotics/ign-gazebo/pull/1205)
639+
* [Pull request #1204](https://github.com/ignitionrobotics/ign-gazebo/pull/1204)
640+
* [Pull request #1259](https://github.com/ignitionrobotics/ign-gazebo/pull/1259)
641+
* [Pull request #1408](https://github.com/ignitionrobotics/ign-gazebo/pull/1408)
642+
643+
1. Configurable joint state publisher's topic
644+
* [Pull request #1076](https://github.com/ignitionrobotics/ign-gazebo/pull/1076)
645+
646+
1. Thruster plugin: add tests and velocity control
647+
* [Pull request #1190](https://github.com/ignitionrobotics/ign-gazebo/pull/1190)
648+
649+
1. Limit thruster system's input thrust cmd
650+
* [Pull request #1318](https://github.com/ignitionrobotics/ign-gazebo/pull/1318)
560651

561652
### Ignition Gazebo 5.3.0 (2021-11-12)
562653

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<?xml version="1.0" ?>
2+
<!--
3+
Ignition Gazebo Model Photo Shoot plugin demo
4+
5+
This will take perspective, top, front, and both sides pictures of the model:
6+
ign gazebo -s -r -v 4 \-\-iterations 50 model_photo_shoot.sdf
7+
8+
-->
9+
<sdf version="1.6">
10+
<world name="default">
11+
<gravity>0 0 0</gravity>
12+
<plugin
13+
filename="ignition-gazebo-physics-system"
14+
name="ignition::gazebo::systems::Physics">
15+
</plugin>
16+
<plugin
17+
filename="ignition-gazebo-sensors-system"
18+
name="ignition::gazebo::systems::Sensors">
19+
<render_engine>ogre2</render_engine>
20+
<background_color>1, 1, 1</background_color>
21+
</plugin>
22+
<include>
23+
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Robonaut</uri>
24+
<plugin
25+
filename="ignition-gazebo-model-photo-shoot-system"
26+
name="ignition::gazebo::systems::ModelPhotoShoot">
27+
<translation_data_file>poses.txt</translation_data_file>
28+
<random_joints_pose>false</random_joints_pose>
29+
</plugin>
30+
</include>
31+
<model name="photo_shoot">
32+
<link name="link">
33+
<pose>0 0 0 0 0 0</pose>
34+
<sensor name="camera" type="camera">
35+
<camera>
36+
<horizontal_fov>1.047</horizontal_fov>
37+
<image>
38+
<width>960</width>
39+
<height>540</height>
40+
</image>
41+
<clip>
42+
<near>0.1</near>
43+
<far>100</far>
44+
</clip>
45+
</camera>
46+
<always_on>1</always_on>
47+
<update_rate>30</update_rate>
48+
<visualize>true</visualize>
49+
<topic>camera</topic>
50+
</sensor>
51+
</link>
52+
<static>true</static>
53+
</model>
54+
</world>
55+
</sdf>
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/*
2+
* Copyright (C) 2022 Open Source Robotics Foundation
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*
16+
*/
17+
#ifndef IGNITION_GAZEBO_COMPONENTS_WHEELSLIPCMD_HH_
18+
#define IGNITION_GAZEBO_COMPONENTS_WHEELSLIPCMD_HH_
19+
20+
#include <ignition/gazebo/config.hh>
21+
#include <ignition/gazebo/Export.hh>
22+
#include <ignition/gazebo/components/Component.hh>
23+
#include <ignition/gazebo/components/Factory.hh>
24+
#include <ignition/gazebo/components/Serialization.hh>
25+
26+
#include <ignition/msgs/wheel_slip_parameters_cmd.pb.h>
27+
28+
namespace ignition
29+
{
30+
namespace gazebo
31+
{
32+
// Inline bracket to help doxygen filtering.
33+
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
34+
namespace components
35+
{
36+
/// \brief A component type that contains commanded wheel slip parameters of
37+
/// an entity in the world frame represented by msgs::WheelSlipParameters.
38+
using WheelSlipCmd = Component<ignition::msgs::WheelSlipParametersCmd,
39+
class WheelSlipCmdTag, serializers::MsgSerializer>;
40+
IGN_GAZEBO_REGISTER_COMPONENT("ign_gazebo_components.WheelSlipCmd",
41+
WheelSlipCmd)
42+
}
43+
}
44+
}
45+
}
46+
#endif

src/systems/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ add_subdirectory(log_video_recorder)
126126
add_subdirectory(logical_audio_sensor_plugin)
127127
add_subdirectory(logical_camera)
128128
add_subdirectory(magnetometer)
129+
add_subdirectory(model_photo_shoot)
129130
add_subdirectory(mecanum_drive)
130131
add_subdirectory(multicopter_motor_model)
131132
add_subdirectory(multicopter_control)
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
gz_add_system(model-photo-shoot
2+
SOURCES
3+
ModelPhotoShoot.cc
4+
PUBLIC_LINK_LIBS
5+
ignition-common${IGN_COMMON_VER}::ignition-common${IGN_COMMON_VER}
6+
ignition-rendering${IGN_RENDERING_VER}::ignition-rendering${IGN_RENDERING_VER}
7+
ignition-transport${IGN_TRANSPORT_VER}::ignition-transport${IGN_TRANSPORT_VER}
8+
)

0 commit comments

Comments
 (0)