Ian Chen avatar Ian Chen committed ae12252

cleanup

Comments (0)

Files changed (4)

gazebo/physics/Joint.hh

       /// \brief Computes inertiaRatio for this joint during Joint::Init
       /// The inertia ratio for each joint between [1, +inf] gives a sense
       /// of how well this model will perform in iterative LCP methods.
-      public: void ComputeInertiaRatio();
+      private: void ComputeInertiaRatio();
 
       /// \brief The first link this joint connects to
       protected: LinkPtr childLink;

gazebo/physics/Joint_TEST.cc

     this->GetMemInfo(residentCur, shareCur);
     if (i > 1)  // give it 2 cycles to stabilize
     {
-      // EXPECT_LE(residentCur, residentLast);
-      // EXPECT_LE(shareCur, shareLast);
       EXPECT_TRUE(math::equal(residentCur, residentLast));
       EXPECT_TRUE(math::equal(shareCur, shareLast));
     }
   EXPECT_EQ(child->GetName(), "body1");
 }
 
-
-
 int main(int argc, char **argv)
 {
   ::testing::InitGoogleTest(&argc, argv);

gazebo/physics/bullet/BulletHingeJoint.cc

 
   // Allows access to impulse
   this->bulletHinge->enableFeedback(true);
-
-  this->ComputeInertiaRatio();
 }
 
 //////////////////////////////////////////////////
   double result = 0;
   math::Vector3 globalAxis = this->GetGlobalAxis(0);
   if (this->childLink)
-  {
     result += globalAxis.Dot(this->childLink->GetWorldAngularVel());
-  }
   if (this->parentLink)
     result -= globalAxis.Dot(this->parentLink->GetWorldAngularVel());
   return result;

gazebo/physics/bullet/BulletPhysics.cc

   gContactAddedCallback = ContactCallback;
   gContactProcessedCallback = ContactProcessed;
 
-//  this->dynamicsWorld->setInternalTickCallback(
-//      InternalTickCallback, static_cast<void *>(this));
+  this->dynamicsWorld->setInternalTickCallback(
+      InternalTickCallback, static_cast<void *>(this));
 
   // Set random seed for physics engine based on gazebo's random seed.
   // Note: this was moved from physics::PhysicsEngine constructor.
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.