From 27adaad628009137b9dac771135ea321695f24e3 Mon Sep 17 00:00:00 2001 From: "Daniel K. O." Date: Sun, 24 May 2009 22:03:58 +0000 Subject: [PATCH] added a -texturepath option to drawstuff --- CHANGELOG.txt | 1 + drawstuff/src/drawstuff.cpp | 12 ++++++++---- ode/demo/demo_I.cpp | 4 ---- ode/demo/demo_basket.cpp | 2 -- ode/demo/demo_boxstack.cpp | 4 ---- ode/demo/demo_buggy.cpp | 4 ---- ode/demo/demo_chain1.c | 4 ---- ode/demo/demo_chain2.cpp | 4 ---- ode/demo/demo_crash.cpp | 4 ---- ode/demo/demo_cyl.cpp | 4 ---- ode/demo/demo_cylvssphere.cpp | 2 -- ode/demo/demo_feedback.cpp | 4 ---- ode/demo/demo_friction.cpp | 4 ---- ode/demo/demo_gyroscopic.cpp | 4 ---- ode/demo/demo_heightfield.cpp | 4 ---- ode/demo/demo_hinge.cpp | 4 ---- ode/demo/demo_motion.cpp | 4 ---- ode/demo/demo_motor.cpp | 4 ---- ode/demo/demo_moving_convex.cpp | 4 ---- ode/demo/demo_moving_trimesh.cpp | 4 ---- ode/demo/demo_slider.cpp | 4 ---- ode/demo/demo_space.cpp | 4 ---- ode/demo/demo_space_stress.cpp | 4 ---- ode/demo/demo_step.cpp | 4 ---- ode/demo/demo_trimesh.cpp | 4 ---- 25 files changed, 9 insertions(+), 92 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 206db638..2403c2e5 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -11,6 +11,7 @@ the rules for this file: 05/24/09 Daniel K. O. * Made the new trimesh collider the default. + * Added a "-texturepath" option to drawstuff. 05/18/09 Oleh Derevenko diff --git a/drawstuff/src/drawstuff.cpp b/drawstuff/src/drawstuff.cpp index bc50bca4..b3c1f41a 100644 --- a/drawstuff/src/drawstuff.cpp +++ b/drawstuff/src/drawstuff.cpp @@ -25,9 +25,10 @@ simple graphics. the following command line flags can be used (typically under unix) - -notex Do not use any textures - -noshadow[s] Do not draw any shadows - -pause Start the simulation paused + -notex Do not use any textures + -noshadow[s] Do not draw any shadows + -pause Start the simulation paused + -texturepath Inform an alternative textures path TODO ---- @@ -57,7 +58,7 @@ manage openGL state changes better // misc #ifndef DEFAULT_PATH_TO_TEXTURES -#ifdef WIN32 +#if 0 #define DEFAULT_PATH_TO_TEXTURES "..\\textures\\" #else #define DEFAULT_PATH_TO_TEXTURES "../textures/" @@ -1268,6 +1269,9 @@ extern "C" void dsSimulationLoop (int argc, char **argv, if (strcmp(argv[i],"-noshadow")==0) use_shadows = 0; if (strcmp(argv[i],"-noshadows")==0) use_shadows = 0; if (strcmp(argv[i],"-pause")==0) initial_pause = 1; + if (strcmp(argv[i],"-texturepath")==0) + if (++i < argc) + fn->path_to_textures = argv[i]; } if (fn->version > DS_VERSION) diff --git a/ode/demo/demo_I.cpp b/ode/demo/demo_I.cpp index 5c0bdb93..156a4ad1 100644 --- a/ode/demo/demo_I.cpp +++ b/ode/demo/demo_I.cpp @@ -239,10 +239,6 @@ int main (int argc, char **argv) fn.command = 0; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } dInitODE2(0); dRandSetSeed (time(0)); diff --git a/ode/demo/demo_basket.cpp b/ode/demo/demo_basket.cpp index e060cfef..a0dc8a23 100644 --- a/ode/demo/demo_basket.cpp +++ b/ode/demo/demo_basket.cpp @@ -212,8 +212,6 @@ int main (int argc, char **argv) fn.command = &command; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - fn.path_to_textures = argv[1]; // create world dInitODE2(0); diff --git a/ode/demo/demo_boxstack.cpp b/ode/demo/demo_boxstack.cpp index 1e89d0d7..a6cdb4d0 100644 --- a/ode/demo/demo_boxstack.cpp +++ b/ode/demo/demo_boxstack.cpp @@ -623,10 +623,6 @@ int main (int argc, char **argv) fn.command = &command; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } // create world dInitODE2(0); diff --git a/ode/demo/demo_buggy.cpp b/ode/demo/demo_buggy.cpp index a0951467..d01f225d 100644 --- a/ode/demo/demo_buggy.cpp +++ b/ode/demo/demo_buggy.cpp @@ -223,10 +223,6 @@ int main (int argc, char **argv) fn.command = &command; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } // create world dInitODE2(0); diff --git a/ode/demo/demo_chain1.c b/ode/demo/demo_chain1.c index 007d3708..dc2f908e 100644 --- a/ode/demo/demo_chain1.c +++ b/ode/demo/demo_chain1.c @@ -133,10 +133,6 @@ int main (int argc, char **argv) fn.command = 0; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } /* create world */ dInitODE2(0); diff --git a/ode/demo/demo_chain2.cpp b/ode/demo/demo_chain2.cpp index 8f1208bc..fe1a9315 100644 --- a/ode/demo/demo_chain2.cpp +++ b/ode/demo/demo_chain2.cpp @@ -127,10 +127,6 @@ int main (int argc, char **argv) fn.command = 0; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } // create world dInitODE2(0); diff --git a/ode/demo/demo_crash.cpp b/ode/demo/demo_crash.cpp index d322107d..f403f0b8 100644 --- a/ode/demo/demo_crash.cpp +++ b/ode/demo/demo_crash.cpp @@ -617,10 +617,6 @@ int main (int argc, char **argv) fn.command = &command; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } dInitODE2(0); diff --git a/ode/demo/demo_cyl.cpp b/ode/demo/demo_cyl.cpp index c61d7797..8958e682 100644 --- a/ode/demo/demo_cyl.cpp +++ b/ode/demo/demo_cyl.cpp @@ -235,10 +235,6 @@ int main (int argc, char **argv) fn.command = &command; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } // create world dInitODE2(0); diff --git a/ode/demo/demo_cylvssphere.cpp b/ode/demo/demo_cylvssphere.cpp index ee84ac5b..33a285e8 100644 --- a/ode/demo/demo_cylvssphere.cpp +++ b/ode/demo/demo_cylvssphere.cpp @@ -186,8 +186,6 @@ int main (int argc, char **argv) fn.command = &command; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - fn.path_to_textures = argv[1]; // create world dInitODE2(0); diff --git a/ode/demo/demo_feedback.cpp b/ode/demo/demo_feedback.cpp index 5eb6a363..656ebb0e 100644 --- a/ode/demo/demo_feedback.cpp +++ b/ode/demo/demo_feedback.cpp @@ -228,10 +228,6 @@ int main (int argc, char **argv) fn.command = &command; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } // create world dInitODE2(0); diff --git a/ode/demo/demo_friction.cpp b/ode/demo/demo_friction.cpp index 28e7e6c5..6b17d050 100644 --- a/ode/demo/demo_friction.cpp +++ b/ode/demo/demo_friction.cpp @@ -171,10 +171,6 @@ int main (int argc, char **argv) fn.command = 0; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } // create world dInitODE2(0); diff --git a/ode/demo/demo_gyroscopic.cpp b/ode/demo/demo_gyroscopic.cpp index dc0a0b66..843e5e2d 100644 --- a/ode/demo/demo_gyroscopic.cpp +++ b/ode/demo/demo_gyroscopic.cpp @@ -179,10 +179,6 @@ int main (int argc, char **argv) fn.command = &command; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } // create world diff --git a/ode/demo/demo_heightfield.cpp b/ode/demo/demo_heightfield.cpp index 00d8c1e5..eaa10e87 100644 --- a/ode/demo/demo_heightfield.cpp +++ b/ode/demo/demo_heightfield.cpp @@ -694,10 +694,6 @@ int main (int argc, char **argv) fn.command = &command; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } // create world dInitODE2(0); diff --git a/ode/demo/demo_hinge.cpp b/ode/demo/demo_hinge.cpp index 83023c01..926da216 100644 --- a/ode/demo/demo_hinge.cpp +++ b/ode/demo/demo_hinge.cpp @@ -129,10 +129,6 @@ int main (int argc, char **argv) fn.command = &command; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } // create world dInitODE2(0); diff --git a/ode/demo/demo_motion.cpp b/ode/demo/demo_motion.cpp index 03aeea47..8f3ab93b 100644 --- a/ode/demo/demo_motion.cpp +++ b/ode/demo/demo_motion.cpp @@ -458,10 +458,6 @@ int main (int argc, char **argv) fn.command = &command; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } // create world dInitODE(); diff --git a/ode/demo/demo_motor.cpp b/ode/demo/demo_motor.cpp index 2248b3c1..d3bbb653 100644 --- a/ode/demo/demo_motor.cpp +++ b/ode/demo/demo_motor.cpp @@ -144,10 +144,6 @@ int main (int argc, char **argv) fn.command = &command; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc>=2) - { - fn.path_to_textures = argv[1]; - } // create world dInitODE2(0); diff --git a/ode/demo/demo_moving_convex.cpp b/ode/demo/demo_moving_convex.cpp index 052e6834..e1a8033b 100644 --- a/ode/demo/demo_moving_convex.cpp +++ b/ode/demo/demo_moving_convex.cpp @@ -380,10 +380,6 @@ int main( int argc, char **argv ) fn.command = &command; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if ( argc==2 ) - { - fn.path_to_textures = argv[1]; - } // create world dInitODE2( 0 ); diff --git a/ode/demo/demo_moving_trimesh.cpp b/ode/demo/demo_moving_trimesh.cpp index 55082473..9c92e04b 100644 --- a/ode/demo/demo_moving_trimesh.cpp +++ b/ode/demo/demo_moving_trimesh.cpp @@ -535,10 +535,6 @@ int main (int argc, char **argv) fn.command = &command; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } // create world dInitODE2(0); diff --git a/ode/demo/demo_slider.cpp b/ode/demo/demo_slider.cpp index a0d9f9b3..33be9edb 100644 --- a/ode/demo/demo_slider.cpp +++ b/ode/demo/demo_slider.cpp @@ -140,10 +140,6 @@ int main (int argc, char **argv) fn.command = &command; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } // create world dInitODE2(0); diff --git a/ode/demo/demo_space.cpp b/ode/demo/demo_space.cpp index 4baad89f..21971b8a 100644 --- a/ode/demo/demo_space.cpp +++ b/ode/demo/demo_space.cpp @@ -205,10 +205,6 @@ int main (int argc, char **argv) fn.command = &command; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } dInitODE2(0); diff --git a/ode/demo/demo_space_stress.cpp b/ode/demo/demo_space_stress.cpp index 65a044b2..01d7824a 100644 --- a/ode/demo/demo_space_stress.cpp +++ b/ode/demo/demo_space_stress.cpp @@ -400,10 +400,6 @@ int main (int argc, char **argv) fn.command = &command; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } // create world dInitODE2(0); diff --git a/ode/demo/demo_step.cpp b/ode/demo/demo_step.cpp index b5f0261b..f19a99c7 100644 --- a/ode/demo/demo_step.cpp +++ b/ode/demo/demo_step.cpp @@ -178,10 +178,6 @@ int main (int argc, char **argv) fn.command = 0; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } dInitODE2(0); dRandSetSeed (time(0)); diff --git a/ode/demo/demo_trimesh.cpp b/ode/demo/demo_trimesh.cpp index 5aaf6a35..1add6eae 100644 --- a/ode/demo/demo_trimesh.cpp +++ b/ode/demo/demo_trimesh.cpp @@ -453,10 +453,6 @@ int main (int argc, char **argv) fn.command = &command; fn.stop = 0; fn.path_to_textures = DRAWSTUFF_TEXTURE_PATH; - if(argc==2) - { - fn.path_to_textures = argv[1]; - } // create world dInitODE2(0); -- 2.11.4.GIT