Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed the compilation errors due to GIMPACT directory move

Browse Source
This commit is contained in:
nicola.candussi
2008-10-13 17:26:31 +00:00
parent 919a9dcc29
commit 05cc5656bb
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Extras/MayaPlugin/Makefile
View File

@@ -26,9 +26,9 @@ CPPFLAGS = -DBits64_ -m64 -DUNIX -D_BOOL -DLINUX -DFUNCPROTO -D_GNU_SOURCE -DLIN
LDFLAGS =-Wl,-Bsymbolic -shared 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 \ BULLET_LIB=-L$(BULLET)/out/linux/optimize/libs -L$(BULLET)/src \
-lBulletColladaConverter -lcolladadom -llibxml -lGIMPACT -lGIMPACTUtils -lbulletdynamics \ -lBulletColladaConverter -lcolladadom -llibxml -lGIMPACTUtils -lbulletdynamics \
-lbulletcollision -lbulletmath -lbulletcollision -lbulletmath
GL_LIB=-lGL -lGLU GL_LIB=-lGL -lGLU

5
Extras/MayaPlugin/bt_box_shape.h
View File

@@ -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 class bt_box_shape_t: public bt_collision_shape_t, public box_shape_impl_t
{ {
public: 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()); btBoxShape *box_shape = static_cast<btBoxShape*>(shape());
btVector3 const& e = box_shape->getHalfExtentsWithoutMargin(); btVector3 const& e = box_shape->getHalfExtentsWithoutMargin();
glPushMatrix(); glPushMatrix();
glScalef(2 * e.x(), 2 * e.y(), 2 * e.z()); glScalef(2 * e.x(), 2 * e.y(), 2 * e.z());
if(draw_style & collision_shape_t::kDSSolid) { if(draw_style & collision_shape_t::kDSSolid) {
solid_cube(); solid_cube();

2
Extras/MayaPlugin/bt_convex_hull_shape.h
View File

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

4
Extras/MayaPlugin/bt_plane_shape.h
View File

@@ -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 class bt_plane_shape_t: public bt_collision_shape_t, public plane_shape_impl_t
{ {
public: 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()); // btStaticPlaneShape *plane_shape = static_cast<btStaticPlaneShape*>(shape());
glPushMatrix(); glPushMatrix();
glScalef(100.0, 0.001, 100.0); glScalef(100.0, 0.001, 100.0);

4
Extras/MayaPlugin/bt_solver.h
View File

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

2
Extras/MayaPlugin/drawUtils.cpp
View File

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