Skip to content

Commit

Permalink
Fold in some unrelated comment changes
Browse files Browse the repository at this point in the history
Signed-off-by: methylDragon <[email protected]>
  • Loading branch information
methylDragon committed Jun 7, 2022
1 parent cb9a194 commit 70da9cd
Show file tree
Hide file tree
Showing 17 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions include/sdf/Box.hh
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ namespace sdf
/// not been called.
public: sdf::ElementPtr Element() const;

/// \brief Get the Ignition Math representation of this Box.
/// \brief Get the Gazebo Math representation of this Box.
/// \return A const reference to an gz::math::Boxd object.
public: const gz::math::Boxd &Shape() const;

/// \brief Get a mutable Ignition Math representation of this Box.
/// \brief Get a mutable Gazebo Math representation of this Box.
/// \return A reference to an gz::math::Boxd object.
public: gz::math::Boxd &Shape();

Expand Down
4 changes: 2 additions & 2 deletions include/sdf/Capsule.hh
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ namespace sdf
/// not been called.
public: sdf::ElementPtr Element() const;

/// \brief Get the Ignition Math representation of this Capsule.
/// \brief Get the Gazebo Math representation of this Capsule.
/// \return A const reference to an gz::math::Sphered object.
public: const gz::math::Capsuled &Shape() const;

/// \brief Get a mutable Ignition Math representation of this Capsule.
/// \brief Get a mutable Gazebo Math representation of this Capsule.
/// \return A reference to an gz::math::Capsuled object.
public: gz::math::Capsuled &Shape();

Expand Down
4 changes: 2 additions & 2 deletions include/sdf/Cylinder.hh
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ namespace sdf
/// not been called.
public: sdf::ElementPtr Element() const;

/// \brief Get the Ignition Math representation of this Cylinder.
/// \brief Get the Gazebo Math representation of this Cylinder.
/// \return A const reference to an gz::math::Sphered object.
public: const gz::math::Cylinderd &Shape() const;

/// \brief Get a mutable Ignition Math representation of this Cylinder.
/// \brief Get a mutable Gazebo Math representation of this Cylinder.
/// \return A reference to an gz::math::Cylinderd object.
public: gz::math::Cylinderd &Shape();

Expand Down
4 changes: 2 additions & 2 deletions include/sdf/Ellipsoid.hh
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ namespace sdf
/// not been called.
public: sdf::ElementPtr Element() const;

/// \brief Get the Ignition Math representation of this Ellipsoid.
/// \brief Get the Gazebo Math representation of this Ellipsoid.
/// \return A const reference to an gz::math::Ellipsoidd object.
public: const gz::math::Ellipsoidd &Shape() const;

/// \brief Get a mutable Ignition Math representation of this Ellipsoid.
/// \brief Get a mutable Gazebo Math representation of this Ellipsoid.
/// \return A reference to an gz::math::Ellipsoidd object.
public: gz::math::Ellipsoidd &Shape();

Expand Down
4 changes: 2 additions & 2 deletions include/sdf/Plane.hh
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ namespace sdf
/// not been called.
public: sdf::ElementPtr Element() const;

/// \brief Get the Ignition Math representation of this Plane.
/// \brief Get the Gazebo Math representation of this Plane.
/// \return A const reference to an gz::math::Planed object.
public: const gz::math::Planed &Shape() const;

/// \brief Get a mutable Ignition Math representation of this Plane.
/// \brief Get a mutable Gazebo Math representation of this Plane.
/// \return A reference to an gz::math::Planed object.
public: gz::math::Planed &Shape();

Expand Down
4 changes: 2 additions & 2 deletions include/sdf/Sphere.hh
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ namespace sdf
/// \param[in] _radius The radius of the sphere in meters.
public: void SetRadius(const double _radius);

/// \brief Get the Ignition Math representation of this Sphere.
/// \brief Get the Gazebo Math representation of this Sphere.
/// \return A const reference to an gz::math::Sphered object.
public: const gz::math::Sphered &Shape() const;

/// \brief Get a mutable Ignition Math representation of this Sphere.
/// \brief Get a mutable Gazebo Math representation of this Sphere.
/// \return A reference to an gz::math::Sphered object.
public: gz::math::Sphered &Shape();

Expand Down
2 changes: 1 addition & 1 deletion python/src/sdf/pyBox.cc
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void defineBox(pybind11::object module)
"shape",
pybind11::overload_cast<>(&sdf::Box::Shape, pybind11::const_),
pybind11::return_value_policy::reference,
"Get a mutable Ignition Math representation of this Box.")
"Get a mutable Gazebo Math representation of this Box.")
.def("__copy__", [](const sdf::Box &self) {
return sdf::Box(self);
})
Expand Down
2 changes: 1 addition & 1 deletion python/src/sdf/pyCapsule.cc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void defineCapsule(pybind11::object module)
"shape",
pybind11::overload_cast<>(&sdf::Capsule::Shape, pybind11::const_),
pybind11::return_value_policy::reference,
"Get a mutable Ignition Math representation of this Capsule.")
"Get a mutable Gazebo Math representation of this Capsule.")
.def("__copy__", [](const sdf::Capsule &self) {
return sdf::Capsule(self);
})
Expand Down
2 changes: 1 addition & 1 deletion python/src/sdf/pyCylinder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void defineCylinder(pybind11::object module)
"shape",
pybind11::overload_cast<>(&sdf::Cylinder::Shape, pybind11::const_),
pybind11::return_value_policy::reference,
"Get a mutable Ignition Math representation of this Cylinder.")
"Get a mutable Gazebo Math representation of this Cylinder.")
.def("__copy__", [](const sdf::Cylinder &self) {
return sdf::Cylinder(self);
})
Expand Down
2 changes: 1 addition & 1 deletion python/src/sdf/pyEllipsoid.cc
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void defineEllipsoid(pybind11::object module)
"shape",
pybind11::overload_cast<>(&sdf::Ellipsoid::Shape, pybind11::const_),
pybind11::return_value_policy::reference,
"Get a mutable Ignition Math representation of this Ellipsoid.")
"Get a mutable Gazebo Math representation of this Ellipsoid.")
.def("__copy__", [](const sdf::Ellipsoid &self) {
return sdf::Ellipsoid(self);
})
Expand Down
2 changes: 1 addition & 1 deletion python/src/sdf/pyPlane.cc
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ void definePlane(pybind11::object module)
"shape",
pybind11::overload_cast<>(&sdf::Plane::Shape, pybind11::const_),
pybind11::return_value_policy::reference,
"Get a mutable Ignition Math representation of this Plane.")
"Get a mutable Gazebo Math representation of this Plane.")
.def("__copy__", [](const sdf::Plane &self) {
return sdf::Plane(self);
})
Expand Down
2 changes: 1 addition & 1 deletion python/src/sdf/pySphere.cc
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void defineSphere(pybind11::object module)
"shape",
pybind11::overload_cast<>(&sdf::Sphere::Shape, pybind11::const_),
pybind11::return_value_policy::reference,
"Get a mutable Ignition Math representation of this Sphere.")
"Get a mutable Gazebo Math representation of this Sphere.")
.def("__copy__", [](const sdf::Sphere &self) {
return sdf::Sphere(self);
})
Expand Down
8 changes: 4 additions & 4 deletions usd/src/Conversions.hh
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ namespace sdf
//
namespace usd
{
/// \brief Specialized conversion from an Ignition Common Material
/// \brief Specialized conversion from an Gazebo Common Material
/// to a SDF material
/// \param[in] _in Ignition Common Material.
/// \param[in] _in Gazebo Common Material.
/// \return SDF material.
sdf::Material convert(const gz::common::Material *_in);

/// \brief Specialized conversion from an SDF material to a Ignition Common
/// \brief Specialized conversion from an SDF material to a Gazebo Common
/// material.
/// \param[in] _in SDF material.
/// \param[out] _out The Ignition Common Material.
/// \param[out] _out The Gazebo Common Material.
void convert(const sdf::Material &_in, gz::common::Material &_out);
}
}
Expand Down
2 changes: 1 addition & 1 deletion usd/src/cmd/sdf2usd.cc
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ std::string FindResourceUri(const gz::common::URI &_uri)

void runCommand(const Options &_opt)
{
// Configure SDF to fetch assets from ignition fuel.
// Configure SDF to fetch assets from Gazebo Fuel.
sdf::setFindCallback(std::bind(&FindResources, std::placeholders::_1));
gz::common::addFindFileURICallback(
std::bind(&FindResourceUri, std::placeholders::_1));
Expand Down
2 changes: 1 addition & 1 deletion usd/src/sdf_parser/Sensor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ namespace usd
else
{
// The default value in USD is 50, but something more
// similar to ignition Gazebo is 40.
// similar to Gazebo Sim is 40.
usdCamera.CreateFocalLengthAttr().Set(
static_cast<float>(40.0f));
}
Expand Down
2 changes: 1 addition & 1 deletion usd/src/usd_parser/USDSensors.cc
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ namespace sdf
camera.SetName(_prim.GetPath().GetName());
camera.SetHorizontalFov(20.955);
camera.SetLensFocalLength(focalLength);
// Camera is Y up axis, rotate the camera to match with Ignition
// Camera is Y up axis, rotate the camera to match with Gazebo
gz::math::Pose3d poseCamera(0, 0, 0, GZ_PI_2, 0, -GZ_PI_2);
sensor.SetRawPose(pose * -poseCamera);
camera.SetNearClip(clippingRange[0]);
Expand Down
2 changes: 1 addition & 1 deletion usd/src/usd_parser/USDWorld.cc
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ namespace usd

if (_useGazeboPlugins)
{
// Add some plugins to run the Ignition Gazebo simulation
// Add some plugins to run the Gazebo Sim simulation
sdf::Plugin physicsPlugin;
physicsPlugin.SetName("gz::sim::systems::Physics");
physicsPlugin.SetFilename("ignition-gazebo-physics-system");
Expand Down

0 comments on commit 70da9cd

Please sign in to comment.