Skip to content

Commit 3a65de3

Browse files
authored
Merge pull request #13 from RobotecAI/nprokopiuk/resources_replacement
Individual strings `uri` and `resource_string` replaced by `Resource` msg
2 parents cb76e09 + 2ea29e4 commit 3a65de3

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

msg/WorldResource.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Depending on the world format, loading of a world might be associated with changes
44
# in certain parameters, including physics settings such as gravity.
55
# World resources may be defined in standard or simulation-specific formats,
6-
# and, depending on the simulator, loaded from local or remote repositories.
6+
# and, depending on the simulator, loaded from local or remote repositories.
77

88

99
string name # World name, which is not necessarily unique.

package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>simulation_interfaces</name>
5-
<version>2.0.0</version>
5+
<version>2.0.1</version>
66
<description>A package containing simulation interfaces including messages, services and actions</description>
77
<maintainer email="[email protected]">Adam Dabrowski</maintainer>
88
<license>Apache License 2.0</license>

srv/LoadWorld.srv

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
# Currently loaded worlds will be unloaded before attempting to load a new one.
66
# Any previously spawned entities will be removed. Once a world is loaded, simulation will be left in a Stopped state.
77

8-
string uri # Resource such as SDF, USD, MJCF, or other simulator-native format world file.
9-
10-
string resource_string # Simulation world passed as a string. This field is used if the uri field is empty.
8+
Resource world_resource # Resource such as SDF, USD, MJCF, or other simulator-native format world file or,
9+
# Simulation world passed as a string.
1110

1211
bool fail_on_unsupported_element # Fail on unsupported elements (such as SDFormat sub-tags). By default, such elements are ignored.
1312

0 commit comments

Comments
 (0)