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

expose some more settings as command-line parameters:

Browse Source 
[--disable_shadowmap] [--shadowmap_size=int] [--shadowmap_resolution=<int>] [--use_jacobi] [--use_uniform_grid]
This commit is contained in:
erwincoumans
2013-11-11 22:20:21 -08:00
parent 5ce0b3938f
commit 472614772f
2 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Demos3/GpuDemos/main_opengl3core.cpp
View File

@@ -55,8 +55,15 @@ bool dump_timings = false;
int maxFrameCount = 102; int maxFrameCount = 102;
extern char OpenSansData[]; extern char OpenSansData[];
extern char* gPairBenchFileName; extern char* gPairBenchFileName;
extern float shadowMapWidth;
extern float shadowMapHeight;
extern bool gDebugForceLoadingFromSource; extern bool gDebugForceLoadingFromSource;
extern bool gDebugSkipLoadingBinary; extern bool gDebugSkipLoadingBinary;
extern bool useShadowMap;
extern float shadowMapWorldSize;
extern bool useJacobi;
extern bool useUniformGrid;
static void MyResizeCallback( float width, float height) static void MyResizeCallback( float width, float height)
{ {
@@ -407,6 +414,7 @@ sth_stash* initFont(GLPrimitiveRenderer* primRender)
void Usage() void Usage()
{ {
printf("\nprogram.exe [--selected_demo=<int>] [--benchmark] [--maxFrameCount=<int>][--dump_timings] [--disable_opencl] [--cl_device=<int>] [--cl_platform=<int>] [--disable_cached_cl_kernels] [--load_cl_kernels_from_disk] [--x_dim=<int>] [--y_dim=<num>] [--z_dim=<int>] [--x_gap=<float>] [--y_gap=<float>] [--z_gap=<float>] [--use_concave_mesh] [--pair_benchmark_file=<filename>] [--new_batching] [--no_instanced_collision_shapes]\n"); printf("\nprogram.exe [--selected_demo=<int>] [--benchmark] [--maxFrameCount=<int>][--dump_timings] [--disable_opencl] [--cl_device=<int>] [--cl_platform=<int>] [--disable_cached_cl_kernels] [--load_cl_kernels_from_disk] [--x_dim=<int>] [--y_dim=<num>] [--z_dim=<int>] [--x_gap=<float>] [--y_gap=<float>] [--z_gap=<float>] [--use_concave_mesh] [--pair_benchmark_file=<filename>] [--new_batching] [--no_instanced_collision_shapes]\n");
printf("[--disable_shadowmap] [--shadowmap_size=int] [--shadowmap_resolution=<int>] [--use_jacobi] [--use_uniform_grid]\n");
}; };
@@ -590,7 +598,19 @@ int main(int argc, char* argv[])
bool benchmark=args.CheckCmdLineFlag("benchmark"); bool benchmark=args.CheckCmdLineFlag("benchmark");
args.GetCmdLineArgument("max_framecount",maxFrameCount); args.GetCmdLineArgument("max_framecount",maxFrameCount);
args.GetCmdLineArgument("shadowmap_size",shadowMapWorldSize);
args.GetCmdLineArgument("shadowmap_resolution",shadowMapWidth);
shadowMapHeight=shadowMapWidth;
if (args.CheckCmdLineFlag("disable_shadowmap"))
{
useShadowMap = false;
}
args.GetCmdLineArgument("pair_benchmark_file",gPairBenchFileName); args.GetCmdLineArgument("pair_benchmark_file",gPairBenchFileName);
useJacobi = args.CheckCmdLineFlag("use_jacobi");
useUniformGrid = args.CheckCmdLineFlag("use_uniform_grid");
dump_timings=args.CheckCmdLineFlag("dump_timings"); dump_timings=args.CheckCmdLineFlag("dump_timings");
ci.useOpenCL = !args.CheckCmdLineFlag("disable_opencl"); ci.useOpenCL = !args.CheckCmdLineFlag("disable_opencl");
@@ -613,6 +633,8 @@ int main(int argc, char* argv[])
gDebugForceLoadingFromSource = args.CheckCmdLineFlag("load_cl_kernels_from_disk"); gDebugForceLoadingFromSource = args.CheckCmdLineFlag("load_cl_kernels_from_disk");
gDebugSkipLoadingBinary = args.CheckCmdLineFlag("disable_cached_cl_kernels"); gDebugSkipLoadingBinary = args.CheckCmdLineFlag("disable_cached_cl_kernels");
#ifndef B3_NO_PROFILE #ifndef B3_NO_PROFILE
b3ProfileManager::Reset(); b3ProfileManager::Reset();
#endif //B3_NO_PROFILE #endif //B3_NO_PROFILE

13
Demos3/GpuDemos/rigidbody/GpuRigidBodyDemo.cpp
View File

@@ -22,7 +22,7 @@
static b3KeyboardCallback oldCallback = 0; static b3KeyboardCallback oldCallback = 0;
extern bool gReset; extern bool gReset;
bool useUniformGrid = false;
bool convertOnCpu = false; bool convertOnCpu = false;
#define MSTRINGIFY(A) #A #define MSTRINGIFY(A) #A
@@ -121,8 +121,15 @@ void GpuRigidBodyDemo::initPhysics(const ConstructionInfo& ci)
b3GpuNarrowPhase* np = new b3GpuNarrowPhase(m_clData->m_clContext,m_clData->m_clDevice,m_clData->m_clQueue,m_data->m_config); b3GpuNarrowPhase* np = new b3GpuNarrowPhase(m_clData->m_clContext,m_clData->m_clDevice,m_clData->m_clQueue,m_data->m_config);
b3GpuSapBroadphase* bp = new b3GpuSapBroadphase(m_clData->m_clContext,m_clData->m_clDevice,m_clData->m_clQueue); b3GpuBroadphaseInterface* bp =0;
//b3GpuBroadphaseInterface* bp = new b3GpuGridBroadphase(m_clData->m_clContext,m_clData->m_clDevice,m_clData->m_clQueue);
if (useUniformGrid)
{
bp = new b3GpuGridBroadphase(m_clData->m_clContext,m_clData->m_clDevice,m_clData->m_clQueue);
} else
{
bp = new b3GpuSapBroadphase(m_clData->m_clContext,m_clData->m_clDevice,m_clData->m_clQueue);
}
m_data->m_np = np; m_data->m_np = np;
m_data->m_bp = bp; m_data->m_bp = bp;
m_data->m_broadphaseDbvt = new b3DynamicBvhBroadphase(m_data->m_config.m_maxConvexBodies); m_data->m_broadphaseDbvt = new b3DynamicBvhBroadphase(m_data->m_config.m_maxConvexBodies);