Skip to content

Commit

Permalink
line wrap
Browse files Browse the repository at this point in the history
Signed-off-by: Ian Chen <[email protected]>
  • Loading branch information
iche033 committed Mar 20, 2024
1 parent 5378598 commit 4ca98b5
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
6 changes: 3 additions & 3 deletions include/sdf/Surface.hh
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ namespace sdf
/// \brief Default constructor
public: BulletFriction();

/// \brief Load BulletFriction friction based on a element pointer. This is *not*
/// the usual entry point. Typical usage of the SDF DOM is through the Root
/// object.
/// \brief Load BulletFriction friction based on a element pointer. This is
/// *not* the usual entry point. Typical usage of the SDF DOM is through
/// the Root object.
/// \param[in] _sdf The SDF Element pointer
/// \return Errors, which is a vector of Error objects. Each Error includes
/// an error code and message. An empty vector indicates no error.
Expand Down
8 changes: 4 additions & 4 deletions src/Surface.cc
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ Errors Torsional::Load(ElementPtr _sdf)
if (_sdf->GetName() != "torsional")
{
errors.push_back({ErrorCode::ELEMENT_INCORRECT_TYPE,

Check warning on line 173 in src/Surface.cc

View check run for this annotation

Codecov / codecov/patch

src/Surface.cc#L173

Added line #L173 was not covered by tests
"Attempting to load a BulletFriction, but the provided SDF element is not a "
"<ode>."});
"Attempting to load a BulletFriction, but the provided SDF element "
"is not a <torsional>."});
return errors;

Check warning on line 176 in src/Surface.cc

View check run for this annotation

Codecov / codecov/patch

src/Surface.cc#L176

Added line #L176 was not covered by tests
}

Expand Down Expand Up @@ -287,8 +287,8 @@ Errors BulletFriction::Load(ElementPtr _sdf)
if (_sdf->GetName() != "bullet")
{
errors.push_back({ErrorCode::ELEMENT_INCORRECT_TYPE,

Check warning on line 289 in src/Surface.cc

View check run for this annotation

Codecov / codecov/patch

src/Surface.cc#L289

Added line #L289 was not covered by tests
"Attempting to load a BulletFriction, but the provided SDF element is not a "
"<ode>."});
"Attempting to load a BulletFriction, but the provided SDF element "
"is not a <bullet>."});
return errors;

Check warning on line 292 in src/Surface.cc

View check run for this annotation

Codecov / codecov/patch

src/Surface.cc#L292

Added line #L292 was not covered by tests
}

Expand Down
3 changes: 2 additions & 1 deletion src/Surface_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,8 @@ TEST(DOMsurface, ToElement)
EXPECT_DOUBLE_EQ(0.5, surface2.Friction()->BulletFriction()->Friction2());
EXPECT_EQ(gz::math::Vector3d(2, 1, 4),
surface2.Friction()->BulletFriction()->Fdir1());
EXPECT_DOUBLE_EQ(1.3, surface2.Friction()->BulletFriction()->RollingFriction());
EXPECT_DOUBLE_EQ(1.3,
surface2.Friction()->BulletFriction()->RollingFriction());

EXPECT_DOUBLE_EQ(0.5, surface2.Friction()->Torsional()->Coefficient());
EXPECT_FALSE(surface2.Friction()->Torsional()->UsePatchRadius());
Expand Down

0 comments on commit 4ca98b5

Please sign in to comment.