[gazebo] branch master updated (11dcbe4 -> 91b89c4)

Jose Luis Rivero jrivero-guest at moszumanska.debian.org
Mon Jan 16 23:55:40 UTC 2017


This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a change to branch master
in repository gazebo.

      from  11dcbe4   Update changelog
      adds  e7a9f3a   Imported Upstream version 7.3.1+dfsg
      adds  2883d4f   Imported Upstream version 7.3.1+dfsg
      adds  93f8b65   Imported Upstream version 7.5.0
      adds  54de19e   Imported Upstream version 7.5.0
       new  8d1fe45   Merge branch 'upstream' into dfsg_clean
       new  2e38f55   Merge branch 'dfsg_clean'
       new  91b89c4   Don't need webkit anymore

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .hg_archival.txt                                   |    7 +-
 CMakeLists.txt                                     |    4 +-
 Changelog.md                                       |   97 +-
 Migration.md                                       |   33 +
 cmake/SearchForStuff.cmake                         |   17 +-
 cmake/gazebo_config.h.in                           |    2 +-
 debian/control                                     |    2 -
 deps/tinyobjloader/tiny_obj_loader.h               | 1613 ++++++++++++++++++++
 gazebo/common/AudioDecoder.cc                      |   21 +
 gazebo/common/CMakeLists.txt                       |    8 +
 gazebo/common/ColladaLoader.cc                     |   86 +-
 gazebo/common/CommonIface.cc                       |  181 +++
 gazebo/common/CommonIface.hh                       |   72 +
 gazebo/common/CommonIface_TEST.cc                  |  103 ++
 gazebo/common/Dem.cc                               |   36 +-
 gazebo/common/Dem_TEST.cc                          |   45 +-
 gazebo/common/HeightmapData.cc                     |  105 ++
 gazebo/common/HeightmapData.hh                     |   33 +-
 gazebo/common/HeightmapData_TEST.cc                |   97 ++
 gazebo/common/Material.cc                          |   12 +-
 gazebo/common/MeshManager.cc                       |   11 +
 gazebo/common/OBJLoader.cc                         |  178 +++
 gazebo/common/{MeshLoader.hh => OBJLoader.hh}      |   38 +-
 gazebo/common/OBJLoader_TEST.cc                    |   67 +
 gazebo/common/Video.cc                             |   21 +
 gazebo/gazebo.1.ronn                               |    6 +-
 gazebo/gui/CMakeLists.txt                          |    1 -
 gazebo/gui/GLWidget.cc                             |   11 +-
 gazebo/gui/GLWidgetPrivate.hh                      |    3 +
 gazebo/gui/HotkeyDialog.cc                         |   49 +-
 gazebo/gui/HotkeyDialog_TEST.cc                    |   73 -
 gazebo/gui/HotkeyDialog_TEST.hh                    |   32 -
 gazebo/gui/InsertModelWidget.cc                    |    7 +-
 gazebo/gui/JointControlWidget.cc                   |    3 +
 gazebo/gui/LaserVisualization_TEST.cc              |  165 ++
 gazebo/gui/LaserVisualization_TEST.hh              |   14 +-
 gazebo/gui/MainWindow.cc                           |   16 +-
 gazebo/gui/MainWindowPrivate.hh                    |    4 -
 gazebo/gui/ModelListWidget.cc                      |   52 +-
 gazebo/gui/ModelManipulator.cc                     |    5 +-
 gazebo/gui/SpaceNav.cc                             |    4 +
 gazebo/gui/TimePanel.cc                            |    2 +-
 gazebo/gui/gzclient.1.ronn                         |    6 +-
 gazebo/gui/images/arrow.png                        |  Bin 3439 -> 846 bytes
 gazebo/gui/images/box.png                          |  Bin 3499 -> 863 bytes
 gazebo/gui/images/cylinder.png                     |  Bin 3529 -> 983 bytes
 gazebo/gui/images/directionallight.png             |  Bin 3846 -> 1194 bytes
 gazebo/gui/images/end.png                          |  Bin 3241 -> 671 bytes
 gazebo/gui/images/eye.png                          |  Bin 0 -> 4357 bytes
 gazebo/gui/images/eye_collision.svg                |   69 +
 gazebo/gui/images/eye_frame.svg                    |  142 ++
 gazebo/gui/images/eye_visual.svg                   |   69 +
 gazebo/gui/images/pause.png                        |  Bin 2873 -> 333 bytes
 gazebo/gui/images/play.png                         |  Bin 3197 -> 651 bytes
 gazebo/gui/images/pointlight.png                   |  Bin 4216 -> 1507 bytes
 gazebo/gui/images/rotate.png                       |  Bin 3811 -> 941 bytes
 gazebo/gui/images/sphere.png                       |  Bin 4279 -> 1449 bytes
 gazebo/gui/images/spotlight.png                    |  Bin 4072 -> 1400 bytes
 gazebo/gui/images/translate.png                    |  Bin 3688 -> 1075 bytes
 gazebo/gui/model/CollisionConfig.cc                |   61 +-
 gazebo/gui/model/CollisionConfig.hh                |   19 +-
 gazebo/gui/model/ImportDialog.cc                   |   14 +-
 gazebo/gui/model/LinkInspector.cc                  |   93 +-
 gazebo/gui/model/LinkInspector.hh                  |   39 +
 gazebo/gui/model/LinkInspector_TEST.cc             |   14 +-
 gazebo/gui/model/ModelCreator.cc                   |   97 +-
 gazebo/gui/model/ModelCreator.hh                   |   12 +
 gazebo/gui/model/ModelCreator_TEST.cc              |    1 -
 gazebo/gui/model/ModelData.cc                      |  181 ++-
 gazebo/gui/model/ModelData.hh                      |   46 +-
 gazebo/gui/model/ModelData_TEST.cc                 |   36 +-
 gazebo/gui/model/ModelEditor.cc                    |   24 +
 gazebo/gui/model/ModelEditorPalette.cc             |    6 +-
 gazebo/gui/model/ModelEditorPrivate.hh             |    9 +
 gazebo/gui/model/VisualConfig.cc                   |   61 +-
 gazebo/gui/model/VisualConfig.hh                   |   19 +-
 gazebo/gui/resources.qrc                           |    4 +
 gazebo/gui/viewers/LaserView.cc                    |    4 +-
 gazebo/gzserver.1.ronn                             |    6 +-
 gazebo/msgs/CMakeLists.txt                         |    1 +
 gazebo/msgs/altimeter.proto                        |    1 +
 gazebo/msgs/any.proto                              |   82 +
 gazebo/msgs/axis.proto                             |    1 +
 gazebo/msgs/battery.proto                          |    1 +
 gazebo/msgs/boxgeom.proto                          |    1 +
 gazebo/msgs/camera_cmd.proto                       |    1 +
 gazebo/msgs/camera_lens.proto                      |    1 +
 gazebo/msgs/camerasensor.proto                     |    1 +
 gazebo/msgs/cessna.proto                           |    1 +
 gazebo/msgs/collision.proto                        |    1 +
 gazebo/msgs/color.proto                            |    1 +
 gazebo/msgs/contact.proto                          |    1 +
 gazebo/msgs/contacts.proto                         |    1 +
 gazebo/msgs/contactsensor.proto                    |    1 +
 gazebo/msgs/cylindergeom.proto                     |    1 +
 gazebo/msgs/diagnostics.proto                      |    1 +
 gazebo/msgs/distortion.proto                       |    1 +
 gazebo/msgs/factory.proto                          |    1 +
 gazebo/msgs/fluid.proto                            |    1 +
 gazebo/msgs/fog.proto                              |    1 +
 gazebo/msgs/friction.proto                         |    1 +
 gazebo/msgs/geometry.proto                         |    1 +
 gazebo/msgs/gps.proto                              |    1 +
 gazebo/msgs/gui.proto                              |    1 +
 gazebo/msgs/gui_camera.proto                       |    1 +
 gazebo/msgs/gz_string.proto                        |    1 +
 gazebo/msgs/gz_string_v.proto                      |    1 +
 gazebo/msgs/header.proto                           |    1 +
 gazebo/msgs/heightmapgeom.proto                    |    4 +
 gazebo/msgs/hydra.proto                            |    1 +
 gazebo/msgs/image.proto                            |    1 +
 gazebo/msgs/image_stamped.proto                    |    1 +
 gazebo/msgs/imagegeom.proto                        |    1 +
 gazebo/msgs/images_stamped.proto                   |    1 +
 gazebo/msgs/imu.proto                              |    1 +
 gazebo/msgs/inertial.proto                         |    1 +
 gazebo/msgs/int.proto                              |    1 +
 gazebo/msgs/joint.proto                            |    1 +
 gazebo/msgs/joint_animation.proto                  |    1 +
 gazebo/msgs/joint_cmd.proto                        |    1 +
 gazebo/msgs/joint_wrench.proto                     |    1 +
 gazebo/msgs/joint_wrench_stamped.proto             |    1 +
 gazebo/msgs/joystick.proto                         |    1 +
 gazebo/msgs/laserscan.proto                        |    1 +
 gazebo/msgs/laserscan_stamped.proto                |    1 +
 gazebo/msgs/light.proto                            |    1 +
 gazebo/msgs/link.proto                             |    1 +
 gazebo/msgs/link_data.proto                        |    1 +
 gazebo/msgs/log_control.proto                      |    1 +
 gazebo/msgs/log_playback_control.proto             |    1 +
 gazebo/msgs/log_playback_stats.proto               |    1 +
 gazebo/msgs/log_status.proto                       |    1 +
 gazebo/msgs/logical_camera_image.proto             |    1 +
 gazebo/msgs/logical_camera_sensor.proto            |    1 +
 gazebo/msgs/magnetometer.proto                     |    1 +
 gazebo/msgs/material.proto                         |    1 +
 gazebo/msgs/meshgeom.proto                         |    1 +
 gazebo/msgs/model.proto                            |    1 +
 gazebo/msgs/model_configuration.proto              |    1 +
 gazebo/msgs/model_v.proto                          |    1 +
 gazebo/msgs/msgs.cc                                |  196 ++-
 gazebo/msgs/msgs.hh                                |  102 +-
 gazebo/msgs/msgs_TEST.cc                           |  272 +++-
 gazebo/msgs/packet.proto                           |    1 +
 gazebo/msgs/physics.proto                          |    1 +
 gazebo/msgs/pid.proto                              |    1 +
 gazebo/msgs/planegeom.proto                        |    1 +
 gazebo/msgs/plugin.proto                           |    1 +
 gazebo/msgs/pointcloud.proto                       |    1 +
 gazebo/msgs/polylinegeom.proto                     |    1 +
 gazebo/msgs/pose.proto                             |    1 +
 gazebo/msgs/pose_animation.proto                   |    1 +
 gazebo/msgs/pose_stamped.proto                     |    1 +
 gazebo/msgs/pose_trajectory.proto                  |    1 +
 gazebo/msgs/pose_v.proto                           |    1 +
 gazebo/msgs/poses_stamped.proto                    |    1 +
 gazebo/msgs/projector.proto                        |    1 +
 gazebo/msgs/propagation_grid.proto                 |    1 +
 gazebo/msgs/propagation_particle.proto             |    1 +
 gazebo/msgs/publish.proto                          |    1 +
 gazebo/msgs/publishers.proto                       |    1 +
 gazebo/msgs/quaternion.proto                       |    1 +
 gazebo/msgs/raysensor.proto                        |    1 +
 gazebo/msgs/request.proto                          |    1 +
 gazebo/msgs/response.proto                         |    1 +
 gazebo/msgs/rest_login.proto                       |    1 +
 gazebo/msgs/rest_logout.proto                      |    1 +
 gazebo/msgs/rest_post.proto                        |    1 +
 gazebo/msgs/rest_response.proto                    |    1 +
 gazebo/msgs/road.proto                             |    1 +
 gazebo/msgs/scene.proto                            |    1 +
 gazebo/msgs/selection.proto                        |    1 +
 gazebo/msgs/sensor.proto                           |    1 +
 gazebo/msgs/server_control.proto                   |    1 +
 gazebo/msgs/shadows.proto                          |    1 +
 gazebo/msgs/sim_event.proto                        |    1 +
 gazebo/msgs/sky.proto                              |    1 +
 gazebo/msgs/sonar.proto                            |    1 +
 gazebo/msgs/sonar_stamped.proto                    |    1 +
 gazebo/msgs/spheregeom.proto                       |    1 +
 gazebo/msgs/spherical_coordinates.proto            |    1 +
 gazebo/msgs/subscribe.proto                        |    1 +
 gazebo/msgs/surface.proto                          |    1 +
 gazebo/msgs/tactile.proto                          |    1 +
 gazebo/msgs/test.proto                             |    1 +
 gazebo/msgs/time.proto                             |    1 +
 gazebo/msgs/topic_info.proto                       |    1 +
 gazebo/msgs/track_visual.proto                     |    1 +
 gazebo/msgs/undo_redo.proto                        |    1 +
 gazebo/msgs/user_cmd.proto                         |    1 +
 gazebo/msgs/user_cmd_stats.proto                   |    1 +
 gazebo/msgs/vector2d.proto                         |    1 +
 gazebo/msgs/vector3d.proto                         |    1 +
 gazebo/msgs/visual.proto                           |    3 +-
 gazebo/msgs/wireless_node.proto                    |    1 +
 gazebo/msgs/wireless_nodes.proto                   |    1 +
 gazebo/msgs/world_control.proto                    |    1 +
 gazebo/msgs/world_modify.proto                     |    1 +
 gazebo/msgs/world_reset.proto                      |    1 +
 gazebo/msgs/world_stats.proto                      |    1 +
 gazebo/msgs/wrench.proto                           |    1 +
 gazebo/msgs/wrench_stamped.proto                   |    1 +
 gazebo/physics/CMakeLists.txt                      |    1 +
 gazebo/physics/ContactManager.cc                   |    6 +-
 gazebo/physics/HeightmapShape.cc                   |  204 ++-
 gazebo/physics/HeightmapShape.hh                   |   20 +-
 gazebo/physics/JointController.cc                  |   11 +
 gazebo/physics/JointController.hh                  |    4 +
 gazebo/physics/Model.cc                            |   37 +
 gazebo/physics/Model.hh                            |   10 +-
 gazebo/physics/UserCmdManager.cc                   |    3 +-
 gazebo/physics/bullet/BulletCollision.cc           |    4 +-
 gazebo/physics/ode/ODECollision.cc                 |    6 +-
 gazebo/physics/ode/ODEHeightmapShape.cc            |    3 +-
 gazebo/physics/ode/ODEPhysics.cc                   |   19 +
 gazebo/physics/ode/ODEPhysics_TEST.cc              |   20 +
 gazebo/rendering/CMakeLists.txt                    |    2 +
 gazebo/rendering/Camera.cc                         |   26 +-
 gazebo/rendering/Heightmap.cc                      |  385 ++++-
 gazebo/rendering/Heightmap.hh                      |   14 +
 gazebo/rendering/HeightmapPrivate.hh               |   86 +-
 gazebo/rendering/Heightmap_TEST.cc                 |   61 +-
 gazebo/rendering/InertiaVisual.cc                  |   68 +-
 gazebo/rendering/InertiaVisual_TEST.cc             |  140 ++
 gazebo/rendering/JointVisual.cc                    |   17 +-
 gazebo/rendering/LaserVisual.cc                    |  110 +-
 gazebo/rendering/LaserVisualPrivate.hh             |   15 +-
 gazebo/rendering/LinkFrameVisual.cc                |   29 +-
 gazebo/rendering/LinkFrameVisual.hh                |    7 +-
 gazebo/rendering/Material.cc                       |    3 +
 gazebo/rendering/RenderEngine.cc                   |   39 +-
 gazebo/rendering/RenderEngine.hh                   |    5 +
 gazebo/rendering/RenderEnginePrivate.hh            |    3 +
 .../rendering/RenderEngine_TEST.cc                 |   36 +-
 gazebo/rendering/Scene.cc                          |  217 +--
 gazebo/rendering/Scene.hh                          |    4 +
 gazebo/rendering/Scene_TEST.cc                     |  265 ++--
 gazebo/rendering/Visual.cc                         |  233 ++-
 gazebo/rendering/Visual.hh                         |   16 +
 gazebo/rendering/VisualPrivate.hh                  |   11 +
 gazebo/rendering/Visual_TEST.cc                    |   84 +-
 gazebo/rendering/WideAngleCamera.cc                |   35 +
 gazebo/rendering/WideAngleCamera.hh                |    8 +
 gazebo/sensors/ContactSensor.cc                    |   10 +-
 gazebo/sensors/ContactSensorPrivate.hh             |    3 +
 gazebo/sensors/ImuSensor.cc                        |   21 +-
 gazebo/sensors/ImuSensor.hh                        |   18 +-
 gazebo/sensors/ImuSensorPrivate.hh                 |    2 +-
 gazebo/sensors/SensorTypes.hh                      |    5 +
 gazebo/test/ServerFixture.cc                       |   72 +-
 gazebo/test/ServerFixture.hh                       |   40 +
 gazebo/util/LogPlay.cc                             |    4 +-
 media/materials/scripts/gazebo.material            |   21 +
 media/materials/textures/bricks.png                |  Bin 2816159 -> 1942501 bytes
 media/materials/textures/projection_filter.png     |  Bin 2845 -> 308 bytes
 media/skyx/Clouds.png                              |  Bin 374778 -> 281706 bytes
 media/skyx/CloudsNormal.png                        |  Bin 714782 -> 770150 bytes
 media/skyx/CloudsTile.png                          |  Bin 325718 -> 255076 bytes
 media/skyx/SkyX_Moon.png                           |  Bin 53939 -> 35214 bytes
 plugins/BlinkVisualPlugin.cc                       |  207 +++
 plugins/BlinkVisualPlugin.hh                       |   74 +
 plugins/CMakeLists.txt                             |    3 +
 plugins/HarnessPlugin.cc                           |   75 +-
 plugins/KeyboardGUIPlugin.cc                       |  105 ++
 plugins/KeyboardGUIPlugin.hh                       |   62 +
 plugins/KeysToJointsPlugin.cc                      |  134 ++
 plugins/KeysToJointsPlugin.hh                      |  135 ++
 plugins/events/SimEventsPlugin.cc                  |   10 +-
 test/data/box.mtl                                  |   11 +
 test/data/box.obj                                  |   26 +
 test/data/dem_unfinished.tif                       |  Bin 0 -> 5144 bytes
 test/integration/CMakeLists.txt                    |    4 +
 .../integration/collada_visualization.cc           |   37 +-
 .../integration/collada_visualization.hh           |   13 +-
 test/integration/contact_sensor.cc                 |  127 ++
 test/integration/harness.cc                        |  308 ++++
 test/integration/heightmap.cc                      |  193 +++
 test/integration/imu.cc                            |   16 +-
 test/integration/joint_revolute.cc                 |    4 +
 test/integration/keys_to_joints.cc                 |  302 ++++
 test/integration/model_editor.cc                   |  233 ++-
 test/integration/model_editor.hh                   |    9 +
 test/integration/physics_friction.cc               |    4 +
 test/integration/wideanglecamera_sensor.cc         |  115 ++
 test/media/materials/textures/dem_neg.tif          |  Bin 0 -> 4987 bytes
 test/media/models/multiple_texture_coordinates.dae |   90 ++
 test/worlds/dem_neg.world                          |   51 +
 test/worlds/heightmap_material.world               |   37 +
 ...a_heightmap.world => heightmap_no_visual.world} |    9 +-
 test/worlds/inertia_rotations.world                |  382 +++++
 test/worlds/inertia_rotations.world.erb            |   89 ++
 test/worlds/keys_to_joints.world                   |  362 +++++
 ..._lines_test.world => laser_deadzone_test.world} |   29 +-
 test/worlds/laser_hit_test.world                   |   57 +
 ...ser_lines_test.world => laser_nohit_test.world} |   29 +-
 ...rld => multiple_texture_coordinates_test.world} |   24 +-
 tools/CMakeLists.txt                               |    2 +-
 tools/code_check.sh                                |    2 +-
 tools/gz_TEST.cc                                   |   63 +-
 tools/make_ronn.py                                 |    8 +-
 worlds/blink_visual.world                          |  162 ++
 worlds/simple_arm_teleop.world                     |   50 +
 302 files changed, 10072 insertions(+), 1188 deletions(-)
 create mode 100644 deps/tinyobjloader/tiny_obj_loader.h
 create mode 100644 gazebo/common/HeightmapData.cc
 create mode 100644 gazebo/common/HeightmapData_TEST.cc
 create mode 100644 gazebo/common/OBJLoader.cc
 copy gazebo/common/{MeshLoader.hh => OBJLoader.hh} (51%)
 create mode 100644 gazebo/common/OBJLoader_TEST.cc
 delete mode 100644 gazebo/gui/HotkeyDialog_TEST.cc
 delete mode 100644 gazebo/gui/HotkeyDialog_TEST.hh
 create mode 100644 gazebo/gui/images/eye.png
 create mode 100644 gazebo/gui/images/eye_collision.svg
 create mode 100644 gazebo/gui/images/eye_frame.svg
 create mode 100644 gazebo/gui/images/eye_visual.svg
 create mode 100644 gazebo/msgs/any.proto
 create mode 100644 gazebo/rendering/InertiaVisual_TEST.cc
 copy test/regression/846_typo_in_camera.cc => gazebo/rendering/RenderEngine_TEST.cc (58%)
 create mode 100644 plugins/BlinkVisualPlugin.cc
 create mode 100644 plugins/BlinkVisualPlugin.hh
 create mode 100644 plugins/KeyboardGUIPlugin.cc
 create mode 100644 plugins/KeyboardGUIPlugin.hh
 create mode 100644 plugins/KeysToJointsPlugin.cc
 create mode 100644 plugins/KeysToJointsPlugin.hh
 create mode 100644 test/data/box.mtl
 create mode 100644 test/data/box.obj
 create mode 100644 test/data/dem_unfinished.tif
 copy gazebo/gui/SplashScreen_TEST.cc => test/integration/collada_visualization.cc (63%)
 copy gazebo/gui/ModelManipulator_TEST.hh => test/integration/collada_visualization.hh (66%)
 create mode 100644 test/integration/harness.cc
 create mode 100644 test/integration/keys_to_joints.cc
 create mode 100644 test/integration/wideanglecamera_sensor.cc
 create mode 100644 test/media/materials/textures/dem_neg.tif
 create mode 100644 test/media/models/multiple_texture_coordinates.dae
 create mode 100644 test/worlds/dem_neg.world
 create mode 100644 test/worlds/heightmap_material.world
 copy test/worlds/{white_alpha_heightmap.world => heightmap_no_visual.world} (62%)
 create mode 100644 test/worlds/inertia_rotations.world
 create mode 100644 test/worlds/inertia_rotations.world.erb
 create mode 100644 test/worlds/keys_to_joints.world
 copy test/worlds/{laser_lines_test.world => laser_deadzone_test.world} (63%)
 create mode 100644 test/worlds/laser_hit_test.world
 copy test/worlds/{laser_lines_test.world => laser_nohit_test.world} (63%)
 copy test/worlds/{ortho_box.world => multiple_texture_coordinates_test.world} (52%)
 create mode 100644 worlds/blink_visual.world
 create mode 100644 worlds/simple_arm_teleop.world

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gazebo.git



More information about the debian-science-commits mailing list