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.

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

Merge: 8 -> main #2199

Merged
merged 57 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
b3731d6
Remove forward-ported restriction on model loading (#2104)
mjcarroll Aug 31, 2023
52167a6
Add automatic moment of inertia calculation for meshes (#2061)
jasmeet0915 Aug 31, 2023
ecc91e8
Remove GZ_PHYSICS_ENGINE_INSTALL_DIR deprecation warnings (#2106)
caguero Aug 31, 2023
7179716
fix broken link to API (#2108)
mabelzhang Sep 1, 2023
2dbcc6c
Remove GZ_PHYSICS_ENGINE_INSTALL_DIR deprecation warnings (#2106)
caguero Aug 31, 2023
58a0c0b
Fix typos. (#2114)
caguero Sep 1, 2023
5ebf860
Fix default topic name of JointStatePublisher (#2115)
Bi0T1N Sep 5, 2023
b938768
Add link to existing issue (#2116)
Bi0T1N Sep 5, 2023
5bb1b1c
Fix thrust cmd topic in underwater tutorial (#2120)
iche033 Sep 6, 2023
b433259
Removed warning in sensors_demos.sdf (#2122)
ahcorde Sep 7, 2023
491fa23
Fixed invalid service names (#2121)
ahcorde Sep 7, 2023
9055d88
fix move to model (#2126)
iche033 Sep 7, 2023
353ad20
Update README.md (#2124)
ahcorde Sep 7, 2023
923ccee
update link in particles tutorial (#2127)
iche033 Sep 8, 2023
d41e94c
Update triggered_publisher.md (#2130)
ahcorde Sep 8, 2023
f44677a
Remove sdformat diff drive warning (#2129)
ahcorde Sep 8, 2023
0baa39f
Fixes the link for the Hardware Acceleration Tutorial
Voldivh Sep 8, 2023
235efd3
Merge pull request #2133 from gazebosim/voldivh/fix_hw_accel_link
Voldivh Sep 8, 2023
183c04f
Use default physics engine in example worlds (#2134)
iche033 Sep 8, 2023
5fbfcf7
Update underwater_vehicles.md (#2128)
ahcorde Sep 8, 2023
967f4f1
Fix duplicate entries in joint position controller GUI plugin (#2101)
iche033 Sep 11, 2023
07129c6
Modifies the definition of hydrodynamics plugin
Voldivh Sep 12, 2023
4135cd1
Removed python trace (#2123)
ahcorde Sep 12, 2023
02c0a56
Corrects the output from the command
Voldivh Sep 12, 2023
f9f9897
Merge pull request #2137 from gazebosim/voldivh/lrauv_control_demo_pl…
Voldivh Sep 12, 2023
3e6be99
Load transform control and select entities plugins in thermal camera …
iche033 Sep 12, 2023
9d79b62
Update video recorder tutorial screenshot (#2135)
iche033 Sep 12, 2023
e9fa7d4
Merge pull request #2138 from gazebosim/voldivh/model_command_output_…
Voldivh Sep 12, 2023
d052491
Fix multi_lrauv_race example (#2111)
caguero Sep 13, 2023
0bd0b66
Add note about Featherstone (#2143)
mjcarroll Sep 13, 2023
5577b19
Fix CMake warning in example (#2145)
azeey Sep 13, 2023
2388193
Improve joint controller world visualization (#2144)
ahcorde Sep 14, 2023
839282a
Update logging tutorial (#2148)
iche033 Sep 14, 2023
2bef470
Update Reset simulation tutorial (#2147)
iche033 Sep 14, 2023
294fddc
Fix broken / update ign links in tutorials (Harmonic) (#2107)
mabelzhang Sep 14, 2023
c8d16bf
Update triggered publisher tutorial (#2150)
iche033 Sep 15, 2023
b504e5c
Fix light_control example and update tutorial (#2149)
iche033 Sep 15, 2023
bb6753a
Fix reset button in examples (#2151)
azeey Sep 15, 2023
509d01a
Fix another deadlock in sensors system (#2141)
iche033 Sep 20, 2023
4d4b680
Added tutorial for Automatic Inertia Calculator (#2119)
jasmeet0915 Sep 20, 2023
f55212e
Fix example output in python tutorial (#2157)
azeey Sep 20, 2023
3eb2c7c
Fix SDFormat xml output of sdf_exporter (#2156)
azeey Sep 20, 2023
f5087df
Merge gz-sim7 into gz-sim8
azeey Sep 20, 2023
e007fa2
Backport reset button fix (#2159)
iche033 Sep 20, 2023
e603694
Merge pull request #2158 from azeey/7_to_8
azeey Sep 21, 2023
5dbbd1b
Fix image sizes in apply_force_torque tutorial (#2169)
azeey Sep 26, 2023
35c068e
Prepare for 7.6.0 Release (#2173)
azeey Sep 27, 2023
7c06978
Merge from gz-sim7
iche033 Sep 27, 2023
409d8c5
fix INTEGRATION_save_world's SdfGeneratorFixture.ModelWithNestedInclu…
iche033 Sep 27, 2023
4c62304
Merge pull request #2175 from gazebosim/merge_7_8_20230927
iche033 Sep 27, 2023
2e58d61
TouchPlugin: Reset the plugin with the initial values (#2132)
ahcorde Sep 27, 2023
5ef84a9
Update Mesh Inertia Calculator to incorporate mesh scale in the calcu…
jasmeet0915 Sep 27, 2023
c5cd260
Server: explicitly skip auto-inertial calculation (#2166)
scpeters Sep 28, 2023
727eb3c
Update changelog and prepare for pre2 release (#2178)
azeey Sep 29, 2023
18aa48f
Prepare for 8.0.0 Release (#2181)
azeey Sep 29, 2023
78c27d9
Remove direct dependency on libdart in CI (#2187)
azeey Oct 2, 2023
8c2fb9b
Support specifying the name of light associated with lens flares (#2172)
iche033 Oct 5, 2023
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
6 changes: 3 additions & 3 deletions examples/scripts/blender/sdf_exporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def export_sdf(prefix_path):

# 1 model and 1 link
model = ET.SubElement(sdf, "model", attrib={"name": "test"})
static = ET.SubElement(sdf, "static")
static = ET.SubElement(model, "static")
static.text = "true"
link = ET.SubElement(model, "link", attrib={"name": "testlink"})
# for each geometry in geometry library add a <visual> tag
Expand Down Expand Up @@ -165,8 +165,8 @@ def add_attenuation_tags(light_tag, blender_light):
uri.text = path.join(meshes_folder_prefix, dae_filename)

surface = ET.SubElement(collision, "surface")
contact = ET.SubElement(collision, "contact")
collide_bitmask = ET.SubElement(collision, "collide_bitmask")
contact = ET.SubElement(surface, "contact")
collide_bitmask = ET.SubElement(contact, "collide_bitmask")
collide_bitmask.text = "0x01"

## sdf write to file
Expand Down
1 change: 0 additions & 1 deletion examples/worlds/nested_model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<plugin
filename="gz-sim-physics-system"
name="gz::sim::systems::Physics">
<engine><filename>gz-physics-tpe-plugin</filename></engine>
</plugin>
<plugin
filename="gz-sim-user-commands-system"
Expand Down
2 changes: 0 additions & 2 deletions examples/worlds/particle_emitter.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
<plugin
filename="gz-sim-physics-system"
name="gz::sim::systems::Physics">
<!-- Use TPE in order to use nested models -->
<engine><filename>gz-physics-tpe-plugin</filename></engine>
</plugin>
<plugin
filename="gz-sim-user-commands-system"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,12 @@ namespace gz::sim::gui
/// \brief Model holding all the joints.
public: JointsModel jointsModel;

/// \brief Model entity being controller.
/// \brief Model entity being controlled.
public: Entity modelEntity{kNullEntity};

/// \brief Previous model entity being controlled.
public: Entity prevModelEntity{kNullEntity};

/// \brief Name of the model
public: QString modelName{"No model selected"};

Expand Down Expand Up @@ -212,6 +215,12 @@ void JointPositionController::Update(const UpdateInfo &,
auto jointEntities = _ecm.EntitiesByComponents(components::Joint(),
components::ParentEntity(this->dataPtr->modelEntity));

if (this->dataPtr->prevModelEntity != this->dataPtr->modelEntity)
{
this->dataPtr->prevModelEntity = this->dataPtr->modelEntity;
this->dataPtr->jointsModel.Clear();
}

// List all joints
for (const auto &jointEntity : jointEntities)
{
Expand Down
2 changes: 1 addition & 1 deletion src/gui/plugins/view_angle/ViewAngle.cc
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ bool ViewAngle::OnMoveToModelService(const gz::msgs::GUICamera &_msg,
Entity entityId = kNullEntity;
try
{
entityId = std::get<unsigned int>(visualToMove->UserData("gazebo-entity"));
entityId = std::get<uint64_t>(visualToMove->UserData("gazebo-entity"));
}
catch(std::bad_variant_access &_e)
{
Expand Down
6 changes: 3 additions & 3 deletions src/systems/joint_state_publisher/JointStatePublisher.hh
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ namespace sim
inline namespace GZ_SIM_VERSION_NAMESPACE {
namespace systems
{
/// \brief The JointStatePub system publishes state information for
/// a model. The published message type is gz::msgs::Model, and the
/// \brief The JointStatePublisher system publishes joint state information
/// for a model. The published message type is gz::msgs::Model, and the
/// publication topic is determined by the `<topic>` parameter.
///
/// By default the JointStatePublisher will publish all joints for
Expand All @@ -45,7 +45,7 @@ namespace systems
///
/// `<topic>`: Name of the topic to publish to. This parameter is optional,
/// and if not provided, the joint state will be published to
/// "/world/<world_name>/model/<model_name>/state".
/// "/world/<world_name>/model/<model_name>/joint_state".
/// `<joint_name>`: Name of a joint to publish. This parameter can be
/// specified multiple times, and is optional. All joints in a model will
/// be published if joint names are not specified.
Expand Down
Binary file modified tutorials/files/video_recorder/video_recorder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions tutorials/move_camera_to_model.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ This tutorial gives an introduction to Gazebo's service `/gui/move_to/model`. Th
For example, Let's move the camera to the `box` model looking down from 5 meters away.

```bash
ign service -s /gui/move_to/model --reqtype gz.msgs.GUICamera --reptype gz.msgs.Boolean -r 'name: "box", pose: {position: {z:5}, orientation: {x:0, y:0, z: -1, w:0}}, projection_type: "orbit"' --timeout 5000
gz service -s /gui/move_to/model --reqtype gz.msgs.GUICamera --reptype gz.msgs.Boolean -r 'name: "box", pose: {position: {z:5}, orientation: {x:0, y:0, z: -1, w:0}}, projection_type: "orbit"' --timeout 5000
```

@image html files/move_camera_to_model/box_5.gif

The camera can also be placed far away, for example 20 meters:

```bash
ign service -s /gui/move_to/model --reqtype gz.msgs.GUICamera --reptype gz.msgs.Boolean -r 'name: "box", pose: {position: {z:20}, orientation: {x:0, y:0, z: -1, w:0}}, projection_type: "orbit"' --timeout 5000
gz service -s /gui/move_to/model --reqtype gz.msgs.GUICamera --reptype gz.msgs.Boolean -r 'name: "box", pose: {position: {z:20}, orientation: {x:0, y:0, z: -1, w:0}}, projection_type: "orbit"' --timeout 5000
```

@image html files/move_camera_to_model/box_20.gif
Expand Down
3 changes: 2 additions & 1 deletion tutorials/terminology.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ to developers touching the source code.
more than 1 world.
* It has a single ECM with all the entities and components
relevant to the levels / world / performer being simulated.
* It's still TBD how to support multiple `<worlds>` in parallel.
* It's still [an open task](https://github.com/gazebosim/gz-sim/issues/18)
to support multiple `<worlds>` in parallel.
* It has an event manager.
* It has a network manager, if simulation is distributed.
* It loads up a set of systems.
Expand Down
5 changes: 3 additions & 2 deletions tutorials/video_recorder.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ Gazebo that already has this plugin included in the GUI.
gz sim -v 4 video_record_dbl_pendulum.sdf
```

In this plugin, you should see a single button with a video recorder icon.
Clicking on the button gives you the video format options that are available.
In this demo world, you should see a video recorder icon positioned on the top.
left area of the window along with other buttons. Clicking on the video
recorder button gives you the video format options that are available.

@image html files/video_recorder/video_recorder.png

Expand Down