[gazebo] 01/02: Unneded files leaved by the merge
Jose Luis Rivero
jrivero-guest at moszumanska.debian.org
Mon Feb 2 16:46:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
jrivero-guest pushed a commit to branch dfsg_clean
in repository gazebo.
commit 5e8a0318e44c1a86e5a32616412a1278300f63ca
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date: Mon Feb 2 17:45:29 2015 +0100
Unneded files leaved by the merge
---
README | 14 ---
examples/plugins/factory/CMakeLists.txt | 8 --
examples/plugins/hello_world/CMakeLists.txt | 4 -
examples/plugins/model_push/CMakeLists.txt | 4 -
examples/plugins/world_edit/CMakeLists.txt | 4 -
gazebo/Server.cc | 2 -
gazebo/gazebo.cc | 152 ---------------------------
gazebo/gui/ModelListWidget.cc | 4 -
gazebo/gui/building/BuildingEditorPalette.cc | 14 ---
gazebo/physics/Actor.cc | 2 -
gazebo/physics/Base.cc | 6 --
gazebo/physics/Joint.cc | 4 +-
gazebo/physics/JointController.cc | 3 -
gazebo/physics/JointController.hh | 4 -
gazebo/physics/World.cc | 25 -----
gazebo/physics/World.hh | 5 -
gazebo/physics/bullet/BulletJoint.cc | 52 ---------
gazebo/physics/ode/ODEJoint.cc | 18 ----
gazebo/physics/ode/ODEJoint_TEST.cc | 5 -
gazebo/rendering/Camera.cc | 2 +-
gazebo/rendering/Camera.hh | 7 --
gazebo/rendering/GUIOverlayPrivate.hh | 68 ------------
gazebo/rendering/JointVisual.cc | 3 +-
gazebo/rendering/Scene.cc | 15 ---
gazebo/rendering/Scene.hh | 2 -
gazebo/rendering/Visual.cc | 1 -
gazebo/sensors/Sensor.cc | 7 --
gazebo/sensors/SensorManager.hh | 5 -
gazebo/sensors/SensorsIface.cc | 5 +-
gazebo/sensors/SensorsIface.hh | 6 --
gazebo/transport/TopicManager.cc | 1 -
tools/gzfactory.1.ronn | 52 ---------
tools/gzlog.1.ronn | 49 ---------
tools/gzprop.1.ronn | 27 -----
tools/gzsdf.1.ronn | 37 -------
tools/gzstats.1.ronn | 31 ------
tools/gztopic.1.ronn | 46 --------
worlds/deprecated_worlds/actor.world | 25 -----
38 files changed, 4 insertions(+), 715 deletions(-)
diff --git a/README b/README
index 5a9d400..ed0392c 100644
--- a/README
+++ b/README
@@ -32,20 +32,6 @@ Gazebo cmake parameters available at configuring time:
Headless machines or machines with the screen turned off should set this to
False
-Gazebo cmake parameters available at configuring time:
- - USE_LOW_MEMORY_TEST (bool) [default False]
- Use reduced version of tests which need less quantity of RAM memory
- available.
- - FORCE_GRAPHIC_TESTS_COMPILATION (bool) [default False]
- Ignore system checks to look for graphic and acceleration support and
- compile all the test suite.
- - ENABLE_TESTS_COMPILATION (bool) [default True]
- Enabled or disable the test suite compilation.
- - ENABLE_SCREEN_TESTS (bool) [default True]
- Enable or disable tests that need screen rendering to run properly.
- Headless machines or machines with the screen turned off should set this to
- False
-
Uninstallation
--------------
Read the uninstallation instructions (http://gazebosim.org/uninstall)
diff --git a/examples/plugins/factory/CMakeLists.txt b/examples/plugins/factory/CMakeLists.txt
index 46c9550..9578742 100644
--- a/examples/plugins/factory/CMakeLists.txt
+++ b/examples/plugins/factory/CMakeLists.txt
@@ -1,13 +1,5 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-find_package(Boost REQUIRED COMPONENTS system)
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
-
-find_package(Protobuf REQUIRED)
-include_directories(${PROTOBUF_INCLUDE_DIRS})
-link_directories(${PROTUBUF_LIBRARY_DIRS})
-
include (FindPkgConfig)
if (PKG_CONFIG_FOUND)
pkg_check_modules(GAZEBO gazebo)
diff --git a/examples/plugins/hello_world/CMakeLists.txt b/examples/plugins/hello_world/CMakeLists.txt
index 249172a..d7be4f1 100644
--- a/examples/plugins/hello_world/CMakeLists.txt
+++ b/examples/plugins/hello_world/CMakeLists.txt
@@ -1,9 +1,5 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-find_package(Boost REQUIRED COMPONENTS system)
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
-
include (FindPkgConfig)
if (PKG_CONFIG_FOUND)
pkg_check_modules(GAZEBO gazebo)
diff --git a/examples/plugins/model_push/CMakeLists.txt b/examples/plugins/model_push/CMakeLists.txt
index aeb4145..c211177 100644
--- a/examples/plugins/model_push/CMakeLists.txt
+++ b/examples/plugins/model_push/CMakeLists.txt
@@ -1,9 +1,5 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-find_package(Boost REQUIRED COMPONENTS system)
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
-
include (FindPkgConfig)
if (PKG_CONFIG_FOUND)
pkg_check_modules(GAZEBO gazebo)
diff --git a/examples/plugins/world_edit/CMakeLists.txt b/examples/plugins/world_edit/CMakeLists.txt
index b765c81..34fc043 100644
--- a/examples/plugins/world_edit/CMakeLists.txt
+++ b/examples/plugins/world_edit/CMakeLists.txt
@@ -1,9 +1,5 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-find_package(Boost REQUIRED COMPONENTS system)
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
-
include (FindPkgConfig)
if (PKG_CONFIG_FOUND)
pkg_check_modules(GAZEBO gazebo)
diff --git a/gazebo/Server.cc b/gazebo/Server.cc
index 2f31ecf..4c12d7a 100644
--- a/gazebo/Server.cc
+++ b/gazebo/Server.cc
@@ -22,8 +22,6 @@
#include <sdf/sdf.hh>
-#include <sdf/sdf.hh>
-
#include "gazebo/gazebo.hh"
#include "gazebo/transport/transport.hh"
diff --git a/gazebo/gazebo.cc b/gazebo/gazebo.cc
index 91f5c6c..c6269a0 100644
--- a/gazebo/gazebo.cc
+++ b/gazebo/gazebo.cc
@@ -93,12 +93,6 @@ void gazebo::printVersion()
/////////////////////////////////////////////////
void gazebo::addPlugin(const std::string &_filename)
{
- gazebo::addPlugin(_filename);
-}
-
-/////////////////////////////////////////////////
-void gazebo::addPlugin(const std::string &_filename)
-{
if (_filename.empty())
return;
gazebo::SystemPluginPtr plugin =
@@ -294,149 +288,3 @@ void gazebo::runWorld(gazebo::physics::WorldPtr _world,
else
_world->RunBlocking(_iterations);
}
-
-/////////////////////////////////////////////////
-bool gazebo::setupServer(int _argc, char **_argv)
-{
- std::string host = "";
- unsigned int port = 0;
-
- gazebo::transport::get_master_uri(host, port);
-
- g_master = new gazebo::Master();
- g_master->Init(port);
- g_master->RunThread();
-
- if (!setup(_argc, _argv))
- {
- gzerr << "Unable to setup Gazebo\n";
- return false;
- }
-
- if (!sensors::load())
- {
- gzerr << "Unable to load sensors\n";
- return false;
- }
-
- if (!gazebo::physics::load())
- {
- gzerr << "Unable to initialize physics.\n";
- return false;
- }
-
- if (!sensors::init())
- {
- gzerr << "Unable to initialize sensors\n";
- return false;
- }
-
- return true;
-}
-
-/////////////////////////////////////////////////
-bool gazebo::setupClient(int _argc, char **_argv)
-{
- if (!setup(_argc, _argv))
- {
- gzerr << "Unable to setup Gazebo\n";
- return false;
- }
-
- common::Time waitTime(1, 0);
- int waitCount = 0;
- int maxWaitCount = 10;
-
- // Wait for namespaces.
- while (!gazebo::transport::waitForNamespaces(waitTime) &&
- (waitCount++) < maxWaitCount)
- {
- gzwarn << "Waited " << waitTime.Double() << "seconds for namespaces.\n";
- }
-
- if (waitCount >= maxWaitCount)
- {
- gzerr << "Waited " << (waitTime * waitCount).Double()
- << " seconds for namespaces. Giving up.\n";
- }
-
- return true;
-}
-
-/////////////////////////////////////////////////
-bool gazebo::shutdown()
-{
- gazebo::physics::stop_worlds();
-
- gazebo::sensors::stop();
-
- // Stop log recording
- util::LogRecord::Instance()->Stop();
-
- // Stop transport
- gazebo::transport::stop();
-
- // Make sure to shut everything down.
- boost::mutex::scoped_lock lock(fini_mutex);
- util::LogRecord::Instance()->Fini();
- g_plugins.clear();
- gazebo::transport::fini();
-
- gazebo::physics::fini();
-
- gazebo::sensors::fini();
-
- delete g_master;
- g_master = NULL;
-
- // Cleanup model database.
- common::ModelDatabase::Instance()->Fini();
-
- return true;
-}
-
-/////////////////////////////////////////////////
-gazebo::physics::WorldPtr gazebo::loadWorld(const std::string &_worldFile)
-{
- gazebo::physics::WorldPtr world;
-
- // Load the world file
- sdf::SDFPtr sdf(new sdf::SDF);
- if (!sdf::init(sdf))
- {
- gzerr << "Unable to initialize sdf\n";
- return world;
- }
-
- // Find the file.
- std::string fullFile = gazebo::common::find_file(_worldFile);
-
- if (fullFile.empty())
- {
- gzerr << "Unable to find file[" << _worldFile << "]\n";
- return world;
- }
-
- if (!sdf::readFile(fullFile, sdf))
- {
- gzerr << "Unable to read sdf file[" << "empty.world" << "]\n";
- return world;
- }
-
- world = gazebo::physics::create_world();
- gazebo::physics::load_world(world, sdf->root->GetElement("world"));
-
- gazebo::physics::init_world(world);
-
- return world;
-}
-
-/////////////////////////////////////////////////
-void gazebo::runWorld(gazebo::physics::WorldPtr _world,
- unsigned int _iterations)
-{
- if (!_world)
- gzerr << "World pointer is NULL\n";
- else
- _world->RunBlocking(_iterations);
-}
diff --git a/gazebo/gui/ModelListWidget.cc b/gazebo/gui/ModelListWidget.cc
index bd043a2..c10c6bb 100644
--- a/gazebo/gui/ModelListWidget.cc
+++ b/gazebo/gui/ModelListWidget.cc
@@ -1564,10 +1564,6 @@ void ModelListWidget::FillPropertyTree(const msgs::Link &_msg,
// in place to verify the functionality
inertialItem->setEnabled(false);
- // TODO: disable setting inertial properties until there are tests
- // in place to verify the functionality
- inertialItem->setEnabled(false);
-
// Inertial::Mass
item = this->variantManager->addProperty(QVariant::Double, tr("mass"));
if (_msg.inertial().has_mass())
diff --git a/gazebo/gui/building/BuildingEditorPalette.cc b/gazebo/gui/building/BuildingEditorPalette.cc
index 34f9a30..9143cb8 100644
--- a/gazebo/gui/building/BuildingEditorPalette.cc
+++ b/gazebo/gui/building/BuildingEditorPalette.cc
@@ -397,17 +397,3 @@ void BuildingEditorPalette::mousePressEvent(QMouseEvent * /*_event*/)
// Cancel draw mode
gui::editor::Events::createBuildingEditorItem(std::string());
}
-
-/////////////////////////////////////////////////
-void BuildingEditorPalette::OnCreateEditorItem(const std::string &_type)
-{
- if (_type.empty())
- {
- // Uncheck all the buttons
- for (std::list<QPushButton *>::iterator iter = this->brushes.begin();
- iter != this->brushes.end(); ++iter)
- {
- (*iter)->setChecked(false);
- }
- }
-}
diff --git a/gazebo/physics/Actor.cc b/gazebo/physics/Actor.cc
index 2a3fe01..fa68b07 100644
--- a/gazebo/physics/Actor.cc
+++ b/gazebo/physics/Actor.cc
@@ -117,8 +117,6 @@ void Actor::Load(sdf::ElementPtr _sdf)
this->visualName = actorLinkName + "::"
+ actorName + "_visual";
- this->visualId = gazebo::physics::getUniqueId();
-
for (NodeMapIter iter = nodes.begin(); iter != nodes.end(); ++iter)
{
SkeletonNode* bone = iter->second;
diff --git a/gazebo/physics/Base.cc b/gazebo/physics/Base.cc
index 10ed015..736bd82 100644
--- a/gazebo/physics/Base.cc
+++ b/gazebo/physics/Base.cc
@@ -303,12 +303,6 @@ std::string Base::GetScopedName(bool _prependWorldName) const
//////////////////////////////////////////////////
void Base::ComputeScopedName()
{
- return this->scopedName;
-}
-
-//////////////////////////////////////////////////
-void Base::ComputeScopedName()
-{
BasePtr p = this->parent;
this->scopedName = this->GetName();
diff --git a/gazebo/physics/Joint.cc b/gazebo/physics/Joint.cc
index 7439c9e..7fe37b3 100644
--- a/gazebo/physics/Joint.cc
+++ b/gazebo/physics/Joint.cc
@@ -1271,9 +1271,7 @@ bool Joint::FindAllConnectedLinks(const LinkPtr &_originalParentLink,
_connectedLinks.clear();
return false;
}
-
- // Legacy support for specifying axis in parent model frame (#494)
- if (this->axisParentModelFrame[_index])
+ else
{
// add this->childLink to the list of descendent child links (should be
// the very first one added).
diff --git a/gazebo/physics/JointController.cc b/gazebo/physics/JointController.cc
index f9b6851..d676509 100644
--- a/gazebo/physics/JointController.cc
+++ b/gazebo/physics/JointController.cc
@@ -300,9 +300,6 @@ void JointController::SetJointPosition(const std::string & _name,
void JointController::SetJointPositions(
const std::map<std::string, double> & _jointPositions)
{
- gzwarn << "Setting joint positions is disabled, see issue #1138\n";
- return;
-
// go through all joints in this model and update each one
// for each joint update, recursively update all children
std::map<std::string, JointPtr>::iterator iter;
diff --git a/gazebo/physics/JointController.hh b/gazebo/physics/JointController.hh
index ad61eb3..05f19ea 100644
--- a/gazebo/physics/JointController.hh
+++ b/gazebo/physics/JointController.hh
@@ -60,15 +60,11 @@ namespace gazebo
public: void Reset();
/// \brief Set the positions of a Joint by name.
- /// Warning: This function is disabled since collisions are not
- /// updated correctly. See issue #1138
/// \sa JointController::SetJointPosition(JointPtr, double)
public: void SetJointPosition(
const std::string &_name, double _position, int _index = 0);
/// \brief Set the positions of a set of Joint's.
- /// Warning: This function is disabled since collisions are not
- /// updated correctly. See issue #1138
/// \sa JointController::SetJointPosition(JointPtr, double)
public: void SetJointPositions(
const std::map<std::string, double> &_jointPositions);
diff --git a/gazebo/physics/World.cc b/gazebo/physics/World.cc
index feca0ec..fd32e05 100644
--- a/gazebo/physics/World.cc
+++ b/gazebo/physics/World.cc
@@ -632,12 +632,6 @@ void World::Step()
//////////////////////////////////////////////////
void World::Step(unsigned int _steps)
{
- this->Step(_steps);
-}
-
-//////////////////////////////////////////////////
-void World::Step(unsigned int _steps)
-{
if (!this->IsPaused())
{
gzwarn << "Calling World::Step(steps) while world is not paused\n";
@@ -828,12 +822,6 @@ common::SphericalCoordinatesPtr World::GetSphericalCoordinates() const
}
//////////////////////////////////////////////////
-common::SphericalCoordinatesPtr World::GetSphericalCoordinates() const
-{
- return this->sphericalCoordinates;
-}
-
-//////////////////////////////////////////////////
BasePtr World::GetByName(const std::string &_name)
{
if (this->dataPtr->rootElement)
@@ -1023,9 +1011,6 @@ void World::Reset()
math::Rand::SetSeed(math::Rand::GetSeed());
this->dataPtr->physicsEngine->SetSeed(math::Rand::GetSeed());
- math::Rand::SetSeed(math::Rand::GetSeed());
- this->physicsEngine->SetSeed(math::Rand::GetSeed());
-
this->ResetTime();
this->ResetEntities(Base::BASE);
for (std::vector<WorldPluginPtr>::iterator iter =
@@ -1477,15 +1462,6 @@ void World::ProcessRequestMsgs()
sphereCoordMsg.SerializeToString(serializedData);
response.set_type(sphereCoordMsg.GetTypeName());
}
- else if ((*iter).request() == "spherical_coordinates_info")
- {
- msgs::SphericalCoordinates sphereCoordMsg;
- msgs::Set(&sphereCoordMsg, *(this->sphericalCoordinates));
-
- std::string *serializedData = response.mutable_serialized_data();
- sphereCoordMsg.SerializeToString(serializedData);
- response.set_type(sphereCoordMsg.GetTypeName());
- }
else
send = false;
@@ -2100,7 +2076,6 @@ void World::RemoveModel(const std::string &_name)
}
}
}
-}
{
boost::recursive_mutex::scoped_lock lock(
diff --git a/gazebo/physics/World.hh b/gazebo/physics/World.hh
index 7fe7be5..bdf0126 100644
--- a/gazebo/physics/World.hh
+++ b/gazebo/physics/World.hh
@@ -431,11 +431,6 @@ namespace gazebo
/// Must only be called from the World::ProcessMessages function.
private: void ProcessFactoryMsgs();
- /// \brief Remove a model from the cached list of models.
- /// This does not delete the model.
- /// \param[in] _name Name of the model to remove.
- private: void RemoveModel(const std::string &_name);
-
/// \brief Process all received model messages.
/// Must only be called from the World::ProcessMessages function.
private: void ProcessModelMsgs();
diff --git a/gazebo/physics/bullet/BulletJoint.cc b/gazebo/physics/bullet/BulletJoint.cc
index 7192a4e..6ca150f 100644
--- a/gazebo/physics/bullet/BulletJoint.cc
+++ b/gazebo/physics/bullet/BulletJoint.cc
@@ -570,55 +570,3 @@ bool BulletJoint::SetPosition(unsigned int _index, double _position)
{
return Joint::SetPositionMaximal(_index, _position);
}
-
-//////////////////////////////////////////////////
-void BulletJoint::SetAttribute(Attribute, unsigned int /*_index*/,
- double /*_value*/)
-{
- gzdbg << "Not implement in Bullet\n";
-}
-
-//////////////////////////////////////////////////
-void BulletJoint::SetAttribute(const std::string &_key,
- unsigned int _index,
- const boost::any &_value)
-{
- this->SetParam(_key, _index, _value);
-}
-
-//////////////////////////////////////////////////
-bool BulletJoint::SetParam(const std::string &/*_key*/,
- unsigned int /*_index*/,
- const boost::any &/*_value*/)
-{
- gzdbg << "Not implement in Bullet\n";
- return false;
-}
-
-//////////////////////////////////////////////////
-double BulletJoint::GetParam(const std::string &/*_key*/,
- unsigned int /*_index*/)
-{
- gzdbg << "Not implement in Bullet\n";
- return 0;
-}
-
-//////////////////////////////////////////////////
-double BulletJoint::GetAttribute(const std::string &_key,
- unsigned int _index)
-{
- return this->GetParam(_key, _index);
-}
-
-//////////////////////////////////////////////////
-math::Angle BulletJoint::GetHighStop(unsigned int _index)
-{
- return this->GetUpperLimit(_index);
-}
-
-//////////////////////////////////////////////////
-math::Angle BulletJoint::GetLowStop(unsigned int _index)
-{
- return this->GetLowerLimit(_index);
-}
-
diff --git a/gazebo/physics/ode/ODEJoint.cc b/gazebo/physics/ode/ODEJoint.cc
index 11cc0ae..a3b9521 100644
--- a/gazebo/physics/ode/ODEJoint.cc
+++ b/gazebo/physics/ode/ODEJoint.cc
@@ -625,12 +625,6 @@ double ODEJoint::GetParam(const std::string &_key, unsigned int _index)
}
//////////////////////////////////////////////////
-double ODEJoint::GetAttribute(const std::string &_key, unsigned int _index)
-{
- return this->GetParam(_key, _index);
-}
-
-//////////////////////////////////////////////////
void ODEJoint::Reset()
{
if (this->jointId)
@@ -848,18 +842,6 @@ void ODEJoint::UseImplicitSpringDamper(const bool _implicit)
//////////////////////////////////////////////////
void ODEJoint::ApplyImplicitStiffnessDamping()
{
- this->ApplyImplicitStiffnessDamping();
-}
-
-//////////////////////////////////////////////////
-bool ODEJoint::UsesImplicitSpringDamper()
-{
- return this->useImplicitSpringDamper;
-}
-
-//////////////////////////////////////////////////
-void ODEJoint::ApplyImplicitStiffnessDamping()
-{
// check if we are violating joint limits
if (this->GetAngleCount() > 2)
{
diff --git a/gazebo/physics/ode/ODEJoint_TEST.cc b/gazebo/physics/ode/ODEJoint_TEST.cc
index ba11d28..e53953b 100644
--- a/gazebo/physics/ode/ODEJoint_TEST.cc
+++ b/gazebo/physics/ode/ODEJoint_TEST.cc
@@ -84,11 +84,6 @@ TEST_F(ODEJoint_TEST, ImplicitDamping)
EXPECT_TRUE(joint->UsesImplicitSpringDamper());
}
- EXPECT_TRUE(boost::dynamic_pointer_cast<physics::ODEJoint>(joint_0)->
- UsesImplicitSpringDamper());
- EXPECT_TRUE(boost::dynamic_pointer_cast<physics::ODEJoint>(joint_1)->
- UsesImplicitSpringDamper());
-
gzdbg << "-------------------Test 1 (y)-------------------\n";
physics->SetGravity(math::Vector3(0, 10, 0));
world->Step(100);
diff --git a/gazebo/rendering/Camera.cc b/gazebo/rendering/Camera.cc
index 0edb5f8..7bb2483 100644
--- a/gazebo/rendering/Camera.cc
+++ b/gazebo/rendering/Camera.cc
@@ -272,7 +272,7 @@ void Camera::Update()
bool erase = false;
if ((*iter).request() == "track_visual")
{
- if (!this->TrackVisualImpl((*iter).data()))
+ if (this->TrackVisualImpl((*iter).data()))
erase = true;
}
else if ((*iter).request() == "attach_visual")
diff --git a/gazebo/rendering/Camera.hh b/gazebo/rendering/Camera.hh
index 48f9837..560ad6e 100644
--- a/gazebo/rendering/Camera.hh
+++ b/gazebo/rendering/Camera.hh
@@ -112,13 +112,6 @@ namespace gazebo
/// rate.
public: void Render(bool _force = false);
- /// \brief Render the camera.
- /// Called after the pre-render signal. This function will generate
- /// camera images.
- /// \param[in] _force Force camera to render. Ignore camera update
- /// rate.
- public: void Render(bool _force);
-
/// \brief Post render
///
/// Called afer the render signal.
diff --git a/gazebo/rendering/GUIOverlayPrivate.hh b/gazebo/rendering/GUIOverlayPrivate.hh
deleted file mode 100644
index 5986ea8..0000000
--- a/gazebo/rendering/GUIOverlayPrivate.hh
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2014 Open Source Robotics Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
-*/
-
-#ifndef _GUI_OVERLAY_PRIVATE_HH_
-#define _GUI_OVERLAY_PRIVATE_HH_
-
-#include <string>
-#include <vector>
-
-#include "gazebo/common/Events.hh"
-#include "gazebo/rendering/cegui.h"
-
-namespace Ogre
-{
- class RenderTarget;
-}
-
-#ifdef HAVE_CEGUI
-namespace CEGUI
-{
- class OgreRenderer;
- class Window;
-}
-#endif
-
-namespace gazebo
-{
- namespace rendering
- {
- /// \brief Private data for the GUIOverlay class
- class GUIOverlayPrivate
- {
-#ifdef HAVE_CEGUI
- /// \brief Pointer to the CEGUI ogre renderer
- public: CEGUI::OgreRenderer *guiRenderer;
-#endif
-
- /// \brief All the connections
- public: std::vector<event::ConnectionPtr> connections;
-
- /// \brief The layout file used to create gui elements
- public: std::string layoutFilename;
-
- /// \brief Used in the AttachCameraToImage function to create unique
- /// names
- public: unsigned int rttImageSetCount;
-
- /// \brief True if initialized
- public: bool initialized;
- };
- /// \}
- }
-}
-#endif
diff --git a/gazebo/rendering/JointVisual.cc b/gazebo/rendering/JointVisual.cc
index 6c541c5..1509da6 100644
--- a/gazebo/rendering/JointVisual.cc
+++ b/gazebo/rendering/JointVisual.cc
@@ -54,8 +54,7 @@ void JointVisual::Load(ConstJointPtr &_msg)
dPtr->axisVisual->Load();
this->SetPosition(msgs::Convert(_msg->pose().position()));
- this->SetRotation(this->GetRotation() *
- msgs::Convert(_msg->pose().orientation()));
+ this->SetRotation(msgs::Convert(_msg->pose().orientation()));
if (_msg->has_axis2())
{
diff --git a/gazebo/rendering/Scene.cc b/gazebo/rendering/Scene.cc
index fae929b..7a2d538 100644
--- a/gazebo/rendering/Scene.cc
+++ b/gazebo/rendering/Scene.cc
@@ -1543,21 +1543,6 @@ bool Scene::ProcessModelMsg(const msgs::Model &_msg)
this->dataPtr->visualMsgs.push_back(vm);
}
- // Set the scale of the model visual
- if (_msg.has_scale())
- {
- // update scale using a visual msg
- boost::shared_ptr<msgs::Visual> vm(new msgs::Visual);
- if (_msg.has_id())
- vm->set_id(_msg.id());
- if (_msg.has_name())
- vm->set_name(_msg.name());
- vm->mutable_scale()->set_x(_msg.scale().x());
- vm->mutable_scale()->set_y(_msg.scale().y());
- vm->mutable_scale()->set_z(_msg.scale().z());
- this->visualMsgs.push_back(vm);
- }
-
for (int j = 0; j < _msg.joint_size(); j++)
{
boost::shared_ptr<msgs::Joint> jm(new msgs::Joint(
diff --git a/gazebo/rendering/Scene.hh b/gazebo/rendering/Scene.hh
index 0e68998..9e700ad 100644
--- a/gazebo/rendering/Scene.hh
+++ b/gazebo/rendering/Scene.hh
@@ -22,8 +22,6 @@
#include <vector>
#include <boost/enable_shared_from_this.hpp>
#include <boost/shared_ptr.hpp>
-#include <boost/unordered/unordered_map.hpp>
-#include <boost/thread/recursive_mutex.hpp>
#include <sdf/sdf.hh>
diff --git a/gazebo/rendering/Visual.cc b/gazebo/rendering/Visual.cc
index 0c9c753..e3e3bc3 100644
--- a/gazebo/rendering/Visual.cc
+++ b/gazebo/rendering/Visual.cc
@@ -1421,7 +1421,6 @@ void Visual::SetHighlighted(bool _highlighted)
{
this->dataPtr->boundingBox->SetVisible(false);
}
- return false;
}
//////////////////////////////////////////////////
diff --git a/gazebo/sensors/Sensor.cc b/gazebo/sensors/Sensor.cc
index 49d9066..b3ba44a 100644
--- a/gazebo/sensors/Sensor.cc
+++ b/gazebo/sensors/Sensor.cc
@@ -144,13 +144,6 @@ void Sensor::SetParent(const std::string &_name, uint32_t _id)
}
//////////////////////////////////////////////////
-void Sensor::SetParent(const std::string &_name, uint32_t _id)
-{
- this->parentName = _name;
- this->parentId = _id;
-}
-
-//////////////////////////////////////////////////
std::string Sensor::GetParentName() const
{
return this->parentName;
diff --git a/gazebo/sensors/SensorManager.hh b/gazebo/sensors/SensorManager.hh
index e3cff57..606b0d6 100644
--- a/gazebo/sensors/SensorManager.hh
+++ b/gazebo/sensors/SensorManager.hh
@@ -117,11 +117,6 @@ namespace gazebo
/// \param[out] All the sensor types.
public: void GetSensorTypes(std::vector<std::string> &_types) const;
- /// \brief Deprecated.
- public: std::string CreateSensor(sdf::ElementPtr _elem,
- const std::string &_worldName,
- const std::string &_parentName) GAZEBO_DEPRECATED(2.0);
-
/// \brief Add a sensor from an SDF element. This function will also Load
/// and Init the sensor.
/// \param[in] _elem The SDF element that describes the sensor
diff --git a/gazebo/sensors/SensorsIface.cc b/gazebo/sensors/SensorsIface.cc
index 30b3508..470d31f 100644
--- a/gazebo/sensors/SensorsIface.cc
+++ b/gazebo/sensors/SensorsIface.cc
@@ -86,10 +86,7 @@ std::string sensors::create_sensor(sdf::ElementPtr _elem,
}
/////////////////////////////////////////////////
-std::string sensors::create_sensor(sdf::ElementPtr _elem,
- const std::string &_worldName,
- const std::string &_parentName,
- uint32_t _parentId)
+void sensors::remove_sensor(const std::string &_sensorName)
{
if (g_disable)
return;
diff --git a/gazebo/sensors/SensorsIface.hh b/gazebo/sensors/SensorsIface.hh
index 1b7f305..65ffb59 100644
--- a/gazebo/sensors/SensorsIface.hh
+++ b/gazebo/sensors/SensorsIface.hh
@@ -35,12 +35,6 @@ namespace gazebo
GAZEBO_VISIBLE
bool load();
- /// \brief Deprecated.
- GAZEBO_VISIBLE
- std::string create_sensor(sdf::ElementPtr _elem,
- const std::string &_worldName,
- const std::string &_parentName) GAZEBO_DEPRECATED(2.0);
-
/// \brief Create a sensor using SDF.
/// \param[in] _elem The SDF element that describes the sensor.
/// \param[in] _worldName Name of the world in which to create the sensor.
diff --git a/gazebo/transport/TopicManager.cc b/gazebo/transport/TopicManager.cc
index 090739a..f3ca8d4 100644
--- a/gazebo/transport/TopicManager.cc
+++ b/gazebo/transport/TopicManager.cc
@@ -180,7 +180,6 @@ void TopicManager::ProcessNodes(bool _onlyOut)
if (!this->pauseIncoming && !_onlyOut)
{
- int s = 0;
{
int s = 0;
boost::recursive_mutex::scoped_lock lock(this->nodeMutex);
diff --git a/tools/gzfactory.1.ronn b/tools/gzfactory.1.ronn
deleted file mode 100644
index 4024f81..0000000
--- a/tools/gzfactory.1.ronn
+++ /dev/null
@@ -1,52 +0,0 @@
-gzfactory -- DEPRECATED(see 'gz help model')
-=============================================
-
-## SYNOPSIS
-
-`gzfactory` <spawn|delete> [options]
-
-## DESCRIPTION
-
-Spawn or delete models into or from a running Gazebo simulation.
-
-## COMMAND ELEMENTS
-
-* **spawn**:
-Spawn new model. Must specify a SDF model file.
-* **delete**:
-Delete existing model. Must specify model name.
-
-## OPTIONS
-
-* -h, --help :
- Produce this help message.
-* -f, --sdf arg :
- SDF model file.
-* -w, --world-name arg :
- Name of Gazebo world.
-* -m, --model-name arg :
- Model name.
-* -x, --pose-x arg :
- Set model x position.
-* -y, --pose-y arg :
- Set model y position.
-* -z, --pose-z arg :
- Set model z positione.
-* -R, --pose-R arg :
- Set model roll orientation in radians.
-* -P, --pose-P arg :
- Set model pitch orientation in radians.
-* -Y, --pose-Y arg :
- Set model yaw orientation in radians.
-
-## SEE ALSO
-Example and more information about gazebo gzfactory and other command line tools can be found at:http://gazebosim.org/user_guide/started__commandlinetools.html
-
-## AUTHOR
- Open Source Robotics Foundation
-
-## COPYRIGHT
- Copyright (C) 2012-2014 Open Source Robotics Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
diff --git a/tools/gzlog.1.ronn b/tools/gzlog.1.ronn
deleted file mode 100644
index ac54a11..0000000
--- a/tools/gzlog.1.ronn
+++ /dev/null
@@ -1,49 +0,0 @@
-gzlog -- DEPRECATED(see 'gz help log')
-=============================================
-
-## SYNOPSIS
-
-`gzlog` [command] <options> [log file]
-
-## DESCRIPTION
-
-Introspect Gazebo log files through different commands.
-
-## COMMAND ELEMENTS
-
-* **help**:
-Output this help message.
-* **info**:
-Display statistical information about a log file.
-* **echo**:
-Output the contents of a log file to screen.
-* **step**:
-Step through the contents of a log file.
-
-## OPTIONS
-
-* -h, --help :
- Output this help message.
-* -r, --raw :
- Output the data from echo and step without XML formatting.
-* -s, --stamp arg :
- Add a timestamp to each line of output. Valid values are (sim,real,wall)
-* -z, --hz arg :
- Filter output to the specified Hz rate.Only valid for echo and step commands.
-* -f, --file arg :
- Path to a log file.
-* --filter arg :
- Filter output. Valid only for the echo and step commands
-
-## SEE ALSO
-Example and more information can be found at: http://gazebosim.org/wiki/Tools#Data_Log_Tool
-
-
-## AUTHOR
- Open Source Robotics Foundation
-
-## COPYRIGHT
- Copyright (C) 2012-2014 Open Source Robotics Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
diff --git a/tools/gzprop.1.ronn b/tools/gzprop.1.ronn
deleted file mode 100644
index aa31f7b..0000000
--- a/tools/gzprop.1.ronn
+++ /dev/null
@@ -1,27 +0,0 @@
-gzprop -- Package a model for thepropshop.org
-=============================================
-
-## SYNOPSIS
-
-`gzprop` <model_directory>
-
-## DESCRIPTION
-
-Package an existing model directory into a tarball suitable for upload to thepropshop.org. A working instance of Gazebo >= 3.0 is required.
-
-## OPTIONS
-
-* -h, --help :
- Output this help message.
-
-## SEE ALSO
- ThePropShop website: http://thepropshop.org
-
-## AUTHOR
- Open Source Robotics Foundation
-
-## COPYRIGHT
- Copyright (C) 2012-2015 Open Source Robotics Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
diff --git a/tools/gzsdf.1.ronn b/tools/gzsdf.1.ronn
deleted file mode 100644
index 66b0aa0..0000000
--- a/tools/gzsdf.1.ronn
+++ /dev/null
@@ -1,37 +0,0 @@
-gzsdf -- DEPRECATED(see 'gz help sdf')
-=============================================
-
-## SYNOPSIS
-
-`gzsdf` <command>
-
-## DESCRIPTION
-
-This tool provides information about SDF files.
-
-## COMMAND ELEMENTS
-
-* **describe <SDF version>**:
-Print the SDF format.
-* **convert <file>**:
-In place conversion to the latest format.
-* **doc <SDF version>**:
-Print HTML SDF.
-* **check <file> <SDF version>**:
-Check the SDF format for the given file.
-* **print <SDF version>**:
-Prints SDF, useful for debugging and as a conversion tool.
-
-## SEE ALSO
-Example and more information about gazebo gzsdf and other commandline tools can be found at: http://gazebosim.org/user_guide/started__commandlinetools.html
-
-For more information about the SDF format please read: http://gazebosim.org/sdf.html
-
-## AUTHOR
- Open Source Robotics Foundation
-
-## COPYRIGHT
- Copyright (C) 2012-2014 Open Source Robotics Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
diff --git a/tools/gzstats.1.ronn b/tools/gzstats.1.ronn
deleted file mode 100644
index 206102a..0000000
--- a/tools/gzstats.1.ronn
+++ /dev/null
@@ -1,31 +0,0 @@
-gzstats -- DEPRECATED(see 'gz help sdf')
-=============================================
-
-## SYNOPSIS
-
-`gzstats` [options]
-
-## DESCRIPTION
-
-This tool displays statistics about a running Gazebo world.
-
-## OPTIONS
-
-* -h, --help :
- Print help message.
-* -p, --plot :
- Output comma-separated values, useful for processing and plotting.
-* -w, --world-name arg :
- The Gazebo world to monitor.
-
-## SEE ALSO
-Examples and more information can be found at: http://gazebosim.org/wiki/Tools#World_Statistics
-
-## AUTHOR
- Open Source Robotics Foundation
-
-## COPYRIGHT
- Copyright (C) 2012-2014 Open Source Robotics Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
diff --git a/tools/gztopic.1.ronn b/tools/gztopic.1.ronn
deleted file mode 100644
index 23125c7..0000000
--- a/tools/gztopic.1.ronn
+++ /dev/null
@@ -1,46 +0,0 @@
-gztopic -- DEPRECATED(see 'gz help topic')
-=============================================
-
-## SYNOPSIS
-
-`gztopic` [options] <command>
-
-## DESCRIPTION
-
-List information about published topics on a Gazebo master.
-
-## COMMAND ELEMENTS
-
-* **list**:
-List all topics.
-* **info <topic>**:
-Get information about a topic.
-* **echo <topic>**:
-Output topic data to screen.
-* **view <topic>**:
-View topic data using a QT widget.
-* **hz <topic>**:
-Get publish frequency.
-* **bw <topic>**:
-Get topic bandwidth.
-* **help**:
-This help text.
-
-## OPTIONS
-
-* -h, --help :
- Output this help message.
-* -u, --unformatted :
- Output the data from echo and list without formatting.
-
-## SEE ALSO
-Examples and more information can be found at:http://gazebosim.org/wiki/Tools#Topic_Info
-
-## AUTHOR
- Open Source Robotics Foundation
-
-## COPYRIGHT
- Copyright (C) 2012-2014 Open Source Robotics Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
diff --git a/worlds/deprecated_worlds/actor.world b/worlds/deprecated_worlds/actor.world
deleted file mode 100644
index a56a730..0000000
--- a/worlds/deprecated_worlds/actor.world
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" ?>
-<sdf version="1.5">
- <world name="default">
- <include>
- <uri>model://ground_plane</uri>
- </include>
- <light type="directional" name="sun">
- <pose>0 0 100 0 0 0</pose>
- <diffuse>0.5 0.5 0.5 1</diffuse>
- <specular>0.2 0.2 0.2 1</specular>
- <attenuation>
- <range>100</range>
- <linear>0.01</linear>
- <constant>0.8</constant>
- <quadratic>0.0</quadratic>
- </attenuation>
- <direction>0.0 0.2 -8.0</direction>
- <cast_shadows>true</cast_shadows>
- </light>
- <actor name="actor">
- <static>true</static>
- <skin filename="walk.dae" scale="1.0" />
- </actor>
- </world>
-</sdf>
--
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