[sdformat] 01/03: Merge tag 'upstream/4.0.0'
Jose Luis Rivero
jrivero-guest at moszumanska.debian.org
Fri Jan 15 19:42:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
jrivero-guest pushed a commit to branch master
in repository sdformat.
commit e0cbb97a4d0117c111f9f2f73c6634219ac07200
Merge: 084fa4e d158645
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date: Fri Jan 15 00:17:50 2016 +0000
Merge tag 'upstream/4.0.0'
Upstream version 4.0.0
.hg_archival.txt | 8 +-
.hgtags | 8 +
CMakeLists.txt | 6 +-
Changelog.md | 65 +-
cmake/SDFUtils.cmake | 25 +-
cmake/SearchForStuff.cmake | 24 +-
cmake/sdf_config.h.in | 4 +-
include/sdf/Console.hh | 6 +-
include/sdf/Converter.hh | 9 +-
include/sdf/Element.hh | 15 +-
include/sdf/Param.hh | 18 +-
include/sdf/SDFExtension.hh | 38 +-
include/sdf/SDFImpl.hh | 9 +-
include/sdf/Types.hh | 1 -
sdf/1.0/CMakeLists.txt | 2 +-
sdf/1.2/CMakeLists.txt | 2 +-
sdf/1.3/CMakeLists.txt | 2 +-
sdf/1.4/CMakeLists.txt | 2 +-
sdf/1.5/CMakeLists.txt | 8 +-
sdf/1.5/actor.sdf | 9 +-
sdf/1.5/audio_source.sdf | 5 +-
sdf/1.5/camera.sdf | 7 +-
sdf/1.5/collision.sdf | 5 +-
sdf/1.5/frame.sdf | 11 +
sdf/1.5/gui.sdf | 9 +-
sdf/1.5/inertial.sdf | 8 +-
sdf/1.5/joint.sdf | 6 +-
sdf/1.5/light.sdf | 5 +-
sdf/1.5/light_state.sdf | 5 +-
sdf/1.5/link.sdf | 6 +-
sdf/1.5/link_state.sdf | 11 +-
sdf/1.5/model.sdf | 6 +-
sdf/1.5/model_state.sdf | 7 +-
sdf/1.5/population.sdf | 9 +-
sdf/1.5/pose.sdf | 9 +
sdf/1.5/projector.sdf | 7 +-
sdf/1.5/sensor.sdf | 6 +-
sdf/1.5/visual.sdf | 7 +-
sdf/1.5/world.sdf | 6 +-
sdf/1.6/1_5.convert | 331 ++++++
sdf/{1.5 => 1.6}/CMakeLists.txt | 9 +-
sdf/{1.5 => 1.6}/actor.sdf | 9 +-
sdf/1.6/altimeter.sdf | 18 +
sdf/1.6/atmosphere.sdf | 25 +
sdf/1.6/audio_sink.sdf | 4 +
sdf/{1.5 => 1.6}/audio_source.sdf | 5 +-
sdf/1.6/battery.sdf | 12 +
sdf/1.6/box_shape.sdf | 6 +
sdf/{1.5 => 1.6}/camera.sdf | 7 +-
sdf/{1.5 => 1.6}/collision.sdf | 5 +-
sdf/1.6/collision_engine.sdf | 17 +
sdf/1.6/contact.sdf | 12 +
sdf/1.6/cylinder_shape.sdf | 9 +
sdf/1.6/forcetorque.sdf | 20 +
sdf/1.6/frame.sdf | 11 +
sdf/1.6/geometry.sdf | 18 +
sdf/1.6/gps.sdf | 40 +
sdf/1.6/gripper.sdf | 30 +
sdf/{1.5 => 1.6}/gui.sdf | 9 +-
sdf/1.6/heightmap_shape.sdf | 40 +
sdf/1.6/image_shape.sdf | 18 +
sdf/1.6/imu.sdf | 42 +
sdf/{1.5 => 1.6}/inertial.sdf | 8 +-
sdf/{1.5 => 1.6}/joint.sdf | 6 +-
sdf/{1.5 => 1.6}/light.sdf | 5 +-
sdf/{1.5 => 1.6}/light_state.sdf | 5 +-
sdf/{1.5 => 1.6}/link.sdf | 10 +-
sdf/{1.5 => 1.6}/link_state.sdf | 11 +-
sdf/1.6/logical_camera.sdf | 19 +
sdf/1.6/magnetometer.sdf | 21 +
sdf/1.6/material.sdf | 47 +
sdf/1.6/mesh_shape.sdf | 20 +
sdf/{1.5 => 1.6}/model.sdf | 10 +-
sdf/{1.5 => 1.6}/model_state.sdf | 11 +-
sdf/1.6/noise.sdf | 31 +
sdf/1.6/physics.sdf | 205 ++++
sdf/1.6/plane_shape.sdf | 9 +
sdf/1.6/plugin.sdf | 13 +
sdf/1.6/polyline_shape.sdf | 14 +
sdf/{1.5 => 1.6}/population.sdf | 9 +-
sdf/1.6/pose.sdf | 9 +
sdf/{1.5 => 1.6}/projector.sdf | 7 +-
sdf/1.6/ray.sdf | 73 ++
sdf/1.6/rfid.sdf | 2 +
sdf/1.6/rfidtag.sdf | 2 +
sdf/1.6/road.sdf | 16 +
sdf/1.6/root.sdf | 13 +
sdf/1.6/scene.sdf | 82 ++
sdf/1.6/schema/types.xsd | 44 +
sdf/{1.5 => 1.6}/sensor.sdf | 6 +-
sdf/1.6/sonar.sdf | 13 +
sdf/1.6/sphere_shape.sdf | 6 +
sdf/1.6/spherical_coordinates.sdf | 39 +
sdf/1.6/state.sdf | 40 +
sdf/1.6/surface.sdf | 185 +++
sdf/1.6/transceiver.sdf | 34 +
sdf/1.6/urdf.sdf | 19 +
sdf/{1.5 => 1.6}/visual.sdf | 7 +-
sdf/{1.5 => 1.6}/world.sdf | 22 +-
sdf/CMakeLists.txt | 1 +
src/Console.cc | 2 +-
src/Converter.cc | 183 ++-
src/Element.cc | 7 +-
src/Param.cc | 49 +-
src/Param_TEST.cc | 44 +-
src/SDF.cc | 5 +-
src/SDFExtension.cc | 10 +
src/SDF_TEST.cc | 18 +-
src/parser.cc | 22 +-
src/parser_urdf.cc | 1130 ++++++++++++++----
test/integration/CMakeLists.txt | 4 +
test/integration/converter.cc | 181 +++
test/integration/fixed_joint_reduction.cc | 434 +++++++
...joint_reduction_collision_visual_empty_root.sdf | 59 +
...oint_reduction_collision_visual_empty_root.urdf | 57 +
..._joint_reduction_collision_visual_extension.sdf | 144 +++
...joint_reduction_collision_visual_extension.urdf | 170 +++
test/integration/frame.cc | 1251 ++++++++++++++++++++
test/integration/include.cc | 54 +
test/integration/include_description.sdf | 12 +
test/integration/model/box/model.config | 15 +
test/integration/model/box/model.sdf | 22 +
test/integration/urdf_gazebo_extensions.cc | 100 ++
test/integration/urdf_gazebo_extensions.urdf | 140 +++
tools/code_check.sh | 4 +-
125 files changed, 5683 insertions(+), 601 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sdformat.git
More information about the debian-science-commits
mailing list