diff --git a/Demos/ConvexDecompositionDemo/testFile32Single.bullet b/Demos/ConvexDecompositionDemo/testFile32Single.bullet index 3dd6b385e..d69231b56 100644 Binary files a/Demos/ConvexDecompositionDemo/testFile32Single.bullet and b/Demos/ConvexDecompositionDemo/testFile32Single.bullet differ diff --git a/Demos/ConvexDecompositionDemo/testFile64Double.bullet b/Demos/ConvexDecompositionDemo/testFile64Double.bullet deleted file mode 100644 index 55b7d783b..000000000 Binary files a/Demos/ConvexDecompositionDemo/testFile64Double.bullet and /dev/null differ diff --git a/Demos/ConvexDecompositionDemo/testFile64Single.bullet b/Demos/ConvexDecompositionDemo/testFile64Single.bullet deleted file mode 100644 index aa028bac4..000000000 Binary files a/Demos/ConvexDecompositionDemo/testFile64Single.bullet and /dev/null differ diff --git a/Demos/OpenGL/GLDebugDrawer.cpp b/Demos/OpenGL/GLDebugDrawer.cpp index 0310d7cf8..7933ade9f 100644 --- a/Demos/OpenGL/GLDebugDrawer.cpp +++ b/Demos/OpenGL/GLDebugDrawer.cpp @@ -107,7 +107,7 @@ void GLDebugDrawer::draw3dText(const btVector3& location,const char* textString) void GLDebugDrawer::reportErrorWarning(const char* warningString) { - printf(warningString); + printf("%s\n",warningString); } void GLDebugDrawer::drawContactPoint(const btVector3& pointOnB,const btVector3& normalOnB,btScalar distance,int lifeTime,const btVector3& color) diff --git a/Demos/SerializeDemo/CMakeLists.txt b/Demos/SerializeDemo/CMakeLists.txt index b0a5387c3..216e6e52a 100644 --- a/Demos/SerializeDemo/CMakeLists.txt +++ b/Demos/SerializeDemo/CMakeLists.txt @@ -61,3 +61,10 @@ ELSE (USE_GLUT) SerializeDemo.h ) ENDIF (USE_GLUT) + +ADD_CUSTOM_COMMAND( +TARGET AppSerializeDemo +POST_BUILD +COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Demos/SerializeDemo/testFile.bullet ${CMAKE_CURRENT_BINARY_DIR} +) + diff --git a/Demos/SerializeDemo/testFile.bullet b/Demos/SerializeDemo/testFile.bullet new file mode 100644 index 000000000..c56a89122 Binary files /dev/null and b/Demos/SerializeDemo/testFile.bullet differ diff --git a/Extras/Serialize/BulletFileLoader/bFile.cpp b/Extras/Serialize/BulletFileLoader/bFile.cpp index 4c34f0074..276afd40b 100644 --- a/Extras/Serialize/BulletFileLoader/bFile.cpp +++ b/Extras/Serialize/BulletFileLoader/bFile.cpp @@ -150,8 +150,8 @@ void bFile::parseHeader() mFlags |= FD_ENDIAN_SWAP; - printf (header); - printf ("\nsizeof(void*) == %d\n",sizeof(void*)); + printf ("%s\n",header); + printf ("\nsizeof(void*) == %d\n",int(sizeof(void*))); const char* endStr = ((mFlags & FD_ENDIAN_SWAP)!=0) ? "yes" : "no"; printf ("Swapping endian? %s\n",endStr); const char* bitStr = (mFlags &FD_FILE_64)!=0 ? "64 bit" : "32bit"; @@ -552,8 +552,8 @@ void bFile::getMatchingFileDNA(short* dna_addr, const char* lookupName, const c if (name[0] == '*') { // cast pointers - int ptrFile = mFileDNA->getPointerSize(); - int ptrMem = mMemoryDNA->getPointerSize(); + //int ptrFile = mFileDNA->getPointerSize(); + //int ptrMem = mMemoryDNA->getPointerSize(); swapPtr(strcData, data); @@ -633,7 +633,7 @@ void bFile::swapStruct(int dna_nr, char *data) if (dna_nr == -1) return; short *strc = mFileDNA->getStruct(dna_nr); - short *firstStrc = strc; + //short *firstStrc = strc; int elementLen= strc[1]; strc+=2; @@ -736,7 +736,7 @@ void bFile::resolvePointersChunk(const bChunkInd& dataChunk, bool verboseDumpAll short int* oldStruct = fileDna->getStruct(dataChunk.dna_nr); short oldLen = fileDna->getLength(oldStruct[0]); - char* structType = fileDna->getType(oldStruct[0]); + //char* structType = fileDna->getType(oldStruct[0]); char* cur = (char*)findLibPointer(dataChunk.oldPtr); for (int block=0; block