Skip to content

Instantly share code, notes, and snippets.

@iche033
Created April 1, 2016 19:29
Show Gist options
  • Save iche033/19aa08ea838d8b359070cc83761e4151 to your computer and use it in GitHub Desktop.
Save iche033/19aa08ea838d8b359070cc83761e4151 to your computer and use it in GitHub Desktop.
diff -r f7d9beae4a9c gazebo/physics/Actor.cc
--- a/gazebo/physics/Actor.cc Fri Apr 01 09:37:55 2016 -0700
+++ b/gazebo/physics/Actor.cc Fri Apr 01 12:25:23 2016 -0700
@@ -818,6 +818,17 @@
this->skinScale, this->skinScale));
}
+/////////////////////////////////////////////////
+void Actor::SetSelfCollide(bool /*_self_collide*/)
+{
+}
+
+/////////////////////////////////////////////////
+bool Actor::GetSelfCollide() const
+{
+ return false;
+}
+
//////////////////////////////////////////////////
TrajectoryInfo::TrajectoryInfo()
: id(0), type(""), duration(0.0), startTime(0.0), endTime(0.0),
diff -r f7d9beae4a9c gazebo/physics/Actor.hh
--- a/gazebo/physics/Actor.hh Fri Apr 01 09:37:55 2016 -0700
+++ b/gazebo/physics/Actor.hh Fri Apr 01 12:25:23 2016 -0700
@@ -131,6 +131,12 @@
/// \brief Reset custom trajectory of the actor.
public: void ResetCustomTrajectory();
+ // Documentation inherited.
+ public: virtual bool GetSelfCollide() const;
+
+ // Documentation inherited.
+ public: virtual void SetSelfCollide(bool _self_collide);
+
/// \brief Add inertia for a sphere.
/// \param[in] _linkSdf The link to add the inertia to.
/// \param[in] _pose Pose of the inertia.
diff -r f7d9beae4a9c gazebo/physics/Model.hh
--- a/gazebo/physics/Model.hh Fri Apr 01 09:37:55 2016 -0700
+++ b/gazebo/physics/Model.hh Fri Apr 01 12:25:23 2016 -0700
@@ -202,12 +202,12 @@
/// Bodies connected by a joint are exempt from this, and will
/// never collide.
/// \return True if self-collide enabled for this model, false otherwise.
- public: bool GetSelfCollide() const;
+ public: virtual bool GetSelfCollide() const;
/// \brief Set this model's self_collide property
/// \sa GetSelfCollide
/// \param[in] _self_collide True if self-collisions enabled by default.
- public: void SetSelfCollide(bool _self_collide);
+ public: virtual void SetSelfCollide(bool _self_collide);
/// \brief Set the gravity mode of the model.
/// \param[in] _value False to turn gravity on for the model.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment