Add "dart/" to includes

dartsim · Dec 13, 2013 · 8a58f0c · 8a58f0c
1 parent 9b93fe6
commit 8a58f0c
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 43 deletions.
diff --git a/src/GUI/GRIPFrame.cpp b/src/GUI/GRIPFrame.cpp
@@ -67,13 +67,13 @@
 #include "icons/frontView.xpm"
 #include "icons/topView.xpm"
 
-#include <dynamics/Skeleton.h>
-#include <dynamics/BoxShape.h> // for floor
-#include <dynamics/WeldJoint.h> // for floor
-#include <dynamics/GenCoord.h>
+#include <dart/dynamics/Skeleton.h>
+#include <dart/dynamics/BoxShape.h> // for floor
+#include <dart/dynamics/WeldJoint.h> // for floor
+#include <dart/dynamics/GenCoord.h>
 
 // Parser
-#include <utils/urdf/DartLoader.h>
+#include <dart/utils/urdf/DartLoader.h>
 
 #define ID_TOOLBAR 1257
 #define ID_TIMESLIDER 1258

diff --git a/src/GUI/GRIPFrame.h b/src/GUI/GRIPFrame.h
@@ -44,7 +44,7 @@ class Viewer;
 #include <vector>
 
 #include "TreeView.h"
-#include <simulation/World.h>
+#include <dart/simulation/World.h>
 
 #include <string>
 using namespace std;

diff --git a/src/GUI/TreeView.cpp b/src/GUI/TreeView.cpp
@@ -42,15 +42,15 @@
 #include "../Tabs/VisualizationTab.h"
 #include "GUI.h"
 
-#include <simulation/World.h>
-#include <dynamics/Skeleton.h>
-#include <dynamics/BodyNode.h>
-#include <dynamics/Joint.h>
-#include <dynamics/PrismaticJoint.h>
-#include <dynamics/RevoluteJoint.h>
-#include <dynamics/FreeJoint.h>
-#include <dynamics/WeldJoint.h>
-#include <dynamics/GenCoord.h>
+#include <dart/simulation/World.h>
+#include <dart/dynamics/Skeleton.h>
+#include <dart/dynamics/BodyNode.h>
+#include <dart/dynamics/Joint.h>
+#include <dart/dynamics/PrismaticJoint.h>
+#include <dart/dynamics/RevoluteJoint.h>
+#include <dart/dynamics/FreeJoint.h>
+#include <dart/dynamics/WeldJoint.h>
+#include <dart/dynamics/GenCoord.h>
 
 //TOOLBAR PICTURES
 #include "icons/robot.xpm"

diff --git a/src/GUI/TreeView.h b/src/GUI/TreeView.h
@@ -49,7 +49,7 @@
 #include "wx/treectrl.h"
 
 ////
-#include <dynamics/BodyNode.h> 
+#include <dart/dynamics/BodyNode.h> 
 ///
 
 

diff --git a/src/GUI/Viewer.h b/src/GUI/Viewer.h
@@ -43,10 +43,10 @@
 #include <Eigen/Geometry>
 #include <wx/wx.h>
 #include <wx/glcanvas.h>
-#include <dynamics/Shape.h>
-#include <dynamics/BodyNode.h>
-#include <dynamics/MeshShape.h>
-#include <renderer/OpenGLRenderInterface.h>
+#include <dart/dynamics/Shape.h>
+#include <dart/dynamics/BodyNode.h>
+#include <dart/dynamics/MeshShape.h>
+#include <dart/renderer/OpenGLRenderInterface.h>
 
 using namespace Eigen;
 

diff --git a/src/Tabs/InspectorTab.cpp b/src/Tabs/InspectorTab.cpp
@@ -46,13 +46,13 @@
 #include <GUI/GRIPSlider.h>
 #include <GUI/GRIPFrame.h>
 
-#include <dynamics/Skeleton.h>
-#include <dynamics/BodyNode.h>
-#include <dynamics/Joint.h>
-#include <dynamics/FreeJoint.h>
-#include <dynamics/RevoluteJoint.h>
-#include <dynamics/PrismaticJoint.h>
-#include <dynamics/GenCoord.h>
+#include <dart/dynamics/Skeleton.h>
+#include <dart/dynamics/BodyNode.h>
+#include <dart/dynamics/Joint.h>
+#include <dart/dynamics/FreeJoint.h>
+#include <dart/dynamics/RevoluteJoint.h>
+#include <dart/dynamics/PrismaticJoint.h>
+#include <dart/dynamics/GenCoord.h>
 
 using namespace std;
 using namespace Eigen;
@@ -154,21 +154,25 @@ void InspectorTab::OnSlider(wxCommandEvent &evt) {
       //-- Change joint value
     case J_SLIDER:
       if(dynamic_cast<dart::dynamics::RevoluteJoint*>(pBodyNode->getParentJoint())) {
-        pBodyNode->getParentJoint()->getGenCoord(0)->set_q( DEG2RAD(pos) ); 
+        std::vector<int> index(1);
+        index[0] = pBodyNode->getSkeletonIndex();
+        Eigen::VectorXd config(1);
+        config[0] = DEG2RAD(pos);
+        pBodyNode->getSkeleton()->setConfig(index, config);
       } 
       else if (dynamic_cast<dart::dynamics::PrismaticJoint*>(pBodyNode->getParentJoint())) {
-        pBodyNode->getParentJoint()->getGenCoord(0)->set_q( pos ); 
+        std::vector<int> index(1);
+        index[0] = pBodyNode->getSkeletonIndex();
+        Eigen::VectorXd config(1);
+        config[0] = DEG2RAD(pos);
+        pBodyNode->getSkeleton()->setConfig(index, config);
       }
       break;
     default:
       printf("None, you are supposed to show this \n");
       return;
       break;
     }
-    /// Update the robot or object (both Skeletons)
-    for (int i = 0; i < pBodyNode->getSkeleton()->getNumBodyNodes(); ++i) {
-        pBodyNode->getSkeleton()->getBodyNode(i)->updateTransform();
-    }
 
     sprintf(numBuf,"Joint Change: %7.4f", pos);
 

diff --git a/src/Tabs/VisualizationTab.cpp b/src/Tabs/VisualizationTab.cpp
@@ -37,7 +37,7 @@
  */
 
 #include "VisualizationTab.h"
-#include "constraint/ConstraintDynamics.h"
+#include <dart/constraint/ConstraintDynamics.h>
 
 // **********************
 // STL
@@ -56,19 +56,19 @@ using namespace std;
 
 // **********************
 // Dynamics Stuff
-#include <collision/CollisionDetector.h>
-#include <dynamics/Skeleton.h>
-#include <dynamics/BodyNode.h>
-#include <dynamics/BoxShape.h>
-#include <dynamics/GenCoord.h>
-#include <dynamics/Joint.h>
-#include <renderer/LoadOpengl.h>
-#include <dynamics/RevoluteJoint.h>
+#include <dart/collision/CollisionDetector.h>
+#include <dart/dynamics/Skeleton.h>
+#include <dart/dynamics/BodyNode.h>
+#include <dart/dynamics/BoxShape.h>
+#include <dart/dynamics/GenCoord.h>
+#include <dart/dynamics/Joint.h>
+#include <dart/renderer/LoadOpengl.h>
+#include <dart/dynamics/RevoluteJoint.h>
 
 // **********************
 // Drawing Stuff
 #include <wx/glcanvas.h>
-#include <yui/GLFuncs.h>
+#include <dart/yui/GLFuncs.h>
 #include <GUI/Viewer.h>
 
 /** UI Control IDs */
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,7 +49,7 @@ @@
     #include "wx/treectrl.h"
     ////
-    #include <dynamics/BodyNode.h>
+    #include <dart/dynamics/BodyNode.h>
     ///
@@ Expand Down @@