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

removed STL usage of Extras/ConvexBuilder and replaced by btAlignedObjectArray

Browse Source 
fixed several warnings, thanks to sparkprime
added comments patch for linear math, thanks to Tully Foote
This commit is contained in:
erwin.coumans
2008-10-28 18:52:46 +00:00
parent c5112e68e5
commit 28e580c203
39 changed files with 435 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
View File

@@ -36,7 +36,6 @@ subject to the following restrictions:
#include "BMF_Api.h"
#include <stdio.h> //printf debugging
#include <vector>
#include "ConvexDecompositionDemo.h"

24
Demos/Raytracer/Raytracer.cpp
View File

@@ -167,7 +167,7 @@ void Raytracer::clientMoveAndDisplay()
displayCallback();
}
int once = 1;
@@ -353,20 +353,20 @@ void Raytracer::displayCallback()
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glDisable(GL_LIGHTING);
if (once)
if (!m_initialized)
{
m_initialized = true;
glGenTextures(1, &glTextureId);
glBindTexture(GL_TEXTURE_2D,glTextureId );
once = 0;
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
}
glBindTexture(GL_TEXTURE_2D,glTextureId );
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND);

1
Demos/Raytracer/Raytracer.h
View File

@@ -30,6 +30,7 @@ class Raytracer : public DemoApplication
btCollisionDispatcher* m_dispatcher;
btAxisSweep3* m_overlappingPairCache;
btCollisionWorld* m_collisionWorld;
bool m_initialized;
public: