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

Merge pull request #268 from kwatts/render_callback_virtual_dtor

Browse Source 
Thanks for the help! Adding virtual destructor for RenderCallbacks struct
This commit is contained in:
erwincoumans
2014-10-16 13:35:43 -07:00
parent 46bd05f4f7 0623f99a27
commit 70c307e08e
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
btgui/OpenGLWindow/fontstash.h
View File

@@ -101,6 +101,7 @@ struct sth_texture
struct RenderCallbacks struct RenderCallbacks
{ {
virtual ~RenderCallbacks() {}
virtual void updateTexture(sth_texture* texture, sth_glyph* glyph, int textureWidth, int textureHeight)=0; virtual void updateTexture(sth_texture* texture, sth_glyph* glyph, int textureWidth, int textureHeight)=0;
virtual void render(sth_texture* texture)=0; virtual void render(sth_texture* texture)=0;
}; };

2
src/BulletSoftBody/btSoftBody.h
View File

@@ -171,6 +171,7 @@ public:
/* ImplicitFn */ /* ImplicitFn */
struct ImplicitFn struct ImplicitFn
{ {
virtual ~ImplicitFn() {}
virtual btScalar Eval(const btVector3& x)=0; virtual btScalar Eval(const btVector3& x)=0;
}; };
@@ -528,6 +529,7 @@ public:
{ {
struct IControl struct IControl
{ {
virtual ~IControl() {}
virtual void Prepare(AJoint*) {} virtual void Prepare(AJoint*) {}
virtual btScalar Speed(AJoint*,btScalar current) { return(current); } virtual btScalar Speed(AJoint*,btScalar current) { return(current); }
static IControl* Default() { static IControl def;return(&def); } static IControl* Default() { static IControl def;return(&def); }