diff options
Diffstat (limited to 'thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.h')
-rw-r--r-- | thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.h | 69 |
1 files changed, 30 insertions, 39 deletions
diff --git a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.h b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.h index fb1b9b0dde..ede1d378ae 100644 --- a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.h +++ b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.h @@ -16,68 +16,59 @@ subject to the following restrictions: #ifndef B3_BULLET_FILE_H #define B3_BULLET_FILE_H - #include "b3File.h" #include "Bullet3Common/b3AlignedObjectArray.h" #include "b3Defines.h" #include "Bullet3Serialize/Bullet2FileLoader/b3Serializer.h" +namespace bParse +{ +// ----------------------------------------------------- // +class b3BulletFile : public bFile +{ +protected: + char* m_DnaCopy; +public: + b3AlignedObjectArray<bStructHandle*> m_softBodies; -namespace bParse { - - // ----------------------------------------------------- // - class b3BulletFile : public bFile - { - - - protected: - - char* m_DnaCopy; - - public: - - b3AlignedObjectArray<bStructHandle*> m_softBodies; - - b3AlignedObjectArray<bStructHandle*> m_rigidBodies; - - b3AlignedObjectArray<bStructHandle*> m_collisionObjects; + b3AlignedObjectArray<bStructHandle*> m_rigidBodies; - b3AlignedObjectArray<bStructHandle*> m_collisionShapes; + b3AlignedObjectArray<bStructHandle*> m_collisionObjects; - b3AlignedObjectArray<bStructHandle*> m_constraints; + b3AlignedObjectArray<bStructHandle*> m_collisionShapes; - b3AlignedObjectArray<bStructHandle*> m_bvhs; + b3AlignedObjectArray<bStructHandle*> m_constraints; - b3AlignedObjectArray<bStructHandle*> m_triangleInfoMaps; + b3AlignedObjectArray<bStructHandle*> m_bvhs; - b3AlignedObjectArray<bStructHandle*> m_dynamicsWorldInfo; + b3AlignedObjectArray<bStructHandle*> m_triangleInfoMaps; - b3AlignedObjectArray<char*> m_dataBlocks; - b3BulletFile(); + b3AlignedObjectArray<bStructHandle*> m_dynamicsWorldInfo; - b3BulletFile(const char* fileName); + b3AlignedObjectArray<char*> m_dataBlocks; + b3BulletFile(); - b3BulletFile(char *memoryBuffer, int len); + b3BulletFile(const char* fileName); - virtual ~b3BulletFile(); + b3BulletFile(char* memoryBuffer, int len); - virtual void addDataBlock(char* dataBlock); - + virtual ~b3BulletFile(); - // experimental - virtual int write(const char* fileName, bool fixupPointers=false); + virtual void addDataBlock(char* dataBlock); - virtual void parse(int verboseMode); + // experimental + virtual int write(const char* fileName, bool fixupPointers = false); - virtual void parseData(); + virtual void parse(int verboseMode); - virtual void writeDNA(FILE* fp); + virtual void parseData(); - void addStruct(const char* structType,void* data, int len, void* oldPtr, int code); + virtual void writeDNA(FILE* fp); - }; + void addStruct(const char* structType, void* data, int len, void* oldPtr, int code); }; +}; // namespace bParse -#endif //B3_BULLET_FILE_H +#endif //B3_BULLET_FILE_H |