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

add name for collision shape and constraint serialization (to objects, shapes and constaints can be mapped to user data)

Browse Source 
updated serialization structures and header files (for new 'm_name' field, replacing user pointer)
fix issue with  btGeneric6DofConstraint::setParam in headerfile
This commit is contained in:
erwin.coumans
2010-02-04 05:28:17 +00:00
parent af1dafc659
commit 99d9fddc42
12 changed files with 440 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Extras/Serialize/BulletFileLoader/autogenerated/bullet_btCollisionObjectDoubleData.h
View File

@@ -36,7 +36,7 @@ namespace Bullet {
void *m_broadphaseHandle;
void *m_collisionShape;
btCollisionShapeData *m_rootCollisionShape;
void *m_userObjectPointer;
char *m_name;
btTransformDoubleData m_worldTransform;
btTransformDoubleData m_interpolationWorldTransform;
btVector3DoubleData m_interpolationLinearVelocity;

2
Extras/Serialize/BulletFileLoader/autogenerated/bullet_btCollisionObjectFloatData.h
View File

@@ -36,7 +36,7 @@ namespace Bullet {
void *m_broadphaseHandle;
void *m_collisionShape;
btCollisionShapeData *m_rootCollisionShape;
void *m_userObjectPointer;
char *m_name;
btTransformFloatData m_worldTransform;
btTransformFloatData m_interpolationWorldTransform;
btVector3FloatData m_interpolationLinearVelocity;

2
Extras/Serialize/BulletFileLoader/autogenerated/bullet_btCollisionShapeData.h
View File

@@ -31,7 +31,7 @@ namespace Bullet {
class btCollisionShapeData
{
public:
void *m_userPointer;
char *m_name;
int m_shapeType;
char m_padding[4];
};

7
Extras/Serialize/BulletFileLoader/autogenerated/bullet_btTypedConstraintData.h
View File

@@ -23,7 +23,6 @@
// -------------------------------------------------- //
#include "bullet_Common.h"
#include "bullet_btVector3FloatData.h"
namespace Bullet {
@@ -34,9 +33,7 @@ namespace Bullet {
public:
bInvalidHandle *m_rbA;
bInvalidHandle *m_rbB;
btVector3FloatData m_appliedLinearImpulse;
btVector3FloatData m_appliedAngularImpulseA;
btVector3FloatData m_appliedAngularImpulseB;
char *m_name;
int m_objectType;
int m_userConstraintType;
int m_userConstraintId;
@@ -44,7 +41,7 @@ namespace Bullet {
float m_appliedImpulse;
float m_dbgDrawSize;
int m_disableCollisionsBetweenLinkedBodies;
char m_pad[4];
char m_pad4[4];
};
}