Fixes for Linux compilation,

Thanks to Ole: http://bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=3590
Add option to select EPA or Minkowski sampling method in btDefaultCollisionConfiguration
This commit is contained in:
erwin.coumans
2009-05-11 20:35:26 +00:00
parent 0a360904b6
commit 34685cb631
8 changed files with 23 additions and 22 deletions

View File

@@ -1,7 +1,7 @@
#define TaruVtxCount 43
#define TaruIdxCount 132
float TaruVtx[] = {
static float TaruVtx[] = {
1.08664f,-1.99237f,0.0f,
0.768369f,-1.99237f,-0.768369f,
1.28852f,1.34412e-007f,-1.28852f,
@@ -47,7 +47,7 @@ float TaruVtx[] = {
1.08664f,1.99237f,0.0f,
};
float TaruNml[] = {
static float TaruNml[] = {
0.938103f,-0.346356f,0.0f,
0.663339f,-0.346356f,-0.663339f,
0.707107f,0.0f,-0.707107f,
@@ -93,7 +93,7 @@ float TaruNml[] = {
0.0f,1.0f,0.0f,
};
float TaruTex[] = {
static float TaruTex[] = {
0.75f,0.0f,
0.875f,0.0f,
0.875f,0.5f,
@@ -139,7 +139,7 @@ float TaruTex[] = {
0.5f,1.0f,
};
unsigned short TaruIdx[] = {
static unsigned short TaruIdx[] = {
0,1,2,
2,3,0,
1,4,5,

View File

@@ -431,8 +431,8 @@ void btGpuDemoDynamicsWorld::debugDrawConstraints(int selectedBatch, const float
for(int i = 0; i < numConstraints; i++)
{
int indx = pBatchIds[i];
int idA = m_hIds[indx].x;
int idB = m_hIds[indx].y;
int idA = m_hIds[indx].x-1;
int idB = m_hIds[indx].y-1;
if((idA > 0) && (idB > 0))
{
btCollisionObject* colObjA = m_collisionObjects[idA];

View File

@@ -42,7 +42,7 @@ subject to the following restrictions:
//----------------------------------------------------------------------------------------
#include "btGpuDemo2DSharedTypes.h"
#include "btGpuDemo2dSharedTypes.h"
//----------------------------------------------------------------------------------------

View File

@@ -16,7 +16,7 @@ subject to the following restrictions:
#include "GLDebugFont.h"
#include "GlutStuff.h"
#include <stdio.h>
#include <string>
#include <string.h> //for memset
extern unsigned char sFontData[];
static GLuint sTexture = -1;