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

more refactoring, restored some profiling and some debugging

Browse Source
This commit is contained in:
ejcoumans
2006-09-30 02:26:51 +00:00
parent d38549aa54
commit 01a6290cf7
7 changed files with 114 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Demos/ColladaDemo/ColladaConverter.cpp
View File

@@ -1053,9 +1053,9 @@ void ColladaConverter::ConvertRigidBodyRef( btRigidBodyInput& rbInput,btRigidBod
} else
{
printf("static concave triangle <mesh> added\n");
//rbOutput.m_colShape = new btTriangleMeshShape(trimesh);//btBvhTriangleMeshShape(trimesh);
rbOutput.m_colShape = new btBvhTriangleMeshShape(trimesh);
//rbOutput.m_colShape = new btBvhTriangleMeshShape(trimesh);
rbOutput.m_colShape = new btConvexTriangleMeshShape(trimesh);
//rbOutput.m_colShape = new btConvexTriangleMeshShape(trimesh);
//btTriangleMeshShape
}

12
Demos/ColladaDemo/ColladaDemo.cpp
View File

@@ -33,7 +33,7 @@ float deltaTime = 1.f/60.f;
#include "ColladaDemo.h"
#include "GL_ShapeDrawer.h"
#include "GlutStuff.h"
int maxObj = 1;
///custom version of the converter, that creates physics objects/constraints
class MyColladaConverter : public ColladaConverter
@@ -80,16 +80,6 @@ class MyColladaConverter : public ColladaConverter
const btTransform& startTransform,
btCollisionShape* shape)
{
if (!isDynamic)
{
printf("nondyna\n");
} else
{
if (!maxObj)
return 0;
maxObj--;
}
btRigidBody* body = m_demoApp->localCreateRigidBody(isDynamic, mass, startTransform,shape);
m_demoApp->getDynamicsWorld()->addCollisionObject(body);