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

fix many warnings

Browse Source 
remove btMultiSapBroadphase.*
make collisionFilterGroup/collisionFilterMark int (instead of short int)
This commit is contained in:
Erwin Coumans
2017-01-15 22:26:11 -08:00
parent e3df00d5f1
commit c0c4c8ba3f
146 changed files with 830 additions and 1431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Bullet3Serialize/Bullet2FileLoader/b3DNA.cpp
View File

@@ -176,7 +176,7 @@ void bDNA::initCmpFlags(bDNA *memDNA)
// this ptr should be the file data
assert(!m_Names.size() == 0 && "SDNA empty!");
assert(!(m_Names.size() == 0));// && "SDNA empty!");
mCMPFlags.resize(mStructs.size(), FDF_NONE);
@@ -348,7 +348,8 @@ static int name_is_array(char* name, int* dim1, int* dim2) {
void bDNA::init(char *data, int len, bool swap)
{
int *intPtr=0;short *shtPtr=0;
char *cp = 0;int dataLen =0;long nr=0;
char *cp = 0;int dataLen =0;
//long nr=0;
intPtr = (int*)data;
/*

7
src/Bullet3Serialize/Bullet2FileLoader/b3File.cpp
View File

@@ -391,7 +391,8 @@ void bFile::swapDNA(char* ptr)
char* data = &ptr[20];
// void bDNA::init(char *data, int len, bool swap)
int *intPtr=0;short *shtPtr=0;
char *cp = 0;int dataLen =0;long nr=0;
char *cp = 0;int dataLen =0;
//long nr=0;
intPtr = (int*)data;
/*
@@ -540,7 +541,7 @@ void bFile::writeFile(const char* fileName)
void bFile::preSwap()
{
const bool brokenDNA = (mFlags&FD_BROKEN_DNA)!=0;
//const bool brokenDNA = (mFlags&FD_BROKEN_DNA)!=0;
//FD_ENDIAN_SWAP
//byte 8 determines the endianness of the file, little (v) versus big (V)
int littleEndian= 1;
@@ -1173,7 +1174,7 @@ void bFile::resolvePointersMismatch()
int p = 0;
while (blockLen-- > 0)
{
b3PointerUid dp = {0};
b3PointerUid dp = {{0}};
safeSwapPtr((char*)dp.m_uniqueIds, oldPtr);
void **tptr = (void**)(newPtr + p * ptrMem);