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

more improvements, copy testFile.bullet to target binary directory (cmake), fix some warnings

Browse Source
This commit is contained in:
erwin.coumans
2010-01-30 21:46:50 +00:00
parent f9ad5cf587
commit 77b773f470
7 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Demos/ConvexDecompositionDemo/testFile32Single.bullet
View File

Binary file not shown.

BIN
Demos/ConvexDecompositionDemo/testFile64Double.bullet
View File

Binary file not shown.

BIN
Demos/ConvexDecompositionDemo/testFile64Single.bullet
View File

Binary file not shown.

2
Demos/OpenGL/GLDebugDrawer.cpp
View File

@@ -107,7 +107,7 @@ void GLDebugDrawer::draw3dText(const btVector3& location,const char* textString)
void GLDebugDrawer::reportErrorWarning(const char* warningString) 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) void GLDebugDrawer::drawContactPoint(const btVector3& pointOnB,const btVector3& normalOnB,btScalar distance,int lifeTime,const btVector3& color)

7
Demos/SerializeDemo/CMakeLists.txt
View File

@@ -61,3 +61,10 @@ ELSE (USE_GLUT)
SerializeDemo.h SerializeDemo.h
) )
ENDIF (USE_GLUT) 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}
)

BIN
Demos/SerializeDemo/testFile.bullet Normal file
View File

Binary file not shown.

19
Extras/Serialize/BulletFileLoader/bFile.cpp
View File

@@ -150,8 +150,8 @@ void bFile::parseHeader()
mFlags |= FD_ENDIAN_SWAP; mFlags |= FD_ENDIAN_SWAP;
printf (header); printf ("%s\n",header);
printf ("\nsizeof(void*) == %d\n",sizeof(void*)); printf ("\nsizeof(void*) == %d\n",int(sizeof(void*)));
const char* endStr = ((mFlags & FD_ENDIAN_SWAP)!=0) ? "yes" : "no"; const char* endStr = ((mFlags & FD_ENDIAN_SWAP)!=0) ? "yes" : "no";
printf ("Swapping endian? %s\n",endStr); printf ("Swapping endian? %s\n",endStr);
const char* bitStr = (mFlags &FD_FILE_64)!=0 ? "64 bit" : "32bit"; 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] == '*') if (name[0] == '*')
{ {
// cast pointers // cast pointers
int ptrFile = mFileDNA->getPointerSize(); //int ptrFile = mFileDNA->getPointerSize();
int ptrMem = mMemoryDNA->getPointerSize(); //int ptrMem = mMemoryDNA->getPointerSize();
swapPtr(strcData, data); swapPtr(strcData, data);
@@ -633,7 +633,7 @@ void bFile::swapStruct(int dna_nr, char *data)
if (dna_nr == -1) return; if (dna_nr == -1) return;
short *strc = mFileDNA->getStruct(dna_nr); short *strc = mFileDNA->getStruct(dna_nr);
short *firstStrc = strc; //short *firstStrc = strc;
int elementLen= strc[1]; int elementLen= strc[1];
strc+=2; strc+=2;
@@ -736,7 +736,7 @@ void bFile::resolvePointersChunk(const bChunkInd& dataChunk, bool verboseDumpAll
short int* oldStruct = fileDna->getStruct(dataChunk.dna_nr); short int* oldStruct = fileDna->getStruct(dataChunk.dna_nr);
short oldLen = fileDna->getLength(oldStruct[0]); short oldLen = fileDna->getLength(oldStruct[0]);
char* structType = fileDna->getType(oldStruct[0]); //char* structType = fileDna->getType(oldStruct[0]);
char* cur = (char*)findLibPointer(dataChunk.oldPtr); char* cur = (char*)findLibPointer(dataChunk.oldPtr);
for (int block=0; block<dataChunk.nr; block++) for (int block=0; block<dataChunk.nr; block++)
@@ -848,7 +848,7 @@ void bFile::resolvePointersStructRecursive(char *strcPtr, int dna_nr, bool verbo
if (isIntegerType) if (isIntegerType)
{ {
char* newtype="int"; const char* newtype="int";
int dbarray[MAX_ARRAY_LENGTH]; int dbarray[MAX_ARRAY_LENGTH];
int* dbPtr = 0; int* dbPtr = 0;
char* tmp = elemPtr; char* tmp = elemPtr;
@@ -868,8 +868,7 @@ void bFile::resolvePointersStructRecursive(char *strcPtr, int dna_nr, bool verbo
} }
} else } else
{ {
float value = 1.f; const char* newtype="double";
char* newtype="double";
double dbarray[MAX_ARRAY_LENGTH]; double dbarray[MAX_ARRAY_LENGTH];
double* dbPtr = 0; double* dbPtr = 0;
char* tmp = elemPtr; char* tmp = elemPtr;
@@ -907,7 +906,7 @@ void bFile::resolvePointers(bool verboseDumpAllBlocks)
bParse::bDNA* fileDna = mFileDNA ? mFileDNA : mMemoryDNA; bParse::bDNA* fileDna = mFileDNA ? mFileDNA : mMemoryDNA;
printf("resolvePointers start\n"); printf("resolvePointers start\n");
char *dataPtr = mFileBuffer+mDataStart; //char *dataPtr = mFileBuffer+mDataStart;
if (1) //mFlags & (FD_BITS_VARIES | FD_VERSION_VARIES)) if (1) //mFlags & (FD_BITS_VARIES | FD_VERSION_VARIES))
{ {