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

revert old change to bullet.pc.in file for autotools. Note that autotools builds/installs lowercase libraries and cmake uses upper/camel case.

Browse Source 
fix minor Blender serialization issue (not applicable to .bullet files, but code base is shared)
This commit is contained in:
erwin.coumans
2010-09-07 20:26:22 +00:00
parent 14ec920dbb
commit de56f3a473
2 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -830,46 +830,46 @@ void bFile::resolvePointersMismatch()
} }
} }
for (i=0;i< m_pointerPtrFixupArray.size();i++)
for (i=0; i<m_pointerPtrFixupArray.size(); i++)
{ {
char* cur= m_pointerPtrFixupArray.at(i); char* cur= m_pointerPtrFixupArray.at(i);
void** ptrptr = (void**)cur; void** ptrptr = (void**)cur;
bChunkInd *block = m_chunkPtrPtrMap.find(*ptrptr); bChunkInd *block = m_chunkPtrPtrMap.find(*ptrptr);
if (block) if (block)
{ {
int ptrMem = mMemoryDNA->getPointerSize(); int ptrMem = mMemoryDNA->getPointerSize();
int ptrFile = mFileDNA->getPointerSize(); int ptrFile = mFileDNA->getPointerSize();
int blockLen = block->len / ptrFile; int blockLen = block->len / ptrFile;
int blkAlloc = blockLen * ptrMem;
void *onptr = findLibPointer(*ptrptr); void *onptr = findLibPointer(*ptrptr);
if (onptr) if (onptr)
{ {
char *newPtr = new char[blkAlloc * ptrMem]; char *newPtr = new char[blockLen * ptrMem];
addDataBlock(newPtr); addDataBlock(newPtr);
memset(newPtr, 0, blkAlloc * ptrMem); memset(newPtr, 0, blockLen * ptrMem);
void **onarray = (void**)onptr; void **onarray = (void**)onptr;
char *oldPtr = (char*)onarray; char *oldPtr = (char*)onarray;
int p = 0; int p = 0;
while (blkAlloc-- > 0) while (blockLen-- > 0)
{ {
btPointerUid dp = {0}; btPointerUid dp = {0};
safeSwapPtr((char*)dp.m_uniqueIds, oldPtr); safeSwapPtr((char*)dp.m_uniqueIds, oldPtr);
void **tptr = (void**)(newPtr + p * ptrMem); void **tptr = (void**)(newPtr + p * ptrMem);
*tptr = findLibPointer(dp.m_ptr); *tptr = findLibPointer(dp.m_ptr);
oldPtr += ptrFile; oldPtr += ptrFile;
++p; ++p;
} }
*ptrptr = newPtr; *ptrptr = newPtr;
} }
} }
} }
} }
@@ -1352,4 +1352,3 @@ int bFile::getNextBlock(bChunkInd *dataChunk, const char *dataPtr, const int fl
//eof //eof

2
bullet.pc.in
View File

@@ -7,5 +7,5 @@ Name: bullet
Description: Bullet Continuous Collision Detection and Physics Library Description: Bullet Continuous Collision Detection and Physics Library
Requires: Requires:
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lBulletSoftBody -lBulletDynamics -lBulletCollision -lLinearMath Libs: -L${libdir} -lbulletsoftbody -lbulletdynamics -lbulletcollision -lbulletmath
Cflags: -I${includedir}/bullet Cflags: -I${includedir}/bullet