From ba5012973da5fff92b71df82d6e6bf77ebb187f7 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Sat, 4 Dec 2010 01:23:31 +0000 Subject: [PATCH] Make argument to btDefaultSerializer optional, and use zero by default. This will dynamically allocate data, so there is no need to guess the maximum size anymore. Remove some cached data from SoftBodyLinkData, to reduce serialization file size. --- Demos/SerializeDemo/SerializeDemo.cpp | 8 +- src/BulletSoftBody/btSoftBody.cpp | 4 - src/BulletSoftBody/btSoftBodyData.h | 5 - src/LinearMath/btSerializer.cpp | 903 +++++++++++++------------- src/LinearMath/btSerializer.h | 85 ++- 5 files changed, 519 insertions(+), 486 deletions(-) diff --git a/Demos/SerializeDemo/SerializeDemo.cpp b/Demos/SerializeDemo/SerializeDemo.cpp index aee232ab9..a517bfd6d 100644 --- a/Demos/SerializeDemo/SerializeDemo.cpp +++ b/Demos/SerializeDemo/SerializeDemo.cpp @@ -246,10 +246,6 @@ public: } btSoftBody::Link* link = &psb->m_links[psb->m_links.size()-1]; link->m_bbending = linkData.m_bbending; - link->m_c0 = linkData.m_c0; - link->m_c1 = linkData.m_c1; - link->m_c2 = linkData.m_c2; - link->m_c3.deSerializeFloat(linkData.m_c3); link->m_rl = linkData.m_restLength; } @@ -404,7 +400,7 @@ public: #endif // - + psb->updateConstants(); m_softRigidWorld->getWorldInfo().m_dispatcher = m_softRigidWorld->getDispatcher(); m_softRigidWorld->addSoftBody(psb); @@ -436,7 +432,7 @@ void SerializeDemo::initPhysics() #endif //DESERIALIZE_SOFT_BODIES // fileLoader->setVerboseMode(true); - if (!fileLoader->loadFile("../SoftDemo/testFile.bullet")) + if (!fileLoader->loadFile("testFile.bullet")) { ///create a few basic rigid bodies and save them to testFile.bullet btCollisionShape* groundShape = new btBoxShape(btVector3(btScalar(50.),btScalar(50.),btScalar(50.))); diff --git a/src/BulletSoftBody/btSoftBody.cpp b/src/BulletSoftBody/btSoftBody.cpp index 15ef171af..1670aa1b7 100644 --- a/src/BulletSoftBody/btSoftBody.cpp +++ b/src/BulletSoftBody/btSoftBody.cpp @@ -3102,10 +3102,6 @@ const char* btSoftBody::serialize(void* dataBuffer, class btSerializer* serializ for (int i=0;im_bbending = m_links[i].m_bbending; - memPtr->m_c0 = m_links[i].m_c0; - memPtr->m_c1 = m_links[i].m_c1; - memPtr->m_c2 = m_links[i].m_c2; - m_links[i].m_c3.serializeFloat(memPtr->m_c3); memPtr->m_material = m_links[i].m_material? (SoftBodyMaterialData*)serializer->getUniquePointer((void*) m_links[i].m_material):0; memPtr->m_nodeIndices[0] = m_links[i].m_n[0] ? m_links[i].m_n[0] - &m_nodes[0]: -1; memPtr->m_nodeIndices[1] = m_links[i].m_n[1] ? m_links[i].m_n[1] - &m_nodes[0]: -1; diff --git a/src/BulletSoftBody/btSoftBodyData.h b/src/BulletSoftBody/btSoftBodyData.h index d367830eb..6b853bcb5 100644 --- a/src/BulletSoftBody/btSoftBodyData.h +++ b/src/BulletSoftBody/btSoftBodyData.h @@ -46,13 +46,8 @@ struct SoftBodyLinkData { SoftBodyMaterialData *m_material; int m_nodeIndices[2]; // Node pointers - btVector3FloatData m_c3; // gradient float m_restLength; // Rest length int m_bbending; // Bending link - float m_c0; // (ima+imb)*kLST - float m_c1; // rl^2 - float m_c2; // |gradient|^2/c0 - int m_pad; }; struct SoftBodyFaceData diff --git a/src/LinearMath/btSerializer.cpp b/src/LinearMath/btSerializer.cpp index 49b179f7d..e173ad5e1 100644 --- a/src/LinearMath/btSerializer.cpp +++ b/src/LinearMath/btSerializer.cpp @@ -1,5 +1,5 @@ unsigned char sBulletDNAstr[]= { -83,68,78,65,78,65,77,69,23,1,0,0,109,95,115,105,122,101,0,109, +83,68,78,65,78,65,77,69,22,1,0,0,109,95,115,105,122,101,0,109, 95,99,97,112,97,99,105,116,121,0,42,109,95,100,97,116,97,0,109,95, 99,111,108,108,105,115,105,111,110,83,104,97,112,101,115,0,109,95,99,111, 108,108,105,115,105,111,110,79,98,106,101,99,116,115,0,109,95,99,111,110, @@ -158,242 +158,242 @@ unsigned char sBulletDNAstr[]= { 105,116,121,0,109,95,97,99,99,117,109,117,108,97,116,101,100,70,111,114, 99,101,0,109,95,110,111,114,109,97,108,0,109,95,97,114,101,97,0,109, 95,97,116,116,97,99,104,0,109,95,112,97,100,0,109,95,110,111,100,101, -73,110,100,105,99,101,115,91,50,93,0,109,95,99,51,0,109,95,114,101, -115,116,76,101,110,103,116,104,0,109,95,98,98,101,110,100,105,110,103,0, -109,95,99,48,0,109,95,99,49,0,109,95,99,50,0,109,95,110,111,100, +73,110,100,105,99,101,115,91,50,93,0,109,95,114,101,115,116,76,101,110, +103,116,104,0,109,95,98,98,101,110,100,105,110,103,0,109,95,110,111,100, 101,73,110,100,105,99,101,115,91,51,93,0,109,95,114,101,115,116,65,114, 101,97,0,109,95,99,48,91,52,93,0,109,95,110,111,100,101,73,110,100, 105,99,101,115,91,52,93,0,109,95,114,101,115,116,86,111,108,117,109,101, -0,109,95,108,111,99,97,108,70,114,97,109,101,0,42,109,95,114,105,103, -105,100,66,111,100,121,0,109,95,110,111,100,101,73,110,100,101,120,0,109, -95,97,101,114,111,77,111,100,101,108,0,109,95,98,97,117,109,103,97,114, -116,101,0,109,95,100,114,97,103,0,109,95,108,105,102,116,0,109,95,112, -114,101,115,115,117,114,101,0,109,95,118,111,108,117,109,101,0,109,95,100, -121,110,97,109,105,99,70,114,105,99,116,105,111,110,0,109,95,112,111,115, -101,77,97,116,99,104,0,109,95,114,105,103,105,100,67,111,110,116,97,99, -116,72,97,114,100,110,101,115,115,0,109,95,107,105,110,101,116,105,99,67, -111,110,116,97,99,116,72,97,114,100,110,101,115,115,0,109,95,115,111,102, -116,67,111,110,116,97,99,116,72,97,114,100,110,101,115,115,0,109,95,97, -110,99,104,111,114,72,97,114,100,110,101,115,115,0,109,95,115,111,102,116, -82,105,103,105,100,67,108,117,115,116,101,114,72,97,114,100,110,101,115,115, -0,109,95,115,111,102,116,75,105,110,101,116,105,99,67,108,117,115,116,101, -114,72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,83,111,102,116, +0,109,95,99,49,0,109,95,99,50,0,109,95,99,48,0,109,95,108,111, +99,97,108,70,114,97,109,101,0,42,109,95,114,105,103,105,100,66,111,100, +121,0,109,95,110,111,100,101,73,110,100,101,120,0,109,95,97,101,114,111, +77,111,100,101,108,0,109,95,98,97,117,109,103,97,114,116,101,0,109,95, +100,114,97,103,0,109,95,108,105,102,116,0,109,95,112,114,101,115,115,117, +114,101,0,109,95,118,111,108,117,109,101,0,109,95,100,121,110,97,109,105, +99,70,114,105,99,116,105,111,110,0,109,95,112,111,115,101,77,97,116,99, +104,0,109,95,114,105,103,105,100,67,111,110,116,97,99,116,72,97,114,100, +110,101,115,115,0,109,95,107,105,110,101,116,105,99,67,111,110,116,97,99, +116,72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,67,111,110,116, +97,99,116,72,97,114,100,110,101,115,115,0,109,95,97,110,99,104,111,114, +72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,82,105,103,105,100, 67,108,117,115,116,101,114,72,97,114,100,110,101,115,115,0,109,95,115,111, -102,116,82,105,103,105,100,67,108,117,115,116,101,114,73,109,112,117,108,115, -101,83,112,108,105,116,0,109,95,115,111,102,116,75,105,110,101,116,105,99, -67,108,117,115,116,101,114,73,109,112,117,108,115,101,83,112,108,105,116,0, -109,95,115,111,102,116,83,111,102,116,67,108,117,115,116,101,114,73,109,112, -117,108,115,101,83,112,108,105,116,0,109,95,109,97,120,86,111,108,117,109, -101,0,109,95,116,105,109,101,83,99,97,108,101,0,109,95,118,101,108,111, -99,105,116,121,73,116,101,114,97,116,105,111,110,115,0,109,95,112,111,115, -105,116,105,111,110,73,116,101,114,97,116,105,111,110,115,0,109,95,100,114, -105,102,116,73,116,101,114,97,116,105,111,110,115,0,109,95,99,108,117,115, -116,101,114,73,116,101,114,97,116,105,111,110,115,0,109,95,114,111,116,0, -109,95,115,99,97,108,101,0,109,95,97,113,113,0,109,95,99,111,109,0, -42,109,95,112,111,115,105,116,105,111,110,115,0,42,109,95,119,101,105,103, -104,116,115,0,109,95,110,117,109,80,111,115,105,116,105,111,110,115,0,109, -95,110,117,109,87,101,105,103,116,115,0,109,95,98,118,111,108,117,109,101, -0,109,95,98,102,114,97,109,101,0,109,95,102,114,97,109,101,120,102,111, -114,109,0,109,95,108,111,99,105,105,0,109,95,105,110,118,119,105,0,109, -95,118,105,109,112,117,108,115,101,115,91,50,93,0,109,95,100,105,109,112, -117,108,115,101,115,91,50,93,0,109,95,108,118,0,109,95,97,118,0,42, -109,95,102,114,97,109,101,114,101,102,115,0,42,109,95,110,111,100,101,73, -110,100,105,99,101,115,0,42,109,95,109,97,115,115,101,115,0,109,95,110, -117,109,70,114,97,109,101,82,101,102,115,0,109,95,110,117,109,78,111,100, -101,115,0,109,95,110,117,109,77,97,115,115,101,115,0,109,95,105,100,109, -97,115,115,0,109,95,105,109,97,115,115,0,109,95,110,118,105,109,112,117, -108,115,101,115,0,109,95,110,100,105,109,112,117,108,115,101,115,0,109,95, -110,100,97,109,112,105,110,103,0,109,95,108,100,97,109,112,105,110,103,0, -109,95,97,100,97,109,112,105,110,103,0,109,95,109,97,116,99,104,105,110, -103,0,109,95,109,97,120,83,101,108,102,67,111,108,108,105,115,105,111,110, -73,109,112,117,108,115,101,0,109,95,115,101,108,102,67,111,108,108,105,115, -105,111,110,73,109,112,117,108,115,101,70,97,99,116,111,114,0,109,95,99, -111,110,116,97,105,110,115,65,110,99,104,111,114,0,109,95,99,111,108,108, -105,100,101,0,109,95,99,108,117,115,116,101,114,73,110,100,101,120,0,42, -109,95,112,111,115,101,0,42,42,109,95,109,97,116,101,114,105,97,108,115, -0,42,109,95,110,111,100,101,115,0,42,109,95,108,105,110,107,115,0,42, -109,95,102,97,99,101,115,0,42,109,95,116,101,116,114,97,104,101,100,114, -97,0,42,109,95,97,110,99,104,111,114,115,0,42,109,95,99,108,117,115, -116,101,114,115,0,109,95,110,117,109,77,97,116,101,114,105,97,108,115,0, -109,95,110,117,109,76,105,110,107,115,0,109,95,110,117,109,70,97,99,101, -115,0,109,95,110,117,109,84,101,116,114,97,104,101,100,114,97,0,109,95, -110,117,109,65,110,99,104,111,114,115,0,109,95,110,117,109,67,108,117,115, -116,101,114,115,0,109,95,99,111,110,102,105,103,0,0,0,84,89,80,69, -68,0,0,0,99,104,97,114,0,117,99,104,97,114,0,115,104,111,114,116, -0,117,115,104,111,114,116,0,105,110,116,0,108,111,110,103,0,117,108,111, -110,103,0,102,108,111,97,116,0,100,111,117,98,108,101,0,118,111,105,100, -0,80,111,105,110,116,101,114,65,114,114,97,121,0,98,116,80,104,121,115, -105,99,115,83,121,115,116,101,109,0,76,105,115,116,66,97,115,101,0,98, -116,86,101,99,116,111,114,51,70,108,111,97,116,68,97,116,97,0,98,116, -86,101,99,116,111,114,51,68,111,117,98,108,101,68,97,116,97,0,98,116, -77,97,116,114,105,120,51,120,51,70,108,111,97,116,68,97,116,97,0,98, -116,77,97,116,114,105,120,51,120,51,68,111,117,98,108,101,68,97,116,97, -0,98,116,84,114,97,110,115,102,111,114,109,70,108,111,97,116,68,97,116, -97,0,98,116,84,114,97,110,115,102,111,114,109,68,111,117,98,108,101,68, -97,116,97,0,98,116,66,118,104,83,117,98,116,114,101,101,73,110,102,111, -68,97,116,97,0,98,116,79,112,116,105,109,105,122,101,100,66,118,104,78, -111,100,101,70,108,111,97,116,68,97,116,97,0,98,116,79,112,116,105,109, -105,122,101,100,66,118,104,78,111,100,101,68,111,117,98,108,101,68,97,116, -97,0,98,116,81,117,97,110,116,105,122,101,100,66,118,104,78,111,100,101, -68,97,116,97,0,98,116,81,117,97,110,116,105,122,101,100,66,118,104,70, -108,111,97,116,68,97,116,97,0,98,116,81,117,97,110,116,105,122,101,100, -66,118,104,68,111,117,98,108,101,68,97,116,97,0,98,116,67,111,108,108, -105,115,105,111,110,83,104,97,112,101,68,97,116,97,0,98,116,83,116,97, -116,105,99,80,108,97,110,101,83,104,97,112,101,68,97,116,97,0,98,116, -67,111,110,118,101,120,73,110,116,101,114,110,97,108,83,104,97,112,101,68, -97,116,97,0,98,116,80,111,115,105,116,105,111,110,65,110,100,82,97,100, -105,117,115,0,98,116,77,117,108,116,105,83,112,104,101,114,101,83,104,97, -112,101,68,97,116,97,0,98,116,73,110,116,73,110,100,101,120,68,97,116, -97,0,98,116,83,104,111,114,116,73,110,116,73,110,100,101,120,68,97,116, -97,0,98,116,83,104,111,114,116,73,110,116,73,110,100,101,120,84,114,105, -112,108,101,116,68,97,116,97,0,98,116,77,101,115,104,80,97,114,116,68, -97,116,97,0,98,116,83,116,114,105,100,105,110,103,77,101,115,104,73,110, -116,101,114,102,97,99,101,68,97,116,97,0,98,116,84,114,105,97,110,103, -108,101,77,101,115,104,83,104,97,112,101,68,97,116,97,0,98,116,84,114, -105,97,110,103,108,101,73,110,102,111,77,97,112,68,97,116,97,0,98,116, -67,111,109,112,111,117,110,100,83,104,97,112,101,67,104,105,108,100,68,97, -116,97,0,98,116,67,111,109,112,111,117,110,100,83,104,97,112,101,68,97, -116,97,0,98,116,67,121,108,105,110,100,101,114,83,104,97,112,101,68,97, -116,97,0,98,116,67,97,112,115,117,108,101,83,104,97,112,101,68,97,116, -97,0,98,116,84,114,105,97,110,103,108,101,73,110,102,111,68,97,116,97, -0,98,116,71,73,109,112,97,99,116,77,101,115,104,83,104,97,112,101,68, -97,116,97,0,98,116,67,111,110,118,101,120,72,117,108,108,83,104,97,112, -101,68,97,116,97,0,98,116,67,111,108,108,105,115,105,111,110,79,98,106, -101,99,116,68,111,117,98,108,101,68,97,116,97,0,98,116,67,111,108,108, -105,115,105,111,110,79,98,106,101,99,116,70,108,111,97,116,68,97,116,97, -0,98,116,82,105,103,105,100,66,111,100,121,70,108,111,97,116,68,97,116, -97,0,98,116,82,105,103,105,100,66,111,100,121,68,111,117,98,108,101,68, -97,116,97,0,98,116,67,111,110,115,116,114,97,105,110,116,73,110,102,111, -49,0,98,116,84,121,112,101,100,67,111,110,115,116,114,97,105,110,116,68, -97,116,97,0,98,116,82,105,103,105,100,66,111,100,121,68,97,116,97,0, -98,116,80,111,105,110,116,50,80,111,105,110,116,67,111,110,115,116,114,97, -105,110,116,70,108,111,97,116,68,97,116,97,0,98,116,80,111,105,110,116, -50,80,111,105,110,116,67,111,110,115,116,114,97,105,110,116,68,111,117,98, -108,101,68,97,116,97,0,98,116,72,105,110,103,101,67,111,110,115,116,114, -97,105,110,116,68,111,117,98,108,101,68,97,116,97,0,98,116,72,105,110, -103,101,67,111,110,115,116,114,97,105,110,116,70,108,111,97,116,68,97,116, -97,0,98,116,67,111,110,101,84,119,105,115,116,67,111,110,115,116,114,97, -105,110,116,68,97,116,97,0,98,116,71,101,110,101,114,105,99,54,68,111, -102,67,111,110,115,116,114,97,105,110,116,68,97,116,97,0,98,116,83,108, -105,100,101,114,67,111,110,115,116,114,97,105,110,116,68,97,116,97,0,83, -111,102,116,66,111,100,121,77,97,116,101,114,105,97,108,68,97,116,97,0, -83,111,102,116,66,111,100,121,78,111,100,101,68,97,116,97,0,83,111,102, -116,66,111,100,121,76,105,110,107,68,97,116,97,0,83,111,102,116,66,111, -100,121,70,97,99,101,68,97,116,97,0,83,111,102,116,66,111,100,121,84, -101,116,114,97,68,97,116,97,0,83,111,102,116,82,105,103,105,100,65,110, -99,104,111,114,68,97,116,97,0,83,111,102,116,66,111,100,121,67,111,110, -102,105,103,68,97,116,97,0,83,111,102,116,66,111,100,121,80,111,115,101, -68,97,116,97,0,83,111,102,116,66,111,100,121,67,108,117,115,116,101,114, -68,97,116,97,0,98,116,83,111,102,116,66,111,100,121,70,108,111,97,116, -68,97,116,97,0,0,0,0,84,76,69,78,1,0,1,0,2,0,2,0, -4,0,4,0,4,0,4,0,8,0,0,0,12,0,36,0,8,0,16,0, -32,0,48,0,96,0,64,0,-128,0,20,0,48,0,80,0,16,0,84,0, --124,0,12,0,52,0,52,0,20,0,64,0,4,0,4,0,8,0,28,0, -28,0,60,0,56,0,76,0,24,0,60,0,60,0,16,0,64,0,68,0, --56,1,-8,0,-32,1,-104,3,8,0,44,0,0,0,76,0,108,0,84,1, --44,0,-52,0,-12,0,-60,0,16,0,100,0,52,0,36,0,100,0,92,0, -104,0,-64,0,92,1,-96,1,83,84,82,67,57,0,0,0,10,0,3,0, -4,0,0,0,4,0,1,0,9,0,2,0,11,0,3,0,10,0,3,0, -10,0,4,0,10,0,5,0,12,0,2,0,9,0,6,0,9,0,7,0, -13,0,1,0,7,0,8,0,14,0,1,0,8,0,8,0,15,0,1,0, -13,0,9,0,16,0,1,0,14,0,9,0,17,0,2,0,15,0,10,0, -13,0,11,0,18,0,2,0,16,0,10,0,14,0,11,0,19,0,4,0, -4,0,12,0,4,0,13,0,2,0,14,0,2,0,15,0,20,0,6,0, -13,0,16,0,13,0,17,0,4,0,18,0,4,0,19,0,4,0,20,0, -0,0,21,0,21,0,6,0,14,0,16,0,14,0,17,0,4,0,18,0, -4,0,19,0,4,0,20,0,0,0,21,0,22,0,3,0,2,0,14,0, -2,0,15,0,4,0,22,0,23,0,12,0,13,0,23,0,13,0,24,0, -13,0,25,0,4,0,26,0,4,0,27,0,4,0,28,0,4,0,29,0, -20,0,30,0,22,0,31,0,19,0,32,0,4,0,33,0,4,0,34,0, -24,0,12,0,14,0,23,0,14,0,24,0,14,0,25,0,4,0,26,0, -4,0,27,0,4,0,28,0,4,0,29,0,21,0,30,0,22,0,31,0, -4,0,33,0,4,0,34,0,19,0,32,0,25,0,3,0,0,0,35,0, -4,0,36,0,0,0,37,0,26,0,5,0,25,0,38,0,13,0,39,0, -13,0,40,0,7,0,41,0,0,0,21,0,27,0,5,0,25,0,38,0, -13,0,39,0,13,0,42,0,7,0,43,0,4,0,44,0,28,0,2,0, -13,0,45,0,7,0,46,0,29,0,4,0,27,0,47,0,28,0,48,0, -4,0,49,0,0,0,37,0,30,0,1,0,4,0,50,0,31,0,2,0, -2,0,50,0,0,0,51,0,32,0,2,0,2,0,52,0,0,0,51,0, -33,0,7,0,13,0,53,0,14,0,54,0,30,0,55,0,32,0,56,0, -31,0,57,0,4,0,58,0,4,0,59,0,34,0,4,0,33,0,60,0, -13,0,61,0,4,0,62,0,0,0,37,0,35,0,7,0,25,0,38,0, -34,0,63,0,23,0,64,0,24,0,65,0,36,0,66,0,7,0,43,0, -0,0,67,0,37,0,4,0,17,0,68,0,25,0,69,0,4,0,70,0, -7,0,71,0,38,0,4,0,25,0,38,0,37,0,72,0,4,0,73,0, -7,0,43,0,39,0,3,0,27,0,47,0,4,0,74,0,0,0,37,0, -40,0,3,0,27,0,47,0,4,0,74,0,0,0,37,0,41,0,4,0, -4,0,75,0,7,0,76,0,7,0,77,0,7,0,78,0,36,0,14,0, -4,0,79,0,4,0,80,0,41,0,81,0,4,0,82,0,7,0,83,0, -7,0,84,0,7,0,85,0,7,0,86,0,7,0,87,0,4,0,88,0, -4,0,89,0,4,0,90,0,4,0,91,0,0,0,37,0,42,0,5,0, -25,0,38,0,34,0,63,0,13,0,39,0,7,0,43,0,4,0,92,0, -43,0,5,0,27,0,47,0,13,0,93,0,14,0,94,0,4,0,95,0, -0,0,96,0,44,0,24,0,9,0,97,0,9,0,98,0,25,0,99,0, -0,0,35,0,18,0,100,0,18,0,101,0,14,0,102,0,14,0,103,0, -14,0,104,0,8,0,105,0,8,0,106,0,8,0,107,0,8,0,108,0, -8,0,109,0,8,0,110,0,8,0,111,0,4,0,112,0,4,0,113,0, -4,0,114,0,4,0,115,0,4,0,116,0,4,0,117,0,4,0,118,0, -0,0,37,0,45,0,23,0,9,0,97,0,9,0,98,0,25,0,99,0, -0,0,35,0,17,0,100,0,17,0,101,0,13,0,102,0,13,0,103,0, -13,0,104,0,7,0,105,0,7,0,106,0,7,0,107,0,7,0,108,0, -7,0,109,0,7,0,110,0,7,0,111,0,4,0,112,0,4,0,113,0, -4,0,114,0,4,0,115,0,4,0,116,0,4,0,117,0,4,0,118,0, -46,0,21,0,45,0,119,0,15,0,120,0,13,0,121,0,13,0,122,0, -13,0,123,0,13,0,124,0,13,0,125,0,13,0,126,0,13,0,127,0, -13,0,-128,0,13,0,-127,0,7,0,-126,0,7,0,-125,0,7,0,-124,0, -7,0,-123,0,7,0,-122,0,7,0,-121,0,7,0,-120,0,7,0,-119,0, -7,0,-118,0,4,0,-117,0,47,0,22,0,44,0,119,0,16,0,120,0, -14,0,121,0,14,0,122,0,14,0,123,0,14,0,124,0,14,0,125,0, -14,0,126,0,14,0,127,0,14,0,-128,0,14,0,-127,0,8,0,-126,0, -8,0,-125,0,8,0,-124,0,8,0,-123,0,8,0,-122,0,8,0,-121,0, -8,0,-120,0,8,0,-119,0,8,0,-118,0,4,0,-117,0,0,0,37,0, -48,0,2,0,4,0,-116,0,4,0,-115,0,49,0,11,0,50,0,-114,0, -50,0,-113,0,0,0,35,0,4,0,-112,0,4,0,-111,0,4,0,-110,0, -4,0,-109,0,7,0,-108,0,7,0,-107,0,4,0,-106,0,0,0,-105,0, -51,0,3,0,49,0,-104,0,13,0,-103,0,13,0,-102,0,52,0,3,0, -49,0,-104,0,14,0,-103,0,14,0,-102,0,53,0,13,0,49,0,-104,0, -18,0,-101,0,18,0,-100,0,4,0,-99,0,4,0,-98,0,4,0,-97,0, -7,0,-96,0,7,0,-95,0,7,0,-94,0,7,0,-93,0,7,0,-92,0, -7,0,-91,0,7,0,-90,0,54,0,13,0,49,0,-104,0,17,0,-101,0, -17,0,-100,0,4,0,-99,0,4,0,-98,0,4,0,-97,0,7,0,-96,0, +102,116,75,105,110,101,116,105,99,67,108,117,115,116,101,114,72,97,114,100, +110,101,115,115,0,109,95,115,111,102,116,83,111,102,116,67,108,117,115,116, +101,114,72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,82,105,103, +105,100,67,108,117,115,116,101,114,73,109,112,117,108,115,101,83,112,108,105, +116,0,109,95,115,111,102,116,75,105,110,101,116,105,99,67,108,117,115,116, +101,114,73,109,112,117,108,115,101,83,112,108,105,116,0,109,95,115,111,102, +116,83,111,102,116,67,108,117,115,116,101,114,73,109,112,117,108,115,101,83, +112,108,105,116,0,109,95,109,97,120,86,111,108,117,109,101,0,109,95,116, +105,109,101,83,99,97,108,101,0,109,95,118,101,108,111,99,105,116,121,73, +116,101,114,97,116,105,111,110,115,0,109,95,112,111,115,105,116,105,111,110, +73,116,101,114,97,116,105,111,110,115,0,109,95,100,114,105,102,116,73,116, +101,114,97,116,105,111,110,115,0,109,95,99,108,117,115,116,101,114,73,116, +101,114,97,116,105,111,110,115,0,109,95,114,111,116,0,109,95,115,99,97, +108,101,0,109,95,97,113,113,0,109,95,99,111,109,0,42,109,95,112,111, +115,105,116,105,111,110,115,0,42,109,95,119,101,105,103,104,116,115,0,109, +95,110,117,109,80,111,115,105,116,105,111,110,115,0,109,95,110,117,109,87, +101,105,103,116,115,0,109,95,98,118,111,108,117,109,101,0,109,95,98,102, +114,97,109,101,0,109,95,102,114,97,109,101,120,102,111,114,109,0,109,95, +108,111,99,105,105,0,109,95,105,110,118,119,105,0,109,95,118,105,109,112, +117,108,115,101,115,91,50,93,0,109,95,100,105,109,112,117,108,115,101,115, +91,50,93,0,109,95,108,118,0,109,95,97,118,0,42,109,95,102,114,97, +109,101,114,101,102,115,0,42,109,95,110,111,100,101,73,110,100,105,99,101, +115,0,42,109,95,109,97,115,115,101,115,0,109,95,110,117,109,70,114,97, +109,101,82,101,102,115,0,109,95,110,117,109,78,111,100,101,115,0,109,95, +110,117,109,77,97,115,115,101,115,0,109,95,105,100,109,97,115,115,0,109, +95,105,109,97,115,115,0,109,95,110,118,105,109,112,117,108,115,101,115,0, +109,95,110,100,105,109,112,117,108,115,101,115,0,109,95,110,100,97,109,112, +105,110,103,0,109,95,108,100,97,109,112,105,110,103,0,109,95,97,100,97, +109,112,105,110,103,0,109,95,109,97,116,99,104,105,110,103,0,109,95,109, +97,120,83,101,108,102,67,111,108,108,105,115,105,111,110,73,109,112,117,108, +115,101,0,109,95,115,101,108,102,67,111,108,108,105,115,105,111,110,73,109, +112,117,108,115,101,70,97,99,116,111,114,0,109,95,99,111,110,116,97,105, +110,115,65,110,99,104,111,114,0,109,95,99,111,108,108,105,100,101,0,109, +95,99,108,117,115,116,101,114,73,110,100,101,120,0,42,109,95,112,111,115, +101,0,42,42,109,95,109,97,116,101,114,105,97,108,115,0,42,109,95,110, +111,100,101,115,0,42,109,95,108,105,110,107,115,0,42,109,95,102,97,99, +101,115,0,42,109,95,116,101,116,114,97,104,101,100,114,97,0,42,109,95, +97,110,99,104,111,114,115,0,42,109,95,99,108,117,115,116,101,114,115,0, +109,95,110,117,109,77,97,116,101,114,105,97,108,115,0,109,95,110,117,109, +76,105,110,107,115,0,109,95,110,117,109,70,97,99,101,115,0,109,95,110, +117,109,84,101,116,114,97,104,101,100,114,97,0,109,95,110,117,109,65,110, +99,104,111,114,115,0,109,95,110,117,109,67,108,117,115,116,101,114,115,0, +109,95,99,111,110,102,105,103,0,0,0,0,84,89,80,69,68,0,0,0, +99,104,97,114,0,117,99,104,97,114,0,115,104,111,114,116,0,117,115,104, +111,114,116,0,105,110,116,0,108,111,110,103,0,117,108,111,110,103,0,102, +108,111,97,116,0,100,111,117,98,108,101,0,118,111,105,100,0,80,111,105, +110,116,101,114,65,114,114,97,121,0,98,116,80,104,121,115,105,99,115,83, +121,115,116,101,109,0,76,105,115,116,66,97,115,101,0,98,116,86,101,99, +116,111,114,51,70,108,111,97,116,68,97,116,97,0,98,116,86,101,99,116, +111,114,51,68,111,117,98,108,101,68,97,116,97,0,98,116,77,97,116,114, +105,120,51,120,51,70,108,111,97,116,68,97,116,97,0,98,116,77,97,116, +114,105,120,51,120,51,68,111,117,98,108,101,68,97,116,97,0,98,116,84, +114,97,110,115,102,111,114,109,70,108,111,97,116,68,97,116,97,0,98,116, +84,114,97,110,115,102,111,114,109,68,111,117,98,108,101,68,97,116,97,0, +98,116,66,118,104,83,117,98,116,114,101,101,73,110,102,111,68,97,116,97, +0,98,116,79,112,116,105,109,105,122,101,100,66,118,104,78,111,100,101,70, +108,111,97,116,68,97,116,97,0,98,116,79,112,116,105,109,105,122,101,100, +66,118,104,78,111,100,101,68,111,117,98,108,101,68,97,116,97,0,98,116, +81,117,97,110,116,105,122,101,100,66,118,104,78,111,100,101,68,97,116,97, +0,98,116,81,117,97,110,116,105,122,101,100,66,118,104,70,108,111,97,116, +68,97,116,97,0,98,116,81,117,97,110,116,105,122,101,100,66,118,104,68, +111,117,98,108,101,68,97,116,97,0,98,116,67,111,108,108,105,115,105,111, +110,83,104,97,112,101,68,97,116,97,0,98,116,83,116,97,116,105,99,80, +108,97,110,101,83,104,97,112,101,68,97,116,97,0,98,116,67,111,110,118, +101,120,73,110,116,101,114,110,97,108,83,104,97,112,101,68,97,116,97,0, +98,116,80,111,115,105,116,105,111,110,65,110,100,82,97,100,105,117,115,0, +98,116,77,117,108,116,105,83,112,104,101,114,101,83,104,97,112,101,68,97, +116,97,0,98,116,73,110,116,73,110,100,101,120,68,97,116,97,0,98,116, +83,104,111,114,116,73,110,116,73,110,100,101,120,68,97,116,97,0,98,116, +83,104,111,114,116,73,110,116,73,110,100,101,120,84,114,105,112,108,101,116, +68,97,116,97,0,98,116,77,101,115,104,80,97,114,116,68,97,116,97,0, +98,116,83,116,114,105,100,105,110,103,77,101,115,104,73,110,116,101,114,102, +97,99,101,68,97,116,97,0,98,116,84,114,105,97,110,103,108,101,77,101, +115,104,83,104,97,112,101,68,97,116,97,0,98,116,84,114,105,97,110,103, +108,101,73,110,102,111,77,97,112,68,97,116,97,0,98,116,67,111,109,112, +111,117,110,100,83,104,97,112,101,67,104,105,108,100,68,97,116,97,0,98, +116,67,111,109,112,111,117,110,100,83,104,97,112,101,68,97,116,97,0,98, +116,67,121,108,105,110,100,101,114,83,104,97,112,101,68,97,116,97,0,98, +116,67,97,112,115,117,108,101,83,104,97,112,101,68,97,116,97,0,98,116, +84,114,105,97,110,103,108,101,73,110,102,111,68,97,116,97,0,98,116,71, +73,109,112,97,99,116,77,101,115,104,83,104,97,112,101,68,97,116,97,0, +98,116,67,111,110,118,101,120,72,117,108,108,83,104,97,112,101,68,97,116, +97,0,98,116,67,111,108,108,105,115,105,111,110,79,98,106,101,99,116,68, +111,117,98,108,101,68,97,116,97,0,98,116,67,111,108,108,105,115,105,111, +110,79,98,106,101,99,116,70,108,111,97,116,68,97,116,97,0,98,116,82, +105,103,105,100,66,111,100,121,70,108,111,97,116,68,97,116,97,0,98,116, +82,105,103,105,100,66,111,100,121,68,111,117,98,108,101,68,97,116,97,0, +98,116,67,111,110,115,116,114,97,105,110,116,73,110,102,111,49,0,98,116, +84,121,112,101,100,67,111,110,115,116,114,97,105,110,116,68,97,116,97,0, +98,116,82,105,103,105,100,66,111,100,121,68,97,116,97,0,98,116,80,111, +105,110,116,50,80,111,105,110,116,67,111,110,115,116,114,97,105,110,116,70, +108,111,97,116,68,97,116,97,0,98,116,80,111,105,110,116,50,80,111,105, +110,116,67,111,110,115,116,114,97,105,110,116,68,111,117,98,108,101,68,97, +116,97,0,98,116,72,105,110,103,101,67,111,110,115,116,114,97,105,110,116, +68,111,117,98,108,101,68,97,116,97,0,98,116,72,105,110,103,101,67,111, +110,115,116,114,97,105,110,116,70,108,111,97,116,68,97,116,97,0,98,116, +67,111,110,101,84,119,105,115,116,67,111,110,115,116,114,97,105,110,116,68, +97,116,97,0,98,116,71,101,110,101,114,105,99,54,68,111,102,67,111,110, +115,116,114,97,105,110,116,68,97,116,97,0,98,116,83,108,105,100,101,114, +67,111,110,115,116,114,97,105,110,116,68,97,116,97,0,83,111,102,116,66, +111,100,121,77,97,116,101,114,105,97,108,68,97,116,97,0,83,111,102,116, +66,111,100,121,78,111,100,101,68,97,116,97,0,83,111,102,116,66,111,100, +121,76,105,110,107,68,97,116,97,0,83,111,102,116,66,111,100,121,70,97, +99,101,68,97,116,97,0,83,111,102,116,66,111,100,121,84,101,116,114,97, +68,97,116,97,0,83,111,102,116,82,105,103,105,100,65,110,99,104,111,114, +68,97,116,97,0,83,111,102,116,66,111,100,121,67,111,110,102,105,103,68, +97,116,97,0,83,111,102,116,66,111,100,121,80,111,115,101,68,97,116,97, +0,83,111,102,116,66,111,100,121,67,108,117,115,116,101,114,68,97,116,97, +0,98,116,83,111,102,116,66,111,100,121,70,108,111,97,116,68,97,116,97, +0,0,0,0,84,76,69,78,1,0,1,0,2,0,2,0,4,0,4,0, +4,0,4,0,8,0,0,0,12,0,36,0,8,0,16,0,32,0,48,0, +96,0,64,0,-128,0,20,0,48,0,80,0,16,0,84,0,-124,0,12,0, +52,0,52,0,20,0,64,0,4,0,4,0,8,0,28,0,28,0,60,0, +56,0,76,0,24,0,60,0,60,0,16,0,64,0,68,0,-56,1,-8,0, +-32,1,-104,3,8,0,44,0,0,0,76,0,108,0,84,1,-44,0,-52,0, +-12,0,-60,0,16,0,100,0,20,0,36,0,100,0,92,0,104,0,-64,0, +92,1,-96,1,83,84,82,67,57,0,0,0,10,0,3,0,4,0,0,0, +4,0,1,0,9,0,2,0,11,0,3,0,10,0,3,0,10,0,4,0, +10,0,5,0,12,0,2,0,9,0,6,0,9,0,7,0,13,0,1,0, +7,0,8,0,14,0,1,0,8,0,8,0,15,0,1,0,13,0,9,0, +16,0,1,0,14,0,9,0,17,0,2,0,15,0,10,0,13,0,11,0, +18,0,2,0,16,0,10,0,14,0,11,0,19,0,4,0,4,0,12,0, +4,0,13,0,2,0,14,0,2,0,15,0,20,0,6,0,13,0,16,0, +13,0,17,0,4,0,18,0,4,0,19,0,4,0,20,0,0,0,21,0, +21,0,6,0,14,0,16,0,14,0,17,0,4,0,18,0,4,0,19,0, +4,0,20,0,0,0,21,0,22,0,3,0,2,0,14,0,2,0,15,0, +4,0,22,0,23,0,12,0,13,0,23,0,13,0,24,0,13,0,25,0, +4,0,26,0,4,0,27,0,4,0,28,0,4,0,29,0,20,0,30,0, +22,0,31,0,19,0,32,0,4,0,33,0,4,0,34,0,24,0,12,0, +14,0,23,0,14,0,24,0,14,0,25,0,4,0,26,0,4,0,27,0, +4,0,28,0,4,0,29,0,21,0,30,0,22,0,31,0,4,0,33,0, +4,0,34,0,19,0,32,0,25,0,3,0,0,0,35,0,4,0,36,0, +0,0,37,0,26,0,5,0,25,0,38,0,13,0,39,0,13,0,40,0, +7,0,41,0,0,0,21,0,27,0,5,0,25,0,38,0,13,0,39,0, +13,0,42,0,7,0,43,0,4,0,44,0,28,0,2,0,13,0,45,0, +7,0,46,0,29,0,4,0,27,0,47,0,28,0,48,0,4,0,49,0, +0,0,37,0,30,0,1,0,4,0,50,0,31,0,2,0,2,0,50,0, +0,0,51,0,32,0,2,0,2,0,52,0,0,0,51,0,33,0,7,0, +13,0,53,0,14,0,54,0,30,0,55,0,32,0,56,0,31,0,57,0, +4,0,58,0,4,0,59,0,34,0,4,0,33,0,60,0,13,0,61,0, +4,0,62,0,0,0,37,0,35,0,7,0,25,0,38,0,34,0,63,0, +23,0,64,0,24,0,65,0,36,0,66,0,7,0,43,0,0,0,67,0, +37,0,4,0,17,0,68,0,25,0,69,0,4,0,70,0,7,0,71,0, +38,0,4,0,25,0,38,0,37,0,72,0,4,0,73,0,7,0,43,0, +39,0,3,0,27,0,47,0,4,0,74,0,0,0,37,0,40,0,3,0, +27,0,47,0,4,0,74,0,0,0,37,0,41,0,4,0,4,0,75,0, +7,0,76,0,7,0,77,0,7,0,78,0,36,0,14,0,4,0,79,0, +4,0,80,0,41,0,81,0,4,0,82,0,7,0,83,0,7,0,84,0, +7,0,85,0,7,0,86,0,7,0,87,0,4,0,88,0,4,0,89,0, +4,0,90,0,4,0,91,0,0,0,37,0,42,0,5,0,25,0,38,0, +34,0,63,0,13,0,39,0,7,0,43,0,4,0,92,0,43,0,5,0, +27,0,47,0,13,0,93,0,14,0,94,0,4,0,95,0,0,0,96,0, +44,0,24,0,9,0,97,0,9,0,98,0,25,0,99,0,0,0,35,0, +18,0,100,0,18,0,101,0,14,0,102,0,14,0,103,0,14,0,104,0, +8,0,105,0,8,0,106,0,8,0,107,0,8,0,108,0,8,0,109,0, +8,0,110,0,8,0,111,0,4,0,112,0,4,0,113,0,4,0,114,0, +4,0,115,0,4,0,116,0,4,0,117,0,4,0,118,0,0,0,37,0, +45,0,23,0,9,0,97,0,9,0,98,0,25,0,99,0,0,0,35,0, +17,0,100,0,17,0,101,0,13,0,102,0,13,0,103,0,13,0,104,0, +7,0,105,0,7,0,106,0,7,0,107,0,7,0,108,0,7,0,109,0, +7,0,110,0,7,0,111,0,4,0,112,0,4,0,113,0,4,0,114,0, +4,0,115,0,4,0,116,0,4,0,117,0,4,0,118,0,46,0,21,0, +45,0,119,0,15,0,120,0,13,0,121,0,13,0,122,0,13,0,123,0, +13,0,124,0,13,0,125,0,13,0,126,0,13,0,127,0,13,0,-128,0, +13,0,-127,0,7,0,-126,0,7,0,-125,0,7,0,-124,0,7,0,-123,0, +7,0,-122,0,7,0,-121,0,7,0,-120,0,7,0,-119,0,7,0,-118,0, +4,0,-117,0,47,0,22,0,44,0,119,0,16,0,120,0,14,0,121,0, +14,0,122,0,14,0,123,0,14,0,124,0,14,0,125,0,14,0,126,0, +14,0,127,0,14,0,-128,0,14,0,-127,0,8,0,-126,0,8,0,-125,0, +8,0,-124,0,8,0,-123,0,8,0,-122,0,8,0,-121,0,8,0,-120,0, +8,0,-119,0,8,0,-118,0,4,0,-117,0,0,0,37,0,48,0,2,0, +4,0,-116,0,4,0,-115,0,49,0,11,0,50,0,-114,0,50,0,-113,0, +0,0,35,0,4,0,-112,0,4,0,-111,0,4,0,-110,0,4,0,-109,0, +7,0,-108,0,7,0,-107,0,4,0,-106,0,0,0,-105,0,51,0,3,0, +49,0,-104,0,13,0,-103,0,13,0,-102,0,52,0,3,0,49,0,-104,0, +14,0,-103,0,14,0,-102,0,53,0,13,0,49,0,-104,0,18,0,-101,0, +18,0,-100,0,4,0,-99,0,4,0,-98,0,4,0,-97,0,7,0,-96,0, 7,0,-95,0,7,0,-94,0,7,0,-93,0,7,0,-92,0,7,0,-91,0, -7,0,-90,0,55,0,11,0,49,0,-104,0,17,0,-101,0,17,0,-100,0, -7,0,-89,0,7,0,-88,0,7,0,-87,0,7,0,-92,0,7,0,-91,0, -7,0,-90,0,7,0,-86,0,0,0,21,0,56,0,9,0,49,0,-104,0, -17,0,-101,0,17,0,-100,0,13,0,-85,0,13,0,-84,0,13,0,-83,0, -13,0,-82,0,4,0,-81,0,4,0,-80,0,57,0,9,0,49,0,-104,0, -17,0,-101,0,17,0,-100,0,7,0,-85,0,7,0,-84,0,7,0,-83,0, -7,0,-82,0,4,0,-81,0,4,0,-80,0,58,0,4,0,7,0,-79,0, -7,0,-78,0,7,0,-77,0,4,0,75,0,59,0,10,0,58,0,-76,0, -13,0,-75,0,13,0,-74,0,13,0,-73,0,13,0,-72,0,13,0,-71,0, -7,0,-126,0,7,0,-70,0,4,0,-69,0,4,0,-68,0,60,0,9,0, -58,0,-76,0,4,0,-67,0,13,0,-66,0,7,0,-65,0,4,0,-64,0, -7,0,-63,0,7,0,-62,0,7,0,-61,0,4,0,-68,0,61,0,4,0, -13,0,-71,0,58,0,-76,0,4,0,-60,0,7,0,-59,0,62,0,7,0, -13,0,-58,0,58,0,-76,0,4,0,-57,0,7,0,-56,0,7,0,-62,0, -7,0,-61,0,4,0,-68,0,63,0,6,0,15,0,-63,0,13,0,-62,0, -13,0,-55,0,50,0,-54,0,4,0,-53,0,7,0,-61,0,64,0,26,0, -4,0,-52,0,7,0,-51,0,7,0,-86,0,7,0,-50,0,7,0,-49,0, +7,0,-90,0,54,0,13,0,49,0,-104,0,17,0,-101,0,17,0,-100,0, +4,0,-99,0,4,0,-98,0,4,0,-97,0,7,0,-96,0,7,0,-95,0, +7,0,-94,0,7,0,-93,0,7,0,-92,0,7,0,-91,0,7,0,-90,0, +55,0,11,0,49,0,-104,0,17,0,-101,0,17,0,-100,0,7,0,-89,0, +7,0,-88,0,7,0,-87,0,7,0,-92,0,7,0,-91,0,7,0,-90,0, +7,0,-86,0,0,0,21,0,56,0,9,0,49,0,-104,0,17,0,-101,0, +17,0,-100,0,13,0,-85,0,13,0,-84,0,13,0,-83,0,13,0,-82,0, +4,0,-81,0,4,0,-80,0,57,0,9,0,49,0,-104,0,17,0,-101,0, +17,0,-100,0,7,0,-85,0,7,0,-84,0,7,0,-83,0,7,0,-82,0, +4,0,-81,0,4,0,-80,0,58,0,4,0,7,0,-79,0,7,0,-78,0, +7,0,-77,0,4,0,75,0,59,0,10,0,58,0,-76,0,13,0,-75,0, +13,0,-74,0,13,0,-73,0,13,0,-72,0,13,0,-71,0,7,0,-126,0, +7,0,-70,0,4,0,-69,0,4,0,-68,0,60,0,4,0,58,0,-76,0, +4,0,-67,0,7,0,-66,0,4,0,-65,0,61,0,4,0,13,0,-71,0, +58,0,-76,0,4,0,-64,0,7,0,-63,0,62,0,7,0,13,0,-62,0, +58,0,-76,0,4,0,-61,0,7,0,-60,0,7,0,-59,0,7,0,-58,0, +4,0,-68,0,63,0,6,0,15,0,-57,0,13,0,-59,0,13,0,-56,0, +50,0,-55,0,4,0,-54,0,7,0,-58,0,64,0,26,0,4,0,-53,0, +7,0,-52,0,7,0,-86,0,7,0,-51,0,7,0,-50,0,7,0,-49,0, 7,0,-48,0,7,0,-47,0,7,0,-46,0,7,0,-45,0,7,0,-44,0, 7,0,-43,0,7,0,-42,0,7,0,-41,0,7,0,-40,0,7,0,-39,0, 7,0,-38,0,7,0,-37,0,7,0,-36,0,7,0,-35,0,7,0,-34,0, -7,0,-33,0,4,0,-32,0,4,0,-31,0,4,0,-30,0,4,0,-29,0, -4,0,113,0,65,0,12,0,15,0,-28,0,15,0,-27,0,15,0,-26,0, -13,0,-25,0,13,0,-24,0,7,0,-23,0,4,0,-22,0,4,0,-21,0, -4,0,-20,0,4,0,-19,0,7,0,-56,0,4,0,-68,0,66,0,27,0, -17,0,-18,0,15,0,-17,0,15,0,-16,0,13,0,-25,0,13,0,-15,0, -13,0,-14,0,13,0,-13,0,13,0,-12,0,13,0,-11,0,4,0,-10,0, -7,0,-9,0,4,0,-8,0,4,0,-7,0,4,0,-6,0,7,0,-5,0, -7,0,-4,0,4,0,-3,0,4,0,-2,0,7,0,-1,0,7,0,0,1, -7,0,1,1,7,0,2,1,7,0,3,1,7,0,4,1,4,0,5,1, -4,0,6,1,4,0,7,1,67,0,18,0,45,0,119,0,65,0,8,1, -58,0,9,1,59,0,10,1,60,0,11,1,61,0,12,1,62,0,13,1, -63,0,14,1,66,0,15,1,4,0,16,1,4,0,-7,0,4,0,17,1, -4,0,18,1,4,0,19,1,4,0,20,1,4,0,21,1,4,0,-68,0, -64,0,22,1,}; +4,0,-33,0,4,0,-32,0,4,0,-31,0,4,0,-30,0,4,0,113,0, +65,0,12,0,15,0,-29,0,15,0,-28,0,15,0,-27,0,13,0,-26,0, +13,0,-25,0,7,0,-24,0,4,0,-23,0,4,0,-22,0,4,0,-21,0, +4,0,-20,0,7,0,-60,0,4,0,-68,0,66,0,27,0,17,0,-19,0, +15,0,-18,0,15,0,-17,0,13,0,-26,0,13,0,-16,0,13,0,-15,0, +13,0,-14,0,13,0,-13,0,13,0,-12,0,4,0,-11,0,7,0,-10,0, +4,0,-9,0,4,0,-8,0,4,0,-7,0,7,0,-6,0,7,0,-5,0, +4,0,-4,0,4,0,-3,0,7,0,-2,0,7,0,-1,0,7,0,0,1, +7,0,1,1,7,0,2,1,7,0,3,1,4,0,4,1,4,0,5,1, +4,0,6,1,67,0,18,0,45,0,119,0,65,0,7,1,58,0,8,1, +59,0,9,1,60,0,10,1,61,0,11,1,62,0,12,1,63,0,13,1, +66,0,14,1,4,0,15,1,4,0,-8,0,4,0,16,1,4,0,17,1, +4,0,18,1,4,0,19,1,4,0,20,1,4,0,-68,0,64,0,21,1, +}; int sBulletDNAlen= sizeof(sBulletDNAstr); + unsigned char sBulletDNAstr64[]= { -83,68,78,65,78,65,77,69,23,1,0,0,109,95,115,105,122,101,0,109, +83,68,78,65,78,65,77,69,22,1,0,0,109,95,115,105,122,101,0,109, 95,99,97,112,97,99,105,116,121,0,42,109,95,100,97,116,97,0,109,95, 99,111,108,108,105,115,105,111,110,83,104,97,112,101,115,0,109,95,99,111, 108,108,105,115,105,111,110,79,98,106,101,99,116,115,0,109,95,99,111,110, @@ -552,237 +552,236 @@ unsigned char sBulletDNAstr64[]= { 105,116,121,0,109,95,97,99,99,117,109,117,108,97,116,101,100,70,111,114, 99,101,0,109,95,110,111,114,109,97,108,0,109,95,97,114,101,97,0,109, 95,97,116,116,97,99,104,0,109,95,112,97,100,0,109,95,110,111,100,101, -73,110,100,105,99,101,115,91,50,93,0,109,95,99,51,0,109,95,114,101, -115,116,76,101,110,103,116,104,0,109,95,98,98,101,110,100,105,110,103,0, -109,95,99,48,0,109,95,99,49,0,109,95,99,50,0,109,95,110,111,100, +73,110,100,105,99,101,115,91,50,93,0,109,95,114,101,115,116,76,101,110, +103,116,104,0,109,95,98,98,101,110,100,105,110,103,0,109,95,110,111,100, 101,73,110,100,105,99,101,115,91,51,93,0,109,95,114,101,115,116,65,114, 101,97,0,109,95,99,48,91,52,93,0,109,95,110,111,100,101,73,110,100, 105,99,101,115,91,52,93,0,109,95,114,101,115,116,86,111,108,117,109,101, -0,109,95,108,111,99,97,108,70,114,97,109,101,0,42,109,95,114,105,103, -105,100,66,111,100,121,0,109,95,110,111,100,101,73,110,100,101,120,0,109, -95,97,101,114,111,77,111,100,101,108,0,109,95,98,97,117,109,103,97,114, -116,101,0,109,95,100,114,97,103,0,109,95,108,105,102,116,0,109,95,112, -114,101,115,115,117,114,101,0,109,95,118,111,108,117,109,101,0,109,95,100, -121,110,97,109,105,99,70,114,105,99,116,105,111,110,0,109,95,112,111,115, -101,77,97,116,99,104,0,109,95,114,105,103,105,100,67,111,110,116,97,99, -116,72,97,114,100,110,101,115,115,0,109,95,107,105,110,101,116,105,99,67, -111,110,116,97,99,116,72,97,114,100,110,101,115,115,0,109,95,115,111,102, -116,67,111,110,116,97,99,116,72,97,114,100,110,101,115,115,0,109,95,97, -110,99,104,111,114,72,97,114,100,110,101,115,115,0,109,95,115,111,102,116, -82,105,103,105,100,67,108,117,115,116,101,114,72,97,114,100,110,101,115,115, -0,109,95,115,111,102,116,75,105,110,101,116,105,99,67,108,117,115,116,101, -114,72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,83,111,102,116, +0,109,95,99,49,0,109,95,99,50,0,109,95,99,48,0,109,95,108,111, +99,97,108,70,114,97,109,101,0,42,109,95,114,105,103,105,100,66,111,100, +121,0,109,95,110,111,100,101,73,110,100,101,120,0,109,95,97,101,114,111, +77,111,100,101,108,0,109,95,98,97,117,109,103,97,114,116,101,0,109,95, +100,114,97,103,0,109,95,108,105,102,116,0,109,95,112,114,101,115,115,117, +114,101,0,109,95,118,111,108,117,109,101,0,109,95,100,121,110,97,109,105, +99,70,114,105,99,116,105,111,110,0,109,95,112,111,115,101,77,97,116,99, +104,0,109,95,114,105,103,105,100,67,111,110,116,97,99,116,72,97,114,100, +110,101,115,115,0,109,95,107,105,110,101,116,105,99,67,111,110,116,97,99, +116,72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,67,111,110,116, +97,99,116,72,97,114,100,110,101,115,115,0,109,95,97,110,99,104,111,114, +72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,82,105,103,105,100, 67,108,117,115,116,101,114,72,97,114,100,110,101,115,115,0,109,95,115,111, -102,116,82,105,103,105,100,67,108,117,115,116,101,114,73,109,112,117,108,115, -101,83,112,108,105,116,0,109,95,115,111,102,116,75,105,110,101,116,105,99, -67,108,117,115,116,101,114,73,109,112,117,108,115,101,83,112,108,105,116,0, -109,95,115,111,102,116,83,111,102,116,67,108,117,115,116,101,114,73,109,112, -117,108,115,101,83,112,108,105,116,0,109,95,109,97,120,86,111,108,117,109, -101,0,109,95,116,105,109,101,83,99,97,108,101,0,109,95,118,101,108,111, -99,105,116,121,73,116,101,114,97,116,105,111,110,115,0,109,95,112,111,115, -105,116,105,111,110,73,116,101,114,97,116,105,111,110,115,0,109,95,100,114, -105,102,116,73,116,101,114,97,116,105,111,110,115,0,109,95,99,108,117,115, -116,101,114,73,116,101,114,97,116,105,111,110,115,0,109,95,114,111,116,0, -109,95,115,99,97,108,101,0,109,95,97,113,113,0,109,95,99,111,109,0, -42,109,95,112,111,115,105,116,105,111,110,115,0,42,109,95,119,101,105,103, -104,116,115,0,109,95,110,117,109,80,111,115,105,116,105,111,110,115,0,109, -95,110,117,109,87,101,105,103,116,115,0,109,95,98,118,111,108,117,109,101, -0,109,95,98,102,114,97,109,101,0,109,95,102,114,97,109,101,120,102,111, -114,109,0,109,95,108,111,99,105,105,0,109,95,105,110,118,119,105,0,109, -95,118,105,109,112,117,108,115,101,115,91,50,93,0,109,95,100,105,109,112, -117,108,115,101,115,91,50,93,0,109,95,108,118,0,109,95,97,118,0,42, -109,95,102,114,97,109,101,114,101,102,115,0,42,109,95,110,111,100,101,73, -110,100,105,99,101,115,0,42,109,95,109,97,115,115,101,115,0,109,95,110, -117,109,70,114,97,109,101,82,101,102,115,0,109,95,110,117,109,78,111,100, -101,115,0,109,95,110,117,109,77,97,115,115,101,115,0,109,95,105,100,109, -97,115,115,0,109,95,105,109,97,115,115,0,109,95,110,118,105,109,112,117, -108,115,101,115,0,109,95,110,100,105,109,112,117,108,115,101,115,0,109,95, -110,100,97,109,112,105,110,103,0,109,95,108,100,97,109,112,105,110,103,0, -109,95,97,100,97,109,112,105,110,103,0,109,95,109,97,116,99,104,105,110, -103,0,109,95,109,97,120,83,101,108,102,67,111,108,108,105,115,105,111,110, -73,109,112,117,108,115,101,0,109,95,115,101,108,102,67,111,108,108,105,115, -105,111,110,73,109,112,117,108,115,101,70,97,99,116,111,114,0,109,95,99, -111,110,116,97,105,110,115,65,110,99,104,111,114,0,109,95,99,111,108,108, -105,100,101,0,109,95,99,108,117,115,116,101,114,73,110,100,101,120,0,42, -109,95,112,111,115,101,0,42,42,109,95,109,97,116,101,114,105,97,108,115, -0,42,109,95,110,111,100,101,115,0,42,109,95,108,105,110,107,115,0,42, -109,95,102,97,99,101,115,0,42,109,95,116,101,116,114,97,104,101,100,114, -97,0,42,109,95,97,110,99,104,111,114,115,0,42,109,95,99,108,117,115, -116,101,114,115,0,109,95,110,117,109,77,97,116,101,114,105,97,108,115,0, -109,95,110,117,109,76,105,110,107,115,0,109,95,110,117,109,70,97,99,101, -115,0,109,95,110,117,109,84,101,116,114,97,104,101,100,114,97,0,109,95, -110,117,109,65,110,99,104,111,114,115,0,109,95,110,117,109,67,108,117,115, -116,101,114,115,0,109,95,99,111,110,102,105,103,0,0,0,84,89,80,69, -68,0,0,0,99,104,97,114,0,117,99,104,97,114,0,115,104,111,114,116, -0,117,115,104,111,114,116,0,105,110,116,0,108,111,110,103,0,117,108,111, -110,103,0,102,108,111,97,116,0,100,111,117,98,108,101,0,118,111,105,100, -0,80,111,105,110,116,101,114,65,114,114,97,121,0,98,116,80,104,121,115, -105,99,115,83,121,115,116,101,109,0,76,105,115,116,66,97,115,101,0,98, -116,86,101,99,116,111,114,51,70,108,111,97,116,68,97,116,97,0,98,116, -86,101,99,116,111,114,51,68,111,117,98,108,101,68,97,116,97,0,98,116, -77,97,116,114,105,120,51,120,51,70,108,111,97,116,68,97,116,97,0,98, -116,77,97,116,114,105,120,51,120,51,68,111,117,98,108,101,68,97,116,97, -0,98,116,84,114,97,110,115,102,111,114,109,70,108,111,97,116,68,97,116, -97,0,98,116,84,114,97,110,115,102,111,114,109,68,111,117,98,108,101,68, -97,116,97,0,98,116,66,118,104,83,117,98,116,114,101,101,73,110,102,111, -68,97,116,97,0,98,116,79,112,116,105,109,105,122,101,100,66,118,104,78, -111,100,101,70,108,111,97,116,68,97,116,97,0,98,116,79,112,116,105,109, -105,122,101,100,66,118,104,78,111,100,101,68,111,117,98,108,101,68,97,116, -97,0,98,116,81,117,97,110,116,105,122,101,100,66,118,104,78,111,100,101, -68,97,116,97,0,98,116,81,117,97,110,116,105,122,101,100,66,118,104,70, -108,111,97,116,68,97,116,97,0,98,116,81,117,97,110,116,105,122,101,100, -66,118,104,68,111,117,98,108,101,68,97,116,97,0,98,116,67,111,108,108, -105,115,105,111,110,83,104,97,112,101,68,97,116,97,0,98,116,83,116,97, -116,105,99,80,108,97,110,101,83,104,97,112,101,68,97,116,97,0,98,116, -67,111,110,118,101,120,73,110,116,101,114,110,97,108,83,104,97,112,101,68, -97,116,97,0,98,116,80,111,115,105,116,105,111,110,65,110,100,82,97,100, -105,117,115,0,98,116,77,117,108,116,105,83,112,104,101,114,101,83,104,97, -112,101,68,97,116,97,0,98,116,73,110,116,73,110,100,101,120,68,97,116, -97,0,98,116,83,104,111,114,116,73,110,116,73,110,100,101,120,68,97,116, -97,0,98,116,83,104,111,114,116,73,110,116,73,110,100,101,120,84,114,105, -112,108,101,116,68,97,116,97,0,98,116,77,101,115,104,80,97,114,116,68, -97,116,97,0,98,116,83,116,114,105,100,105,110,103,77,101,115,104,73,110, -116,101,114,102,97,99,101,68,97,116,97,0,98,116,84,114,105,97,110,103, -108,101,77,101,115,104,83,104,97,112,101,68,97,116,97,0,98,116,84,114, -105,97,110,103,108,101,73,110,102,111,77,97,112,68,97,116,97,0,98,116, -67,111,109,112,111,117,110,100,83,104,97,112,101,67,104,105,108,100,68,97, -116,97,0,98,116,67,111,109,112,111,117,110,100,83,104,97,112,101,68,97, -116,97,0,98,116,67,121,108,105,110,100,101,114,83,104,97,112,101,68,97, -116,97,0,98,116,67,97,112,115,117,108,101,83,104,97,112,101,68,97,116, -97,0,98,116,84,114,105,97,110,103,108,101,73,110,102,111,68,97,116,97, -0,98,116,71,73,109,112,97,99,116,77,101,115,104,83,104,97,112,101,68, -97,116,97,0,98,116,67,111,110,118,101,120,72,117,108,108,83,104,97,112, -101,68,97,116,97,0,98,116,67,111,108,108,105,115,105,111,110,79,98,106, -101,99,116,68,111,117,98,108,101,68,97,116,97,0,98,116,67,111,108,108, -105,115,105,111,110,79,98,106,101,99,116,70,108,111,97,116,68,97,116,97, -0,98,116,82,105,103,105,100,66,111,100,121,70,108,111,97,116,68,97,116, -97,0,98,116,82,105,103,105,100,66,111,100,121,68,111,117,98,108,101,68, -97,116,97,0,98,116,67,111,110,115,116,114,97,105,110,116,73,110,102,111, -49,0,98,116,84,121,112,101,100,67,111,110,115,116,114,97,105,110,116,68, -97,116,97,0,98,116,82,105,103,105,100,66,111,100,121,68,97,116,97,0, -98,116,80,111,105,110,116,50,80,111,105,110,116,67,111,110,115,116,114,97, -105,110,116,70,108,111,97,116,68,97,116,97,0,98,116,80,111,105,110,116, -50,80,111,105,110,116,67,111,110,115,116,114,97,105,110,116,68,111,117,98, -108,101,68,97,116,97,0,98,116,72,105,110,103,101,67,111,110,115,116,114, -97,105,110,116,68,111,117,98,108,101,68,97,116,97,0,98,116,72,105,110, -103,101,67,111,110,115,116,114,97,105,110,116,70,108,111,97,116,68,97,116, -97,0,98,116,67,111,110,101,84,119,105,115,116,67,111,110,115,116,114,97, -105,110,116,68,97,116,97,0,98,116,71,101,110,101,114,105,99,54,68,111, -102,67,111,110,115,116,114,97,105,110,116,68,97,116,97,0,98,116,83,108, -105,100,101,114,67,111,110,115,116,114,97,105,110,116,68,97,116,97,0,83, -111,102,116,66,111,100,121,77,97,116,101,114,105,97,108,68,97,116,97,0, -83,111,102,116,66,111,100,121,78,111,100,101,68,97,116,97,0,83,111,102, -116,66,111,100,121,76,105,110,107,68,97,116,97,0,83,111,102,116,66,111, -100,121,70,97,99,101,68,97,116,97,0,83,111,102,116,66,111,100,121,84, -101,116,114,97,68,97,116,97,0,83,111,102,116,82,105,103,105,100,65,110, -99,104,111,114,68,97,116,97,0,83,111,102,116,66,111,100,121,67,111,110, -102,105,103,68,97,116,97,0,83,111,102,116,66,111,100,121,80,111,115,101, -68,97,116,97,0,83,111,102,116,66,111,100,121,67,108,117,115,116,101,114, -68,97,116,97,0,98,116,83,111,102,116,66,111,100,121,70,108,111,97,116, -68,97,116,97,0,0,0,0,84,76,69,78,1,0,1,0,2,0,2,0, -4,0,4,0,4,0,4,0,8,0,0,0,16,0,48,0,16,0,16,0, -32,0,48,0,96,0,64,0,-128,0,20,0,48,0,80,0,16,0,96,0, --112,0,16,0,56,0,56,0,20,0,72,0,4,0,4,0,8,0,48,0, -32,0,80,0,72,0,80,0,32,0,64,0,64,0,16,0,72,0,80,0, --40,1,8,1,-16,1,-88,3,8,0,56,0,0,0,88,0,120,0,96,1, --32,0,-40,0,0,1,-48,0,16,0,104,0,56,0,40,0,104,0,96,0, -104,0,-56,0,104,1,-48,1,83,84,82,67,57,0,0,0,10,0,3,0, -4,0,0,0,4,0,1,0,9,0,2,0,11,0,3,0,10,0,3,0, -10,0,4,0,10,0,5,0,12,0,2,0,9,0,6,0,9,0,7,0, -13,0,1,0,7,0,8,0,14,0,1,0,8,0,8,0,15,0,1,0, -13,0,9,0,16,0,1,0,14,0,9,0,17,0,2,0,15,0,10,0, -13,0,11,0,18,0,2,0,16,0,10,0,14,0,11,0,19,0,4,0, -4,0,12,0,4,0,13,0,2,0,14,0,2,0,15,0,20,0,6,0, -13,0,16,0,13,0,17,0,4,0,18,0,4,0,19,0,4,0,20,0, -0,0,21,0,21,0,6,0,14,0,16,0,14,0,17,0,4,0,18,0, -4,0,19,0,4,0,20,0,0,0,21,0,22,0,3,0,2,0,14,0, -2,0,15,0,4,0,22,0,23,0,12,0,13,0,23,0,13,0,24,0, -13,0,25,0,4,0,26,0,4,0,27,0,4,0,28,0,4,0,29,0, -20,0,30,0,22,0,31,0,19,0,32,0,4,0,33,0,4,0,34,0, -24,0,12,0,14,0,23,0,14,0,24,0,14,0,25,0,4,0,26,0, -4,0,27,0,4,0,28,0,4,0,29,0,21,0,30,0,22,0,31,0, -4,0,33,0,4,0,34,0,19,0,32,0,25,0,3,0,0,0,35,0, -4,0,36,0,0,0,37,0,26,0,5,0,25,0,38,0,13,0,39,0, -13,0,40,0,7,0,41,0,0,0,21,0,27,0,5,0,25,0,38,0, -13,0,39,0,13,0,42,0,7,0,43,0,4,0,44,0,28,0,2,0, -13,0,45,0,7,0,46,0,29,0,4,0,27,0,47,0,28,0,48,0, -4,0,49,0,0,0,37,0,30,0,1,0,4,0,50,0,31,0,2,0, -2,0,50,0,0,0,51,0,32,0,2,0,2,0,52,0,0,0,51,0, -33,0,7,0,13,0,53,0,14,0,54,0,30,0,55,0,32,0,56,0, -31,0,57,0,4,0,58,0,4,0,59,0,34,0,4,0,33,0,60,0, -13,0,61,0,4,0,62,0,0,0,37,0,35,0,7,0,25,0,38,0, -34,0,63,0,23,0,64,0,24,0,65,0,36,0,66,0,7,0,43,0, -0,0,67,0,37,0,4,0,17,0,68,0,25,0,69,0,4,0,70,0, -7,0,71,0,38,0,4,0,25,0,38,0,37,0,72,0,4,0,73,0, -7,0,43,0,39,0,3,0,27,0,47,0,4,0,74,0,0,0,37,0, -40,0,3,0,27,0,47,0,4,0,74,0,0,0,37,0,41,0,4,0, -4,0,75,0,7,0,76,0,7,0,77,0,7,0,78,0,36,0,14,0, -4,0,79,0,4,0,80,0,41,0,81,0,4,0,82,0,7,0,83,0, -7,0,84,0,7,0,85,0,7,0,86,0,7,0,87,0,4,0,88,0, -4,0,89,0,4,0,90,0,4,0,91,0,0,0,37,0,42,0,5,0, -25,0,38,0,34,0,63,0,13,0,39,0,7,0,43,0,4,0,92,0, -43,0,5,0,27,0,47,0,13,0,93,0,14,0,94,0,4,0,95,0, -0,0,96,0,44,0,24,0,9,0,97,0,9,0,98,0,25,0,99,0, -0,0,35,0,18,0,100,0,18,0,101,0,14,0,102,0,14,0,103,0, -14,0,104,0,8,0,105,0,8,0,106,0,8,0,107,0,8,0,108,0, -8,0,109,0,8,0,110,0,8,0,111,0,4,0,112,0,4,0,113,0, -4,0,114,0,4,0,115,0,4,0,116,0,4,0,117,0,4,0,118,0, -0,0,37,0,45,0,23,0,9,0,97,0,9,0,98,0,25,0,99,0, -0,0,35,0,17,0,100,0,17,0,101,0,13,0,102,0,13,0,103,0, -13,0,104,0,7,0,105,0,7,0,106,0,7,0,107,0,7,0,108,0, -7,0,109,0,7,0,110,0,7,0,111,0,4,0,112,0,4,0,113,0, -4,0,114,0,4,0,115,0,4,0,116,0,4,0,117,0,4,0,118,0, -46,0,21,0,45,0,119,0,15,0,120,0,13,0,121,0,13,0,122,0, -13,0,123,0,13,0,124,0,13,0,125,0,13,0,126,0,13,0,127,0, -13,0,-128,0,13,0,-127,0,7,0,-126,0,7,0,-125,0,7,0,-124,0, -7,0,-123,0,7,0,-122,0,7,0,-121,0,7,0,-120,0,7,0,-119,0, -7,0,-118,0,4,0,-117,0,47,0,22,0,44,0,119,0,16,0,120,0, -14,0,121,0,14,0,122,0,14,0,123,0,14,0,124,0,14,0,125,0, -14,0,126,0,14,0,127,0,14,0,-128,0,14,0,-127,0,8,0,-126,0, -8,0,-125,0,8,0,-124,0,8,0,-123,0,8,0,-122,0,8,0,-121,0, -8,0,-120,0,8,0,-119,0,8,0,-118,0,4,0,-117,0,0,0,37,0, -48,0,2,0,4,0,-116,0,4,0,-115,0,49,0,11,0,50,0,-114,0, -50,0,-113,0,0,0,35,0,4,0,-112,0,4,0,-111,0,4,0,-110,0, -4,0,-109,0,7,0,-108,0,7,0,-107,0,4,0,-106,0,0,0,-105,0, -51,0,3,0,49,0,-104,0,13,0,-103,0,13,0,-102,0,52,0,3,0, -49,0,-104,0,14,0,-103,0,14,0,-102,0,53,0,13,0,49,0,-104,0, -18,0,-101,0,18,0,-100,0,4,0,-99,0,4,0,-98,0,4,0,-97,0, -7,0,-96,0,7,0,-95,0,7,0,-94,0,7,0,-93,0,7,0,-92,0, -7,0,-91,0,7,0,-90,0,54,0,13,0,49,0,-104,0,17,0,-101,0, -17,0,-100,0,4,0,-99,0,4,0,-98,0,4,0,-97,0,7,0,-96,0, +102,116,75,105,110,101,116,105,99,67,108,117,115,116,101,114,72,97,114,100, +110,101,115,115,0,109,95,115,111,102,116,83,111,102,116,67,108,117,115,116, +101,114,72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,82,105,103, +105,100,67,108,117,115,116,101,114,73,109,112,117,108,115,101,83,112,108,105, +116,0,109,95,115,111,102,116,75,105,110,101,116,105,99,67,108,117,115,116, +101,114,73,109,112,117,108,115,101,83,112,108,105,116,0,109,95,115,111,102, +116,83,111,102,116,67,108,117,115,116,101,114,73,109,112,117,108,115,101,83, +112,108,105,116,0,109,95,109,97,120,86,111,108,117,109,101,0,109,95,116, +105,109,101,83,99,97,108,101,0,109,95,118,101,108,111,99,105,116,121,73, +116,101,114,97,116,105,111,110,115,0,109,95,112,111,115,105,116,105,111,110, +73,116,101,114,97,116,105,111,110,115,0,109,95,100,114,105,102,116,73,116, +101,114,97,116,105,111,110,115,0,109,95,99,108,117,115,116,101,114,73,116, +101,114,97,116,105,111,110,115,0,109,95,114,111,116,0,109,95,115,99,97, +108,101,0,109,95,97,113,113,0,109,95,99,111,109,0,42,109,95,112,111, +115,105,116,105,111,110,115,0,42,109,95,119,101,105,103,104,116,115,0,109, +95,110,117,109,80,111,115,105,116,105,111,110,115,0,109,95,110,117,109,87, +101,105,103,116,115,0,109,95,98,118,111,108,117,109,101,0,109,95,98,102, +114,97,109,101,0,109,95,102,114,97,109,101,120,102,111,114,109,0,109,95, +108,111,99,105,105,0,109,95,105,110,118,119,105,0,109,95,118,105,109,112, +117,108,115,101,115,91,50,93,0,109,95,100,105,109,112,117,108,115,101,115, +91,50,93,0,109,95,108,118,0,109,95,97,118,0,42,109,95,102,114,97, +109,101,114,101,102,115,0,42,109,95,110,111,100,101,73,110,100,105,99,101, +115,0,42,109,95,109,97,115,115,101,115,0,109,95,110,117,109,70,114,97, +109,101,82,101,102,115,0,109,95,110,117,109,78,111,100,101,115,0,109,95, +110,117,109,77,97,115,115,101,115,0,109,95,105,100,109,97,115,115,0,109, +95,105,109,97,115,115,0,109,95,110,118,105,109,112,117,108,115,101,115,0, +109,95,110,100,105,109,112,117,108,115,101,115,0,109,95,110,100,97,109,112, +105,110,103,0,109,95,108,100,97,109,112,105,110,103,0,109,95,97,100,97, +109,112,105,110,103,0,109,95,109,97,116,99,104,105,110,103,0,109,95,109, +97,120,83,101,108,102,67,111,108,108,105,115,105,111,110,73,109,112,117,108, +115,101,0,109,95,115,101,108,102,67,111,108,108,105,115,105,111,110,73,109, +112,117,108,115,101,70,97,99,116,111,114,0,109,95,99,111,110,116,97,105, +110,115,65,110,99,104,111,114,0,109,95,99,111,108,108,105,100,101,0,109, +95,99,108,117,115,116,101,114,73,110,100,101,120,0,42,109,95,112,111,115, +101,0,42,42,109,95,109,97,116,101,114,105,97,108,115,0,42,109,95,110, +111,100,101,115,0,42,109,95,108,105,110,107,115,0,42,109,95,102,97,99, +101,115,0,42,109,95,116,101,116,114,97,104,101,100,114,97,0,42,109,95, +97,110,99,104,111,114,115,0,42,109,95,99,108,117,115,116,101,114,115,0, +109,95,110,117,109,77,97,116,101,114,105,97,108,115,0,109,95,110,117,109, +76,105,110,107,115,0,109,95,110,117,109,70,97,99,101,115,0,109,95,110, +117,109,84,101,116,114,97,104,101,100,114,97,0,109,95,110,117,109,65,110, +99,104,111,114,115,0,109,95,110,117,109,67,108,117,115,116,101,114,115,0, +109,95,99,111,110,102,105,103,0,0,0,0,84,89,80,69,68,0,0,0, +99,104,97,114,0,117,99,104,97,114,0,115,104,111,114,116,0,117,115,104, +111,114,116,0,105,110,116,0,108,111,110,103,0,117,108,111,110,103,0,102, +108,111,97,116,0,100,111,117,98,108,101,0,118,111,105,100,0,80,111,105, +110,116,101,114,65,114,114,97,121,0,98,116,80,104,121,115,105,99,115,83, +121,115,116,101,109,0,76,105,115,116,66,97,115,101,0,98,116,86,101,99, +116,111,114,51,70,108,111,97,116,68,97,116,97,0,98,116,86,101,99,116, +111,114,51,68,111,117,98,108,101,68,97,116,97,0,98,116,77,97,116,114, +105,120,51,120,51,70,108,111,97,116,68,97,116,97,0,98,116,77,97,116, +114,105,120,51,120,51,68,111,117,98,108,101,68,97,116,97,0,98,116,84, +114,97,110,115,102,111,114,109,70,108,111,97,116,68,97,116,97,0,98,116, +84,114,97,110,115,102,111,114,109,68,111,117,98,108,101,68,97,116,97,0, +98,116,66,118,104,83,117,98,116,114,101,101,73,110,102,111,68,97,116,97, +0,98,116,79,112,116,105,109,105,122,101,100,66,118,104,78,111,100,101,70, +108,111,97,116,68,97,116,97,0,98,116,79,112,116,105,109,105,122,101,100, +66,118,104,78,111,100,101,68,111,117,98,108,101,68,97,116,97,0,98,116, +81,117,97,110,116,105,122,101,100,66,118,104,78,111,100,101,68,97,116,97, +0,98,116,81,117,97,110,116,105,122,101,100,66,118,104,70,108,111,97,116, +68,97,116,97,0,98,116,81,117,97,110,116,105,122,101,100,66,118,104,68, +111,117,98,108,101,68,97,116,97,0,98,116,67,111,108,108,105,115,105,111, +110,83,104,97,112,101,68,97,116,97,0,98,116,83,116,97,116,105,99,80, +108,97,110,101,83,104,97,112,101,68,97,116,97,0,98,116,67,111,110,118, +101,120,73,110,116,101,114,110,97,108,83,104,97,112,101,68,97,116,97,0, +98,116,80,111,115,105,116,105,111,110,65,110,100,82,97,100,105,117,115,0, +98,116,77,117,108,116,105,83,112,104,101,114,101,83,104,97,112,101,68,97, +116,97,0,98,116,73,110,116,73,110,100,101,120,68,97,116,97,0,98,116, +83,104,111,114,116,73,110,116,73,110,100,101,120,68,97,116,97,0,98,116, +83,104,111,114,116,73,110,116,73,110,100,101,120,84,114,105,112,108,101,116, +68,97,116,97,0,98,116,77,101,115,104,80,97,114,116,68,97,116,97,0, +98,116,83,116,114,105,100,105,110,103,77,101,115,104,73,110,116,101,114,102, +97,99,101,68,97,116,97,0,98,116,84,114,105,97,110,103,108,101,77,101, +115,104,83,104,97,112,101,68,97,116,97,0,98,116,84,114,105,97,110,103, +108,101,73,110,102,111,77,97,112,68,97,116,97,0,98,116,67,111,109,112, +111,117,110,100,83,104,97,112,101,67,104,105,108,100,68,97,116,97,0,98, +116,67,111,109,112,111,117,110,100,83,104,97,112,101,68,97,116,97,0,98, +116,67,121,108,105,110,100,101,114,83,104,97,112,101,68,97,116,97,0,98, +116,67,97,112,115,117,108,101,83,104,97,112,101,68,97,116,97,0,98,116, +84,114,105,97,110,103,108,101,73,110,102,111,68,97,116,97,0,98,116,71, +73,109,112,97,99,116,77,101,115,104,83,104,97,112,101,68,97,116,97,0, +98,116,67,111,110,118,101,120,72,117,108,108,83,104,97,112,101,68,97,116, +97,0,98,116,67,111,108,108,105,115,105,111,110,79,98,106,101,99,116,68, +111,117,98,108,101,68,97,116,97,0,98,116,67,111,108,108,105,115,105,111, +110,79,98,106,101,99,116,70,108,111,97,116,68,97,116,97,0,98,116,82, +105,103,105,100,66,111,100,121,70,108,111,97,116,68,97,116,97,0,98,116, +82,105,103,105,100,66,111,100,121,68,111,117,98,108,101,68,97,116,97,0, +98,116,67,111,110,115,116,114,97,105,110,116,73,110,102,111,49,0,98,116, +84,121,112,101,100,67,111,110,115,116,114,97,105,110,116,68,97,116,97,0, +98,116,82,105,103,105,100,66,111,100,121,68,97,116,97,0,98,116,80,111, +105,110,116,50,80,111,105,110,116,67,111,110,115,116,114,97,105,110,116,70, +108,111,97,116,68,97,116,97,0,98,116,80,111,105,110,116,50,80,111,105, +110,116,67,111,110,115,116,114,97,105,110,116,68,111,117,98,108,101,68,97, +116,97,0,98,116,72,105,110,103,101,67,111,110,115,116,114,97,105,110,116, +68,111,117,98,108,101,68,97,116,97,0,98,116,72,105,110,103,101,67,111, +110,115,116,114,97,105,110,116,70,108,111,97,116,68,97,116,97,0,98,116, +67,111,110,101,84,119,105,115,116,67,111,110,115,116,114,97,105,110,116,68, +97,116,97,0,98,116,71,101,110,101,114,105,99,54,68,111,102,67,111,110, +115,116,114,97,105,110,116,68,97,116,97,0,98,116,83,108,105,100,101,114, +67,111,110,115,116,114,97,105,110,116,68,97,116,97,0,83,111,102,116,66, +111,100,121,77,97,116,101,114,105,97,108,68,97,116,97,0,83,111,102,116, +66,111,100,121,78,111,100,101,68,97,116,97,0,83,111,102,116,66,111,100, +121,76,105,110,107,68,97,116,97,0,83,111,102,116,66,111,100,121,70,97, +99,101,68,97,116,97,0,83,111,102,116,66,111,100,121,84,101,116,114,97, +68,97,116,97,0,83,111,102,116,82,105,103,105,100,65,110,99,104,111,114, +68,97,116,97,0,83,111,102,116,66,111,100,121,67,111,110,102,105,103,68, +97,116,97,0,83,111,102,116,66,111,100,121,80,111,115,101,68,97,116,97, +0,83,111,102,116,66,111,100,121,67,108,117,115,116,101,114,68,97,116,97, +0,98,116,83,111,102,116,66,111,100,121,70,108,111,97,116,68,97,116,97, +0,0,0,0,84,76,69,78,1,0,1,0,2,0,2,0,4,0,4,0, +4,0,4,0,8,0,0,0,16,0,48,0,16,0,16,0,32,0,48,0, +96,0,64,0,-128,0,20,0,48,0,80,0,16,0,96,0,-112,0,16,0, +56,0,56,0,20,0,72,0,4,0,4,0,8,0,48,0,32,0,80,0, +72,0,80,0,32,0,64,0,64,0,16,0,72,0,80,0,-40,1,8,1, +-16,1,-88,3,8,0,56,0,0,0,88,0,120,0,96,1,-32,0,-40,0, +0,1,-48,0,16,0,104,0,24,0,40,0,104,0,96,0,104,0,-56,0, +104,1,-48,1,83,84,82,67,57,0,0,0,10,0,3,0,4,0,0,0, +4,0,1,0,9,0,2,0,11,0,3,0,10,0,3,0,10,0,4,0, +10,0,5,0,12,0,2,0,9,0,6,0,9,0,7,0,13,0,1,0, +7,0,8,0,14,0,1,0,8,0,8,0,15,0,1,0,13,0,9,0, +16,0,1,0,14,0,9,0,17,0,2,0,15,0,10,0,13,0,11,0, +18,0,2,0,16,0,10,0,14,0,11,0,19,0,4,0,4,0,12,0, +4,0,13,0,2,0,14,0,2,0,15,0,20,0,6,0,13,0,16,0, +13,0,17,0,4,0,18,0,4,0,19,0,4,0,20,0,0,0,21,0, +21,0,6,0,14,0,16,0,14,0,17,0,4,0,18,0,4,0,19,0, +4,0,20,0,0,0,21,0,22,0,3,0,2,0,14,0,2,0,15,0, +4,0,22,0,23,0,12,0,13,0,23,0,13,0,24,0,13,0,25,0, +4,0,26,0,4,0,27,0,4,0,28,0,4,0,29,0,20,0,30,0, +22,0,31,0,19,0,32,0,4,0,33,0,4,0,34,0,24,0,12,0, +14,0,23,0,14,0,24,0,14,0,25,0,4,0,26,0,4,0,27,0, +4,0,28,0,4,0,29,0,21,0,30,0,22,0,31,0,4,0,33,0, +4,0,34,0,19,0,32,0,25,0,3,0,0,0,35,0,4,0,36,0, +0,0,37,0,26,0,5,0,25,0,38,0,13,0,39,0,13,0,40,0, +7,0,41,0,0,0,21,0,27,0,5,0,25,0,38,0,13,0,39,0, +13,0,42,0,7,0,43,0,4,0,44,0,28,0,2,0,13,0,45,0, +7,0,46,0,29,0,4,0,27,0,47,0,28,0,48,0,4,0,49,0, +0,0,37,0,30,0,1,0,4,0,50,0,31,0,2,0,2,0,50,0, +0,0,51,0,32,0,2,0,2,0,52,0,0,0,51,0,33,0,7,0, +13,0,53,0,14,0,54,0,30,0,55,0,32,0,56,0,31,0,57,0, +4,0,58,0,4,0,59,0,34,0,4,0,33,0,60,0,13,0,61,0, +4,0,62,0,0,0,37,0,35,0,7,0,25,0,38,0,34,0,63,0, +23,0,64,0,24,0,65,0,36,0,66,0,7,0,43,0,0,0,67,0, +37,0,4,0,17,0,68,0,25,0,69,0,4,0,70,0,7,0,71,0, +38,0,4,0,25,0,38,0,37,0,72,0,4,0,73,0,7,0,43,0, +39,0,3,0,27,0,47,0,4,0,74,0,0,0,37,0,40,0,3,0, +27,0,47,0,4,0,74,0,0,0,37,0,41,0,4,0,4,0,75,0, +7,0,76,0,7,0,77,0,7,0,78,0,36,0,14,0,4,0,79,0, +4,0,80,0,41,0,81,0,4,0,82,0,7,0,83,0,7,0,84,0, +7,0,85,0,7,0,86,0,7,0,87,0,4,0,88,0,4,0,89,0, +4,0,90,0,4,0,91,0,0,0,37,0,42,0,5,0,25,0,38,0, +34,0,63,0,13,0,39,0,7,0,43,0,4,0,92,0,43,0,5,0, +27,0,47,0,13,0,93,0,14,0,94,0,4,0,95,0,0,0,96,0, +44,0,24,0,9,0,97,0,9,0,98,0,25,0,99,0,0,0,35,0, +18,0,100,0,18,0,101,0,14,0,102,0,14,0,103,0,14,0,104,0, +8,0,105,0,8,0,106,0,8,0,107,0,8,0,108,0,8,0,109,0, +8,0,110,0,8,0,111,0,4,0,112,0,4,0,113,0,4,0,114,0, +4,0,115,0,4,0,116,0,4,0,117,0,4,0,118,0,0,0,37,0, +45,0,23,0,9,0,97,0,9,0,98,0,25,0,99,0,0,0,35,0, +17,0,100,0,17,0,101,0,13,0,102,0,13,0,103,0,13,0,104,0, +7,0,105,0,7,0,106,0,7,0,107,0,7,0,108,0,7,0,109,0, +7,0,110,0,7,0,111,0,4,0,112,0,4,0,113,0,4,0,114,0, +4,0,115,0,4,0,116,0,4,0,117,0,4,0,118,0,46,0,21,0, +45,0,119,0,15,0,120,0,13,0,121,0,13,0,122,0,13,0,123,0, +13,0,124,0,13,0,125,0,13,0,126,0,13,0,127,0,13,0,-128,0, +13,0,-127,0,7,0,-126,0,7,0,-125,0,7,0,-124,0,7,0,-123,0, +7,0,-122,0,7,0,-121,0,7,0,-120,0,7,0,-119,0,7,0,-118,0, +4,0,-117,0,47,0,22,0,44,0,119,0,16,0,120,0,14,0,121,0, +14,0,122,0,14,0,123,0,14,0,124,0,14,0,125,0,14,0,126,0, +14,0,127,0,14,0,-128,0,14,0,-127,0,8,0,-126,0,8,0,-125,0, +8,0,-124,0,8,0,-123,0,8,0,-122,0,8,0,-121,0,8,0,-120,0, +8,0,-119,0,8,0,-118,0,4,0,-117,0,0,0,37,0,48,0,2,0, +4,0,-116,0,4,0,-115,0,49,0,11,0,50,0,-114,0,50,0,-113,0, +0,0,35,0,4,0,-112,0,4,0,-111,0,4,0,-110,0,4,0,-109,0, +7,0,-108,0,7,0,-107,0,4,0,-106,0,0,0,-105,0,51,0,3,0, +49,0,-104,0,13,0,-103,0,13,0,-102,0,52,0,3,0,49,0,-104,0, +14,0,-103,0,14,0,-102,0,53,0,13,0,49,0,-104,0,18,0,-101,0, +18,0,-100,0,4,0,-99,0,4,0,-98,0,4,0,-97,0,7,0,-96,0, 7,0,-95,0,7,0,-94,0,7,0,-93,0,7,0,-92,0,7,0,-91,0, -7,0,-90,0,55,0,11,0,49,0,-104,0,17,0,-101,0,17,0,-100,0, -7,0,-89,0,7,0,-88,0,7,0,-87,0,7,0,-92,0,7,0,-91,0, -7,0,-90,0,7,0,-86,0,0,0,21,0,56,0,9,0,49,0,-104,0, -17,0,-101,0,17,0,-100,0,13,0,-85,0,13,0,-84,0,13,0,-83,0, -13,0,-82,0,4,0,-81,0,4,0,-80,0,57,0,9,0,49,0,-104,0, -17,0,-101,0,17,0,-100,0,7,0,-85,0,7,0,-84,0,7,0,-83,0, -7,0,-82,0,4,0,-81,0,4,0,-80,0,58,0,4,0,7,0,-79,0, -7,0,-78,0,7,0,-77,0,4,0,75,0,59,0,10,0,58,0,-76,0, -13,0,-75,0,13,0,-74,0,13,0,-73,0,13,0,-72,0,13,0,-71,0, -7,0,-126,0,7,0,-70,0,4,0,-69,0,4,0,-68,0,60,0,9,0, -58,0,-76,0,4,0,-67,0,13,0,-66,0,7,0,-65,0,4,0,-64,0, -7,0,-63,0,7,0,-62,0,7,0,-61,0,4,0,-68,0,61,0,4,0, -13,0,-71,0,58,0,-76,0,4,0,-60,0,7,0,-59,0,62,0,7,0, -13,0,-58,0,58,0,-76,0,4,0,-57,0,7,0,-56,0,7,0,-62,0, -7,0,-61,0,4,0,-68,0,63,0,6,0,15,0,-63,0,13,0,-62,0, -13,0,-55,0,50,0,-54,0,4,0,-53,0,7,0,-61,0,64,0,26,0, -4,0,-52,0,7,0,-51,0,7,0,-86,0,7,0,-50,0,7,0,-49,0, +7,0,-90,0,54,0,13,0,49,0,-104,0,17,0,-101,0,17,0,-100,0, +4,0,-99,0,4,0,-98,0,4,0,-97,0,7,0,-96,0,7,0,-95,0, +7,0,-94,0,7,0,-93,0,7,0,-92,0,7,0,-91,0,7,0,-90,0, +55,0,11,0,49,0,-104,0,17,0,-101,0,17,0,-100,0,7,0,-89,0, +7,0,-88,0,7,0,-87,0,7,0,-92,0,7,0,-91,0,7,0,-90,0, +7,0,-86,0,0,0,21,0,56,0,9,0,49,0,-104,0,17,0,-101,0, +17,0,-100,0,13,0,-85,0,13,0,-84,0,13,0,-83,0,13,0,-82,0, +4,0,-81,0,4,0,-80,0,57,0,9,0,49,0,-104,0,17,0,-101,0, +17,0,-100,0,7,0,-85,0,7,0,-84,0,7,0,-83,0,7,0,-82,0, +4,0,-81,0,4,0,-80,0,58,0,4,0,7,0,-79,0,7,0,-78,0, +7,0,-77,0,4,0,75,0,59,0,10,0,58,0,-76,0,13,0,-75,0, +13,0,-74,0,13,0,-73,0,13,0,-72,0,13,0,-71,0,7,0,-126,0, +7,0,-70,0,4,0,-69,0,4,0,-68,0,60,0,4,0,58,0,-76,0, +4,0,-67,0,7,0,-66,0,4,0,-65,0,61,0,4,0,13,0,-71,0, +58,0,-76,0,4,0,-64,0,7,0,-63,0,62,0,7,0,13,0,-62,0, +58,0,-76,0,4,0,-61,0,7,0,-60,0,7,0,-59,0,7,0,-58,0, +4,0,-68,0,63,0,6,0,15,0,-57,0,13,0,-59,0,13,0,-56,0, +50,0,-55,0,4,0,-54,0,7,0,-58,0,64,0,26,0,4,0,-53,0, +7,0,-52,0,7,0,-86,0,7,0,-51,0,7,0,-50,0,7,0,-49,0, 7,0,-48,0,7,0,-47,0,7,0,-46,0,7,0,-45,0,7,0,-44,0, 7,0,-43,0,7,0,-42,0,7,0,-41,0,7,0,-40,0,7,0,-39,0, 7,0,-38,0,7,0,-37,0,7,0,-36,0,7,0,-35,0,7,0,-34,0, -7,0,-33,0,4,0,-32,0,4,0,-31,0,4,0,-30,0,4,0,-29,0, -4,0,113,0,65,0,12,0,15,0,-28,0,15,0,-27,0,15,0,-26,0, -13,0,-25,0,13,0,-24,0,7,0,-23,0,4,0,-22,0,4,0,-21,0, -4,0,-20,0,4,0,-19,0,7,0,-56,0,4,0,-68,0,66,0,27,0, -17,0,-18,0,15,0,-17,0,15,0,-16,0,13,0,-25,0,13,0,-15,0, -13,0,-14,0,13,0,-13,0,13,0,-12,0,13,0,-11,0,4,0,-10,0, -7,0,-9,0,4,0,-8,0,4,0,-7,0,4,0,-6,0,7,0,-5,0, -7,0,-4,0,4,0,-3,0,4,0,-2,0,7,0,-1,0,7,0,0,1, -7,0,1,1,7,0,2,1,7,0,3,1,7,0,4,1,4,0,5,1, -4,0,6,1,4,0,7,1,67,0,18,0,45,0,119,0,65,0,8,1, -58,0,9,1,59,0,10,1,60,0,11,1,61,0,12,1,62,0,13,1, -63,0,14,1,66,0,15,1,4,0,16,1,4,0,-7,0,4,0,17,1, -4,0,18,1,4,0,19,1,4,0,20,1,4,0,21,1,4,0,-68,0, -64,0,22,1,}; +4,0,-33,0,4,0,-32,0,4,0,-31,0,4,0,-30,0,4,0,113,0, +65,0,12,0,15,0,-29,0,15,0,-28,0,15,0,-27,0,13,0,-26,0, +13,0,-25,0,7,0,-24,0,4,0,-23,0,4,0,-22,0,4,0,-21,0, +4,0,-20,0,7,0,-60,0,4,0,-68,0,66,0,27,0,17,0,-19,0, +15,0,-18,0,15,0,-17,0,13,0,-26,0,13,0,-16,0,13,0,-15,0, +13,0,-14,0,13,0,-13,0,13,0,-12,0,4,0,-11,0,7,0,-10,0, +4,0,-9,0,4,0,-8,0,4,0,-7,0,7,0,-6,0,7,0,-5,0, +4,0,-4,0,4,0,-3,0,7,0,-2,0,7,0,-1,0,7,0,0,1, +7,0,1,1,7,0,2,1,7,0,3,1,4,0,4,1,4,0,5,1, +4,0,6,1,67,0,18,0,45,0,119,0,65,0,7,1,58,0,8,1, +59,0,9,1,60,0,10,1,61,0,11,1,62,0,12,1,63,0,13,1, +66,0,14,1,4,0,15,1,4,0,-8,0,4,0,16,1,4,0,17,1, +4,0,18,1,4,0,19,1,4,0,20,1,4,0,-68,0,64,0,21,1, +}; int sBulletDNAlen64= sizeof(sBulletDNAstr64); diff --git a/src/LinearMath/btSerializer.h b/src/LinearMath/btSerializer.h index a15363145..83439f56c 100644 --- a/src/LinearMath/btSerializer.h +++ b/src/LinearMath/btSerializer.h @@ -134,7 +134,8 @@ struct btPointerUid }; }; - +///The btDefaultSerializer is the main Bullet serialization class. +///The constructor takes an optional argument for backwards compatibility, it is recommended to leave this empty/zero. class btDefaultSerializer : public btSerializer { @@ -373,14 +374,14 @@ public: - btDefaultSerializer(int totalSize) + btDefaultSerializer(int totalSize=0) :m_totalSize(totalSize), m_currentSize(0), m_dna(0), m_dnaLength(0), m_serializationFlags(0) { - m_buffer = (unsigned char*)btAlignedAlloc(totalSize, 16); + m_buffer = m_totalSize?(unsigned char*)btAlignedAlloc(totalSize,16):0; const bool VOID_IS_8 = ((sizeof(void*)==8)); @@ -421,16 +422,14 @@ public: btAlignedFree(m_dna); } - virtual void startSerialization() + void writeHeader(unsigned char* buffer) const { - m_uniqueIdGenerator= 1; - - m_currentSize = BT_HEADER_LENGTH; + #ifdef BT_USE_DOUBLE_PRECISION - memcpy(m_buffer, "BULLETd", 7); + memcpy(buffer, "BULLETd", 7); #else - memcpy(m_buffer, "BULLETf", 7); + memcpy(buffer, "BULLETf", 7); #endif //BT_USE_DOUBLE_PRECISION int littleEndian= 1; @@ -438,25 +437,35 @@ public: if (sizeof(void*)==8) { - m_buffer[7] = '-'; + buffer[7] = '-'; } else { - m_buffer[7] = '_'; + buffer[7] = '_'; } if (littleEndian) { - m_buffer[8]='v'; + buffer[8]='v'; } else { - m_buffer[8]='V'; + buffer[8]='V'; } - m_buffer[9] = '2'; - m_buffer[10] = '7'; - m_buffer[11] = '8'; + buffer[9] = '2'; + buffer[10] = '7'; + buffer[11] = '8'; + } + + virtual void startSerialization() + { + m_uniqueIdGenerator= 1; + if (m_totalSize) + { + unsigned char* buffer = internalAlloc(BT_HEADER_LENGTH); + writeHeader(buffer); + } } @@ -464,6 +473,29 @@ public: { writeDNA(); + //if we didn't pre-allocate a buffer, we need to create a contiguous buffer now + int mysize = 0; + if (!m_totalSize) + { + if (m_buffer) + btAlignedFree(m_buffer); + + m_currentSize += BT_HEADER_LENGTH; + m_buffer = (unsigned char*)btAlignedAlloc(m_currentSize,16); + + unsigned char* currentPtr = m_buffer; + writeHeader(m_buffer); + currentPtr += BT_HEADER_LENGTH; + mysize+=BT_HEADER_LENGTH; + for (int i=0;i< m_chunkPtrs.size();i++) + { + int curLength = sizeof(btChunk)+m_chunkPtrs[i]->m_length; + memcpy(currentPtr,m_chunkPtrs[i], curLength); + btAlignedFree(m_chunkPtrs[i]); + currentPtr+=curLength; + mysize+=curLength; + } + } mTypes.clear(); mStructs.clear(); @@ -473,6 +505,7 @@ public: m_chunkP.clear(); m_nameMap.clear(); m_uniquePointers.clear(); + m_chunkPtrs.clear(); } virtual void* getUniquePointer(void*oldPtr) @@ -524,15 +557,29 @@ public: } + virtual unsigned char* internalAlloc(size_t size) + { + unsigned char* ptr = 0; + + if (m_totalSize) + { + ptr = m_buffer+m_currentSize; + m_currentSize += size; + btAssert(m_currentSize