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

expose 2 new command-line options [--disable_cached_cl_kernels] [--load_cl_kernels_from_disk]

Browse Source 
on Windows (_WIN32) debug output goes to BOTH console and Visual Studio output log window.
This commit is contained in:
erwincoumans
2013-08-26 21:58:55 -07:00
parent d32629dbe2
commit ad8d0e32f4
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Demos3/GpuDemos/main_opengl3core.cpp
View File

@@ -55,6 +55,8 @@ bool dump_timings = false;
int maxFrameCount = 102; int maxFrameCount = 102;
extern char OpenSansData[]; extern char OpenSansData[];
extern char* gPairBenchFileName; extern char* gPairBenchFileName;
extern bool gDebugForceLoadingFromSource;
extern bool gDebugSkipLoadingBinary;
static void MyResizeCallback( float width, float height) static void MyResizeCallback( float width, float height)
{ {
@@ -402,7 +404,7 @@ sth_stash* initFont(GLPrimitiveRenderer* primRender)
void Usage() void Usage()
{ {
printf("\nprogram.exe [--selected_demo=<int>] [--cl_device=<int>] [--benchmark] [--maxFrameCount=<int>][--dump_timings] [--disable_opencl] [--cl_platform=<int>] [--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");
}; };
@@ -605,8 +607,8 @@ int main(int argc, char* argv[])
args.GetCmdLineArgument("y_gap", ci.gapY); args.GetCmdLineArgument("y_gap", ci.gapY);
args.GetCmdLineArgument("z_gap", ci.gapZ); args.GetCmdLineArgument("z_gap", ci.gapZ);
gDebugForceLoadingFromSource = args.CheckCmdLineFlag("load_cl_kernels_from_disk");
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

10
src/Bullet3Common/b3Logging.cpp
View File

@@ -27,9 +27,8 @@ void b3PrintfFuncDefault(const char* msg)
{ {
#ifdef _WIN32 #ifdef _WIN32
OutputDebugStringA(msg); OutputDebugStringA(msg);
#else
printf("%s",msg);
#endif #endif
printf("%s",msg);
} }
@@ -37,9 +36,9 @@ void b3WarningMessageFuncDefault(const char* msg)
{ {
#ifdef _WIN32 #ifdef _WIN32
OutputDebugStringA(msg); OutputDebugStringA(msg);
#else
printf("%s",msg);
#endif #endif
printf("%s",msg);
} }
@@ -48,9 +47,8 @@ void b3ErrorMessageFuncDefault(const char* msg)
{ {
#ifdef _WIN32 #ifdef _WIN32
OutputDebugStringA(msg); OutputDebugStringA(msg);
#else
printf("%s",msg);
#endif #endif
printf("%s",msg);
} }