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

make Bullet compile on Visual Studio 6

Browse Source
This commit is contained in:
erwin.coumans
2010-01-30 23:10:12 +00:00
parent 788f48643b
commit e57f03599a
12 changed files with 515 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Extras/Serialize/BulletFileLoader/bDNA.cpp
View File

@@ -177,7 +177,8 @@ void bDNA::initCmpFlags(bDNA *memDNA)
for (int i=0; i<(int)mStructs.size(); i++)
int i;
for ( i=0; i<(int)mStructs.size(); i++)
{
short *oldStruct = mStructs[i];
@@ -258,7 +259,7 @@ void bDNA::initCmpFlags(bDNA *memDNA)
// recurse in
for (int i=0; i<(int)mStructs.size(); i++)
for ( i=0; i<(int)mStructs.size(); i++)
{
if (mCMPFlags[i] == FDF_STRUCT_NEQU)
initRecurseCmpFlags(i);
@@ -368,7 +369,8 @@ void bDNA::init(char *data, int len, bool swap)
intPtr++;
cp = (char*)intPtr;
for (int i=0; i<dataLen; i++)
int i;
for ( i=0; i<dataLen; i++)
{
bNameInfo info;
info.m_name = cp;
@@ -406,7 +408,7 @@ void bDNA::init(char *data, int len, bool swap)
intPtr++;
cp = (char*)intPtr;
for (int i=0; i<dataLen; i++)
for ( i=0; i<dataLen; i++)
{
mTypes.push_back(cp);
while (*cp)cp++;
@@ -437,7 +439,7 @@ void bDNA::init(char *data, int len, bool swap)
dataLen = (int)mTypes.size();
shtPtr = (short*)intPtr;
for (int i=0; i<dataLen; i++, shtPtr++)
for ( i=0; i<dataLen; i++, shtPtr++)
{
if (swap)
shtPtr[0] = ChunkUtils::swapShort(shtPtr[0]);
@@ -467,7 +469,7 @@ void bDNA::init(char *data, int len, bool swap)
shtPtr = (short*)intPtr;
for (int i=0; i<dataLen; i++)
for ( i=0; i<dataLen; i++)
{
mStructs.push_back (shtPtr);
if (swap)
@@ -490,7 +492,7 @@ void bDNA::init(char *data, int len, bool swap)
// build reverse lookups
for (int i=0; i<(int)mStructs.size(); i++)
for ( i=0; i<(int)mStructs.size(); i++)
{
short *strc = mStructs.at(i);
if (!mPtrLen && strcmp(mTypes[strc[0]],"ListBase")==0)
@@ -539,7 +541,7 @@ void bDNA::dumpTypeDefinitions()
}
for (int i=0; i<(int)mStructs.size(); i++)
for ( i=0; i<(int)mStructs.size(); i++)
{
int totalBytes=0;
short *oldStruct = mStructs[i];

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

@@ -855,14 +855,15 @@ void bFile::resolvePointersStructRecursive(char *strcPtr, int dna_nr, bool verbo
dbPtr = &dbarray[0];
if (dbPtr)
{
int i;
getElement(arrayLen, newtype,memType, tmp, (char*)dbPtr);
for (int i=0;i<recursion;i++)
for (i=0;i<recursion;i++)
printf(" ");
if (arrayLen==1)
printf("<%s type=\"%s\">",memName,memType);
else
printf("<%s type=\"%s\" count=%d>",memName,memType,arrayLen);
for (int i=0;i<arrayLen;i++)
for (i=0;i<arrayLen;i++)
printf(" %d ",dbPtr[i]);
printf("</%s>\n",memName);
}
@@ -875,14 +876,15 @@ void bFile::resolvePointersStructRecursive(char *strcPtr, int dna_nr, bool verbo
dbPtr = &dbarray[0];
if (dbPtr)
{
int i;
getElement(arrayLen, newtype,memType, tmp, (char*)dbPtr);
for (int i=0;i<recursion;i++)
for (i=0;i<recursion;i++)
printf(" ");
if (arrayLen==1)
printf("<%s type=\"%s\">",memName,memType);
else
printf("<%s type=\"%s\" count=%d>",memName,memType,arrayLen);
for (int i=0;i<arrayLen;i++)
for (i=0;i<arrayLen;i++)
printf(" %f ",dbPtr[i]);
printf("</%s>\n",memName);
}

8
Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp
View File

@@ -216,7 +216,8 @@ btCollisionShape* btBulletWorldImporter::convertCollisionShape( btCollisionShap
btAlignedObjectArray<btScalar> radii;
radii.resize(numSpheres);
tmpPos.resize(numSpheres);
for (int i=0;i<numSpheres;i++)
int i;
for ( i=0;i<numSpheres;i++)
{
tmpPos[i].deSerializeFloat(mss->m_localPositionArrayPtr[i].m_pos);
radii[i] = mss->m_localPositionArrayPtr[i].m_radius;
@@ -234,7 +235,8 @@ btCollisionShape* btBulletWorldImporter::convertCollisionShape( btCollisionShap
btAlignedObjectArray<btVector3> tmpPoints;
tmpPoints.resize(numPoints);
for (int i=0;i<numPoints;i++)
int i;
for ( i=0;i<numPoints;i++)
{
#ifdef BT_USE_DOUBLE_PRECISION
if (convexData->m_unscaledPointsDoublePtr)
@@ -249,7 +251,7 @@ btCollisionShape* btBulletWorldImporter::convertCollisionShape( btCollisionShap
#endif //BT_USE_DOUBLE_PRECISION
}
btConvexHullShape* hullShape = createConvexHullShape();
for (int i=0;i<numPoints;i++)
for (i=0;i<numPoints;i++)
{
hullShape->addPoint(tmpPoints[i]);
}