fixed the compilation errors due to GIMPACT directory move

Extras/MayaPlugin/Makefile

@@ -26,9 +26,9 @@ CPPFLAGS = -DBits64_ -m64 -DUNIX -D_BOOL -DLINUX -DFUNCPROTO -D_GNU_SOURCE -DLIN
 
 LDFLAGS =-Wl,-Bsymbolic -shared
 
-BULLET_INCLUDE=-I$(BULLET)/src -I$(BULLET)/Extras/GIMPACT/include
+BULLET_INCLUDE=-I$(BULLET)/src
 BULLET_LIB=-L$(BULLET)/out/linux/optimize/libs -L$(BULLET)/src \
-               -lBulletColladaConverter -lcolladadom -llibxml -lGIMPACT -lGIMPACTUtils -lbulletdynamics \
+               -lBulletColladaConverter -lcolladadom -llibxml -lGIMPACTUtils -lbulletdynamics \
                  -lbulletcollision -lbulletmath
 
 GL_LIB=-lGL -lGLU 

Extras/MayaPlugin/bt_box_shape.h

@@ -31,11 +31,12 @@ Written by: Nicola Candussi <nicola@fluidinteractive.com>
 class bt_box_shape_t: public bt_collision_shape_t, public box_shape_impl_t 
 {
 public:
-    virtual void gl_draw(size_t draw_style) {
+    virtual void gl_draw(size_t draw_style) 
+    {
+//      std::cout << "bt_box_shape_t::draw" << std::endl;
         btBoxShape *box_shape = static_cast<btBoxShape*>(shape());
         btVector3 const& e = box_shape->getHalfExtentsWithoutMargin();
         glPushMatrix();
-
         glScalef(2 * e.x(), 2 * e.y(), 2 * e.z()); 
         if(draw_style & collision_shape_t::kDSSolid) {
             solid_cube();

Extras/MayaPlugin/bt_convex_hull_shape.h

@@ -116,8 +116,6 @@ protected:
 
     void update()
     {
-        btConvexHullShape *ch_shape = static_cast<btConvexHullShape*>(shape());
-
         //apply the scaling
         btVector3 const& scale = m_ch_shape->getLocalScaling();
         btPoint3 const* points = m_ch_shape->getPoints();

Extras/MayaPlugin/bt_plane_shape.h

@@ -31,7 +31,9 @@ Written by: Nicola Candussi <nicola@fluidinteractive.com>
 class bt_plane_shape_t: public bt_collision_shape_t, public plane_shape_impl_t 
 {
 public:
-    virtual void gl_draw(size_t draw_style) {
+    virtual void gl_draw(size_t draw_style) 
+    {
+    //    std::cout << "bt_plane_shape_t::draw" << std::endl;
       //  btStaticPlaneShape *plane_shape = static_cast<btStaticPlaneShape*>(shape());
         glPushMatrix();
         glScalef(100.0, 0.001, 100.0); 

Extras/MayaPlugin/bt_solver.h

@@ -27,8 +27,8 @@ Written by: Nicola Candussi <nicola@fluidinteractive.com>
 
 #include "btBulletCollisionCommon.h"
 #include "btBulletDynamicsCommon.h"
-#include "GIMPACT/Bullet/btGImpactShape.h"
-#include "GIMPACT/Bullet/btGImpactCollisionAlgorithm.h"
+#include "BulletCollision/Gimpact/btGImpactShape.h"
+#include "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h"
 
 #include "solver_impl.h"
 #include "bt_rigid_body.h"

Extras/MayaPlugin/drawUtils.cpp

@@ -20,7 +20,7 @@ not be misrepresented as being the original software.
 Written by: Nicola Candussi <nicola@fluidinteractive.com>
 */
 
-//drawUtils.cpp
+#include <iostream>
 
 #ifdef WIN32//for glut.h
 #include <windows.h>