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

fix btCompoundShaps serialization of child shapes

Browse Source 
added ConcaveDemo to cmake
added LinearMath/btSerializer.h to btBulletCollisionCommon.h
This commit is contained in:
erwin.coumans
2010-01-27 23:37:46 +00:00
parent 7a445d70b7
commit 485d1a338e
8 changed files with 89 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Demos/ConcaveDemo/ConcaveDemo.h
View File

@@ -15,7 +15,14 @@ subject to the following restrictions:
#ifndef CONCAVE_DEMO_H
#define CONCAVE_DEMO_H
#ifdef _WINDOWS
#include "Win32DemoApplication.h"
#define PlatformDemoApplication Win32DemoApplication
#else
#include "GlutDemoApplication.h"
#define PlatformDemoApplication GlutDemoApplication
#endif
#include "LinearMath/btAlignedObjectArray.h"
class btBroadphaseInterface;
@@ -29,7 +36,7 @@ class btTriangleIndexVertexArray;
///ConcaveDemo shows usage of static concave triangle meshes
///It also shows per-triangle material (friction/restitution) through CustomMaterialCombinerCallback
class ConcaveDemo : public GlutDemoApplication
class ConcaveDemo : public PlatformDemoApplication
{
//keep the collision shapes, for deletion/cleanup