diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2005-12-31 10:20:08 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2005-12-31 10:20:08 +0300 |
| commit | 9119b6e8a547303ce9a7ccd3a00636153b53cb0e (patch) | |
| tree | 1816973e2baf4888d571e87cfb548cafafe46d41 /source/gameengine/Converter/BL_MeshDeformer.h | |
| parent | 625c553e2077ec0a252ddd934d4267c61011d61f (diff) | |
Fixed several bugs: python refcounting related and Bullet related (basic add/remove object support, bounding volume hierarchy). Added a few files, updated the Bullet scons. Vc6/7 Bullet projectfiles need to add a couple of files: 'Bullet/CollisionShapes/BvhTriangleMeshShape.cpp',
'Bullet/CollisionShapes/ConvexTriangleCallback.cpp',
'Bullet/CollisionShapes/EmptyShape.cpp',
'Bullet/CollisionShapes/OptimizedBvh.cpp',
'Bullet/CollisionShapes/TriangleCallback.cpp',
'Bullet/CollisionShapes/TriangleIndexVertexArray.cpp',
'Bullet/NarrowPhaseCollision/ManifoldContactAddResult.cpp'.
Sorry, no armatures fix yet.
Diffstat (limited to 'source/gameengine/Converter/BL_MeshDeformer.h')
| -rw-r--r-- | source/gameengine/Converter/BL_MeshDeformer.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/gameengine/Converter/BL_MeshDeformer.h b/source/gameengine/Converter/BL_MeshDeformer.h index 04e0f3b0628..c9030ceca36 100644 --- a/source/gameengine/Converter/BL_MeshDeformer.h +++ b/source/gameengine/Converter/BL_MeshDeformer.h @@ -48,12 +48,14 @@ public: void VerifyStorage(); void RecalcNormals(); virtual void Relink(GEN_Map<class GEN_HashedPtr, void*>*map){}; - BL_MeshDeformer(struct Object* obj, class BL_SkinMeshObject *meshobj): + BL_MeshDeformer(struct Object* obj, class BL_SkinMeshObject *meshobj,struct Object* armatureObj): m_pMeshObject(meshobj), m_bmesh((struct Mesh*)(obj->data)), m_transnors(NULL), m_transverts(NULL), - m_tvtot(0) + m_tvtot(0), + m_blenderMeshObject(obj), + m_blenderArmatureObj(armatureObj) {}; virtual ~BL_MeshDeformer(); virtual void SetSimulatedTime(double time){}; @@ -67,6 +69,8 @@ protected: MT_Point3 *m_transnors; MT_Point3 *m_transverts; int m_tvtot; + Object* m_blenderMeshObject; + Object* m_blenderArmatureObj; }; |