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

only enable Wavefront obj support for URDF when ENABLE_URDF_OBJ is defined.

Browse Source 
add destructor for SampleJob1
This commit is contained in:
Erwin Coumans
2016-03-01 09:15:55 -08:00
parent f90ba2eff9
commit d70132a901
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/ExampleBrowser/ExampleEntries.cpp
View File

@@ -1,5 +1,3 @@
#include "ExampleEntries.h" #include "ExampleEntries.h"
#include "LinearMath/btAlignedObjectArray.h" #include "LinearMath/btAlignedObjectArray.h"
@@ -11,7 +9,9 @@
#include "../BasicDemo/BasicExample.h" #include "../BasicDemo/BasicExample.h"
#include "../Planar2D/Planar2D.h" #include "../Planar2D/Planar2D.h"
#include "../Benchmarks/BenchmarkDemo.h" #include "../Benchmarks/BenchmarkDemo.h"
#ifdef ENABLE_URDF_OBJ
#include "../Importers/ImportObjDemo/ImportObjExample.h" #include "../Importers/ImportObjDemo/ImportObjExample.h"
#endif
#include "../Importers/ImportBsp/ImportBspExample.h" #include "../Importers/ImportBsp/ImportBspExample.h"
#include "../Importers/ImportColladaDemo/ImportColladaSetup.h" #include "../Importers/ImportColladaDemo/ImportColladaSetup.h"
#include "../Importers/ImportSTLDemo/ImportSTLSetup.h" #include "../Importers/ImportSTLDemo/ImportSTLSetup.h"
@@ -194,9 +194,9 @@ static ExampleEntry gDefaultExamples[]=
ExampleEntry(0,"Importers"), ExampleEntry(0,"Importers"),
ExampleEntry(1,"Import .bullet", "Load a binary .bullet file. The serialization mechanism can deal with versioning, differences in endianess, 32 and 64bit, double/single precision. It is easy to save a .bullet file, see the examples/Importers/ImportBullet/SerializeDemo.cpp for a code example how to export a .bullet file.", SerializeBulletCreateFunc), ExampleEntry(1,"Import .bullet", "Load a binary .bullet file. The serialization mechanism can deal with versioning, differences in endianess, 32 and 64bit, double/single precision. It is easy to save a .bullet file, see the examples/Importers/ImportBullet/SerializeDemo.cpp for a code example how to export a .bullet file.", SerializeBulletCreateFunc),
#ifdef ENABLE_URDF_OBJ
ExampleEntry(1,"Wavefront Obj", "Import a Wavefront .obj file", ImportObjCreateFunc, 0), ExampleEntry(1,"Wavefront Obj", "Import a Wavefront .obj file", ImportObjCreateFunc, 0),
#endif
ExampleEntry(1,"Quake BSP", "Import a Quake .bsp file", ImportBspCreateFunc, 0), ExampleEntry(1,"Quake BSP", "Import a Quake .bsp file", ImportBspCreateFunc, 0),
ExampleEntry(1,"COLLADA dae", "Import the geometric mesh data from a COLLADA file. This is used as part of the URDF importer. This loader can also be used to import collision geometry in general. ", ExampleEntry(1,"COLLADA dae", "Import the geometric mesh data from a COLLADA file. This is used as part of the URDF importer. This loader can also be used to import collision geometry in general. ",
ImportColladaCreateFunc, 0), ImportColladaCreateFunc, 0),

1
examples/ExampleBrowser/premake4.lua
View File

@@ -20,6 +20,7 @@
"../../src", "../../src",
"../ThirdPartyLibs", "../ThirdPartyLibs",
} }
defines {"ENABLE_URDF_OBJ"}
if _OPTIONS["lua"] then if _OPTIONS["lua"] then
includedirs{"../ThirdPartyLibs/lua-5.2.3/src"} includedirs{"../ThirdPartyLibs/lua-5.2.3/src"}

2
examples/MultiThreading/MultiThreadingExample.cpp
View File

@@ -68,6 +68,8 @@ struct SampleJob1 : public SampleJobInterface
m_jobId(jobId) m_jobId(jobId)
{ {
} }
virtual ~SampleJob1() {}
virtual void executeJob(int threadIndex) virtual void executeJob(int threadIndex)
{ {
printf("start SampleJob1 %d using threadIndex %d\n",m_jobId,threadIndex); printf("start SampleJob1 %d using threadIndex %d\n",m_jobId,threadIndex);