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 sdf 1.7 changes forward to 1.8 #570

Merged
merged 8 commits into from
May 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions sdf/1.8/camera.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<description>Height in pixels </description>
</element>
<element name="format" type="string" default="R8G8B8" required="0">
<description>(L8|R8G8B8|B8G8R8|BAYER_RGGB8|BAYER_BGGR8|BAYER_GBRG8|BAYER_GRBG8)</description>
<description>(L8|L16|R_FLOAT16|R_FLOAT32|R8G8B8|B8G8R8|BAYER_RGGB8|BAYER_BGGR8|BAYER_GBRG8|BAYER_GRBG8)</description>
</element>
</element> <!-- End Image -->

Expand All @@ -29,7 +29,7 @@
<description>Near clipping plane</description>
</element>

<element name="far" type="double" default="100" min="10.0" required="1">
<element name="far" type="double" default="100" min="0.1" required="1">
<description>Far clipping plane</description>
</element>
</element> <!-- End Clip -->
Expand Down
2 changes: 1 addition & 1 deletion sdf/1.8/frame.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<description>
Name of the link or frame to which this frame is attached.
If a frame is specified, recursively following the attached_to attributes
of the specified frames must lead to the name of a link or the world frame.
of the specified frames must lead to the name of a link, a model, or the world frame.
</description>
</attribute>

Expand Down
24 changes: 24 additions & 0 deletions sdf/1.8/material.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
</element>
</element>

<element name="render_order" type="float" default="0.0" required="0">
<description>Set render order for coplanar polygons. The higher value will be rendered on top of the other coplanar polygons</description>
</element>

<element name="lighting" type="bool" default="true" required="0">
<description>If false, dynamic lighting will be disabled</description>
</element>
Expand All @@ -45,6 +49,11 @@
<description>The emissive color of a material specified by set of four numbers representing red/green/blue, each in the range of [0,1].</description>
</element>

<element name="double_sided" type="bool" default="false" required="0">
<description>If true, the mesh that this material is applied to will be rendered as double sided</description>
</element>


<element name="pbr" required="0">
<description>Physically Based Rendering (PBR) material. There are two PBR workflows: metal and specular. While both workflows and their parameters can be specified at the same time, typically only one of them will be used (depending on the underlying renderer capability). It is also recommended to use the same workflow for all materials in the world.</description>

Expand Down Expand Up @@ -90,6 +99,14 @@
<element name="emissive_map" type="string" default="" required="0">
<description>Filename of the emissive map.</description>
</element>

<element name="light_map" type="string" default="" required="0">
<attribute name="uv_set" type="unsigned int" default="0" required="0">
<description>Index of the texture coordinate set to use.</description>
</attribute>
<description>Filename of the light map. The light map is a prebaked light texture that is applied over the albedo map</description>
</element>

</element>

<element name="specular" required="0">
Expand Down Expand Up @@ -126,6 +143,13 @@
<element name="emissive_map" type="string" default="" required="0">
<description>Filename of the emissive map.</description>
</element>

<element name="light_map" type="string" default="" required="0">
<attribute name="uv_set" type="unsigned int" default="0" required="0">
<description>Index of the texture coordinate set to use.</description>
</attribute>
<description>Filename of the light map. The light map is a prebaked light texture that is applied over the albedo map</description>
</element>
</element>

</element>
Expand Down
6 changes: 3 additions & 3 deletions sdf/1.8/sensor.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
altimeter,
camera,
contact,
depth_camera,
depth_camera, depth,
force_torque,
gps,
gpu_lidar,
Expand All @@ -25,9 +25,9 @@
ray,
rfid,
rfidtag,
rgbd_camera,
rgbd_camera, rgbd,
sonar,
thermal_camera,
thermal_camera, thermal,
wireless_receiver, and
wireless_transmitter.
The "ray" and "gpu_ray" types are equivalent to "lidar" and "gpu_lidar", respectively. It is preferred to use "lidar" and "gpu_lidar" since "ray" and "gpu_ray" will be deprecated. The "ray" and "gpu_ray" types are maintained for legacy support.
Expand Down
4 changes: 2 additions & 2 deletions sdf/1.8/surface.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,11 @@
</element>

<element name="collide_bitmask" type="unsigned int" default="65535" required="0">
<description>Bitmask for collision filtering. This will override collide_without_contact</description>
<description>Bitmask for collision filtering. This will override collide_without_contact. Parsed as 16-bit unsigned integer.</description>
</element>

<element name="category_bitmask" type="unsigned int" default="65535" required="0">
<description><![CDATA[Bitmask for category of collision filtering. Collision happens if ((category1 & collision2) | (category2 & collision1)) is not zero. If not specified, the category_bitmask should be interpreted as being the same as collide_bitmask.]]></description>
<description><![CDATA[Bitmask for category of collision filtering. Collision happens if ((category1 & collision2) | (category2 & collision1)) is not zero. If not specified, the category_bitmask should be interpreted as being the same as collide_bitmask. Parsed as 16-bit unsigned integer.]]></description>
</element>

<element name="poissons_ratio" type="double" default="0.3" required="0">
Expand Down