TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Adjustment: Initial CMake reworking.

Browse source
This commit is contained in:
Robert MacGregor 2022-05-13 23:42:41 -04:00
parent 516163fd5d
commit d7cdf54661
5394 changed files with 2615532 additions and 8711 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Engine/lib/bullet/src/LinearMath/btSerializer.h
View file

@ -26,7 +26,7 @@ subject to the following restrictions:
///only the 32bit versions for now
extern char sBulletDNAstr[];
extern int sBulletDNAlen;
extern char sBulletDNAstr64[];
@ -391,8 +391,7 @@ public:
btDefaultSerializer(int totalSize=0, unsigned char* buffer=0)
:m_uniqueIdGenerator(0),
m_totalSize(totalSize),
:m_totalSize(totalSize),
m_currentSize(0),
m_dna(0),
m_dnaLength(0),
@ -447,26 +446,6 @@ public:
btAlignedFree(m_dna);
}
static int getMemoryDnaSizeInBytes()
{
const bool VOID_IS_8 = ((sizeof(void*) == 8));
if (VOID_IS_8)
{
return sBulletDNAlen64;
}
return sBulletDNAlen;
}
static const char* getMemoryDna()
{
const bool VOID_IS_8 = ((sizeof(void*) == 8));
if (VOID_IS_8)
{
return (const char*)sBulletDNAstr64;
}
return (const char*)sBulletDNAstr;
}
void insertHeader()
{
writeHeader(m_buffer);
@ -505,7 +484,7 @@ public:
buffer[9] = '2';
buffer[10] = '8';
buffer[11] = '7';
buffer[11] = '5';
}
@ -562,7 +541,6 @@ public:
virtual void* getUniquePointer(void*oldPtr)
{
btAssert(m_uniqueIdGenerator >= 0);
if (!oldPtr)
return 0;