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

some changes related to BspDemo

Browse Source
This commit is contained in:
ejcoumans
2006-08-11 23:01:25 +00:00
parent 22c416dc0c
commit e2b6d4ee65
12 changed files with 2304 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Demos/ColladaDemo/BspLoader.cpp
View File

@@ -458,7 +458,7 @@ int BspLoader::getMachineEndianness()
short BspLoader::LittleShort (short l)
{
if (machineEndianness() == BIG_ENDIAN)
if (machineEndianness() == BSP_BIG_ENDIAN)
{
unsigned char b1,b2;
@@ -473,7 +473,7 @@ short BspLoader::LittleShort (short l)
short BspLoader::BigShort (short l)
{
if (machineEndianness() == BIG_ENDIAN)
if (machineEndianness() == BSP_BIG_ENDIAN)
{
return l;
}
@@ -492,7 +492,7 @@ short BspLoader::BigShort (short l)
int BspLoader::LittleLong (int l)
{
if (machineEndianness() == BIG_ENDIAN)
if (machineEndianness() == BSP_BIG_ENDIAN)
{
unsigned char b1,b2,b3,b4;
@@ -511,7 +511,7 @@ int BspLoader::LittleLong (int l)
int BspLoader::BigLong (int l)
{
if (machineEndianness() == BIG_ENDIAN)
if (machineEndianness() == BSP_BIG_ENDIAN)
{
return l;
}
@@ -531,7 +531,7 @@ int BspLoader::BigLong (int l)
float BspLoader::LittleFloat (float l)
{
if (machineEndianness() == BIG_ENDIAN)
if (machineEndianness() == BSP_BIG_ENDIAN)
{
union {unsigned char b[4]; float f;} in, out;
@@ -550,7 +550,7 @@ float BspLoader::LittleFloat (float l)
float BspLoader::BigFloat (float l)
{
if (machineEndianness() == BIG_ENDIAN)
if (machineEndianness() == BSP_BIG_ENDIAN)
{
return l;
}

6
Demos/ColladaDemo/BspLoader.h
View File

@@ -176,7 +176,7 @@ class BspLoader
:m_num_entities(0)
{
m_Endianness = getMachineEndianness();
if (m_Endianness == BIG_ENDIAN)
if (m_Endianness == BSP_BIG_ENDIAN)
{
printf("Machine is BIG_ENDIAN\n");
} else
@@ -286,8 +286,8 @@ class BspLoader
enum
{
LITTLE_ENDIAN = 0,
BIG_ENDIAN = 1
BSP_LITTLE_ENDIAN = 0,
BSP_BIG_ENDIAN = 1,
};
//returns machines big endian / little endian

9
Demos/ColladaDemo/ColladaDemo.cpp
View File

@@ -48,8 +48,8 @@ extern int gForwardAxis;
#include "GLDebugDrawer.h"
#define QUAKE_BSP_IMPORTING 1
//in future make it a bsp2dae
//#define QUAKE_BSP_IMPORTING 1
#ifdef QUAKE_BSP_IMPORTING
#include "BspLoader.h"
@@ -308,6 +308,7 @@ CcdPhysicsController* CreatePhysicsObject(bool isDynamic, float mass, const Sim
}
#ifdef QUAKE_BSP_IMPORTING
///BspToBulletConverter extends the BspConverter to convert to Bullet datastructures
class BspToBulletConverter : public BspConverter
@@ -334,7 +335,7 @@ public:
}
}
};
#endif //QUAKE_BSP_IMPORTING
#ifdef USE_FCOLLADA
@@ -1851,7 +1852,7 @@ int main(int argc,char** argv)
#endif
clientResetScene();
setCameraDistance(16.f);
setCameraDistance(26.f);
return glutmain(argc, argv,640,480,"Bullet COLLADA Physics Viewer http://bullet.sourceforge.net");
}