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

Merge remote-tracking branch 'bp/master'

Browse Source 
Conflicts:
	btgui/Bullet3AppSupport/CommonParameterInterface.h
This commit is contained in:
Erwin Coumans
2014-11-02 13:12:16 -08:00
parent b1863f7ce2 959e86eb1a
commit 5757de14d7
8 changed files with 67 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
btgui/Bullet3AppSupport/CommonParameterInterface.h
View File

@@ -36,7 +36,8 @@ struct SliderParams
struct CommonParameterInterface
{
virtual void registerSliderFloatParameter(SliderParams& params)=0;
virtual ~CommonParameterInterface() {}
virtual void registerSliderFloatParameter(SliderParams& params)=0;
virtual void syncParameters()=0;
virtual void removeAllParameters()=0;
virtual void setSliderValue(int sliderIndex, double sliderValue)=0;

1
btgui/Bullet3AppSupport/CommonPhysicsSetup.h
View File

@@ -15,6 +15,7 @@ class btDiscreteDynamicsWorld;
///The GraphicsPhysicsBridge let's the graphics engine create graphics representation and synchronize
struct GraphicsPhysicsBridge
{
virtual ~GraphicsPhysicsBridge() {}
virtual void createRigidBodyGraphicsObject(btRigidBody* body,const btVector3& color)
{