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

fix msvc compilation/crash when shooting a box

Browse Source
This commit is contained in:
erwin.coumans
2009-01-08 23:48:13 +00:00
parent a8ec916af0
commit bdfd9784ed
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/HeightFieldFluidDemo/BulletHfFluid/btHfFluidBuoyantConvexShape.cpp
View File

@@ -8,7 +8,7 @@
#include "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h" #include "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h"
#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h" #include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
#include "BulletHfFluid/btHfFluidBuoyantConvexShape.h" #include "btHfFluidBuoyantConvexShape.h"
btHfFluidBuoyantConvexShape::btHfFluidBuoyantConvexShape (btConvexShape* convexShape) btHfFluidBuoyantConvexShape::btHfFluidBuoyantConvexShape (btConvexShape* convexShape)
{ {

2
Demos/HeightFieldFluidDemo/BulletHfFluid/btHfFluidCollisionShape.h
View File

@@ -1,7 +1,7 @@
#ifndef BT_HF_FLUID_COLLISION_SHAPE_H #ifndef BT_HF_FLUID_COLLISION_SHAPE_H
#define BT_HF_FLUID_COLLISION_SHAPE_H #define BT_HF_FLUID_COLLISION_SHAPE_H
#include "BulletHfFluid/btHfFluid.h" #include "btHfFluid.h"
#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h" #include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
#include "BulletCollision/CollisionShapes/btConvexInternalShape.h" #include "BulletCollision/CollisionShapes/btConvexInternalShape.h"

1
Demos/HeightFieldFluidDemo/HfFluidDemo.cpp
View File

@@ -985,6 +985,7 @@ void HfFluidDemo::setShootBoxShape ()
{ {
if (!m_shootBoxShape) if (!m_shootBoxShape)
{ {
m_shootBoxShape = new btBoxShape(btVector3(0.3f,1.f,0.2f));
btHfFluidBuoyantConvexShape* buoyantShape = new btHfFluidBuoyantConvexShape((btConvexShape*)m_shootBoxShape); btHfFluidBuoyantConvexShape* buoyantShape = new btHfFluidBuoyantConvexShape((btConvexShape*)m_shootBoxShape);
buoyantShape->generateShape (btScalar(0.25f), btScalar(0.05f)); buoyantShape->generateShape (btScalar(0.25f), btScalar(0.05f));
m_shootBoxShape = buoyantShape; m_shootBoxShape = buoyantShape;