blob: 9ef054836e33e43b2fa89614df2f3ecdf45b3f18 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
src/BulletSoftBody/btSoftBody.h | 3 +++
src/BulletSoftBody/btSoftBodyInternals.h | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/BulletSoftBody/btSoftBody.h b/src/BulletSoftBody/btSoftBody.h
index 4d975b7..f781598 100644
--- a/src/BulletSoftBody/btSoftBody.h
+++ b/src/BulletSoftBody/btSoftBody.h
@@ -30,6 +30,7 @@ subject to the following restrictions:
class btBroadphaseInterface;
class btDispatcher;
+class btSoftBodySolver;
/* btSoftBodyWorldInfo */
struct btSoftBodyWorldInfo
@@ -52,6 +53,8 @@ class btSoftBody : public btCollisionObject
public:
btAlignedObjectArray<class btCollisionObject*> m_collisionDisabledObjects;
+ // The solver object that handles this soft body
+ btSoftBodySolver *m_softBodySolver;
//
// Enumerations
//
diff --git a/src/BulletSoftBody/btSoftBodyInternals.h b/src/BulletSoftBody/btSoftBodyInternals.h
index 2cb7744..296d97a 100644
--- a/src/BulletSoftBody/btSoftBodyInternals.h
+++ b/src/BulletSoftBody/btSoftBodyInternals.h
@@ -26,6 +26,7 @@ subject to the following restrictions:
#include "BulletCollision/CollisionShapes/btConvexInternalShape.h"
#include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
+#include <string.h> //for memset
//
// btSymMatrix
//
@@ -172,8 +173,7 @@ public:
template <typename T>
static inline void ZeroInitialize(T& value)
{
- static const T zerodummy;
- value=zerodummy;
+ memset(&value,0,sizeof(T));
}
//
template <typename T>
|
GitWeb
