add missing Demos/BulletXmlImportDemo

serialize DynamicsWorldInfo

Extras/Serialize/BulletFileLoader/autogenerated/bullet.h

@@ -64,6 +64,8 @@ typedef struct bInvalidHandle {
     class btConvexHullShapeData;
     class btCollisionObjectDoubleData;
     class btCollisionObjectFloatData;
+    class btDynamicsWorldDoubleData;
+    class btDynamicsWorldFloatData;
     class btRigidBodyFloatData;
     class btRigidBodyDoubleData;
     class btConstraintInfo1;
@@ -76,6 +78,8 @@ typedef struct bInvalidHandle {
     class btGeneric6DofConstraintData;
     class btGeneric6DofSpringConstraintData;
     class btSliderConstraintData;
+    class btContactSolverInfoDoubleData;
+    class btContactSolverInfoFloatData;
     class SoftBodyMaterialData;
     class SoftBodyNodeData;
     class SoftBodyLinkData;
@@ -503,6 +507,7 @@ typedef struct bInvalidHandle {
         double m_contactProcessingThreshold;
         double m_deactivationTime;
         double m_friction;
+        double m_rollingFriction;
         double m_restitution;
         double m_hitFraction;
         double m_ccdSweptSphereRadius;
@@ -534,6 +539,7 @@ typedef struct bInvalidHandle {
         float m_contactProcessingThreshold;
         float m_deactivationTime;
         float m_friction;
+        float m_rollingFriction;
         float m_restitution;
         float m_hitFraction;
         float m_ccdSweptSphereRadius;
@@ -545,6 +551,25 @@ typedef struct bInvalidHandle {
         int m_activationState1;
         int m_internalType;
         int m_checkCollideWith;
+        char m_padding[4];
+    };
+
+
+// -------------------------------------------------- //
+    class btDynamicsWorldDoubleData
+    {
+    public:
+        btContactSolverInfoDoubleData m_solverInfo;
+        btVector3DoubleData m_gravity;
+    };
+
+
+// -------------------------------------------------- //
+    class btDynamicsWorldFloatData
+    {
+    public:
+        btContactSolverInfoFloatData m_solverInfo;
+        btVector3FloatData m_gravity;
     };
 
 
@@ -628,7 +653,9 @@ typedef struct bInvalidHandle {
         float m_appliedImpulse;
         float m_dbgDrawSize;
         int m_disableCollisionsBetweenLinkedBodies;
-        char m_pad4[4];
+        int m_overrideNumSolverIterations;
+        float m_breakingImpulseThreshold;
+        int m_isEnabled;
     };
 
 
@@ -754,6 +781,64 @@ typedef struct bInvalidHandle {
     };
 
 
+// -------------------------------------------------- //
+    class btContactSolverInfoDoubleData
+    {
+    public:
+        double m_tau;
+        double m_damping;
+        double m_friction;
+        double m_timeStep;
+        double m_restitution;
+        double m_maxErrorReduction;
+        double m_sor;
+        double m_erp;
+        double m_erp2;
+        double m_globalCfm;
+        double m_splitImpulsePenetrationThreshold;
+        double m_splitImpulseTurnErp;
+        double m_linearSlop;
+        double m_warmstartingFactor;
+        double m_maxGyroscopicForce;
+        double m_singleAxisRollingFrictionThreshold;
+        int m_numIterations;
+        int m_solverMode;
+        int m_restingContactRestitutionThreshold;
+        int m_minimumSolverBatchSize;
+        int m_splitImpulse;
+        char m_padding[4];
+    };
+
+
+// -------------------------------------------------- //
+    class btContactSolverInfoFloatData
+    {
+    public:
+        float m_tau;
+        float m_damping;
+        float m_friction;
+        float m_timeStep;
+        float m_restitution;
+        float m_maxErrorReduction;
+        float m_sor;
+        float m_erp;
+        float m_erp2;
+        float m_globalCfm;
+        float m_splitImpulsePenetrationThreshold;
+        float m_splitImpulseTurnErp;
+        float m_linearSlop;
+        float m_warmstartingFactor;
+        float m_maxGyroscopicForce;
+        float m_singleAxisRollingFrictionThreshold;
+        int m_numIterations;
+        int m_solverMode;
+        int m_restingContactRestitutionThreshold;
+        int m_minimumSolverBatchSize;
+        int m_splitImpulse;
+        char m_padding[4];
+    };
+
+
 // -------------------------------------------------- //
     class SoftBodyMaterialData
     {

Extras/Serialize/BulletFileLoader/btBulletFile.cpp

@@ -174,6 +174,11 @@ void btBulletFile::parseData()
 					m_rigidBodies.push_back((bStructHandle*) id);
 				}
 
+				if (dataChunk.code == BT_DYNAMICSWORLD_CODE)
+				{
+					m_dynamicsWorldInfo.push_back((bStructHandle*) id);
+				}
+
 				if (dataChunk.code == BT_CONSTRAINT_CODE)
 				{
 					m_constraints.push_back((bStructHandle*) id);

Extras/Serialize/BulletFileLoader/btBulletFile.h

@@ -51,7 +51,9 @@ namespace bParse {
 		btAlignedObjectArray<bStructHandle*>	m_bvhs;
 
 		btAlignedObjectArray<bStructHandle*>	m_triangleInfoMaps;
-		
+
+		btAlignedObjectArray<bStructHandle*>	m_dynamicsWorldInfo;
+
 		btAlignedObjectArray<char*>				m_dataBlocks;
 		btBulletFile();