Revision: 44605 http://brlcad.svn.sourceforge.net/brlcad/?rev=44605&view=rev Author: bob1961 Date: 2011-05-10 20:00:04 +0000 (Tue, 10 May 2011)
Log Message: ----------- Fix rt commands use of "-c orientation" subcommand. Modified Paths: -------------- brlcad/trunk/src/rt/do.c brlcad/trunk/src/rt/main.c brlcad/trunk/src/rt/opt.c Modified: brlcad/trunk/src/rt/do.c =================================================================== --- brlcad/trunk/src/rt/do.c 2011-05-10 19:28:17 UTC (rev 44604) +++ brlcad/trunk/src/rt/do.c 2011-05-10 20:00:04 UTC (rev 44605) @@ -59,6 +59,10 @@ extern void grid_setup(void); extern void worker(int cpu, genptr_t arg); +/***** variables shared with opt.c *****/ +extern int orientflag; /* 1 means orientation has been set */ +/***** end variables shared with opt.c *****/ + /***** variables shared with rt.c *****/ extern char *string_pix_start; /* string spec of starting pixel */ extern char *string_pix_end; /* string spec of ending pixel */ @@ -285,6 +289,7 @@ for (i=0; i<4; i++) quat[i] = atof(argv[i+1]); quat_quat2mat(Viewrotscale, quat); + orientflag = 1; return 0; } Modified: brlcad/trunk/src/rt/main.c =================================================================== --- brlcad/trunk/src/rt/main.c 2011-05-10 19:28:17 UTC (rev 44604) +++ brlcad/trunk/src/rt/main.c 2011-05-10 20:00:04 UTC (rev 44605) @@ -82,6 +82,7 @@ long n_free; long n_realloc; extern int matflag; /* read matrix from stdin */ +extern int orientflag; /* 1 means orientation has been set */ extern int desiredframe; /* frame to start at */ extern int curframe; /* current frame number, * also shared with view.c */ @@ -452,8 +453,11 @@ if (!matflag) { int frame_retval; + def_tree(rtip); /* Load the default trees */ - do_ae(azimuth, elevation); + /* orientation command has not been used */ + if (!orientflag) + do_ae(azimuth, elevation); frame_retval = do_frame(curframe); if (frame_retval != 0) { /* Release the framebuffer, if any */ Modified: brlcad/trunk/src/rt/opt.c =================================================================== --- brlcad/trunk/src/rt/opt.c 2011-05-10 19:28:17 UTC (rev 44604) +++ brlcad/trunk/src/rt/opt.c 2011-05-10 20:00:04 UTC (rev 44605) @@ -107,6 +107,7 @@ int nobjs = 0; /* Number of cmd-line treetops */ char **objtab = (char **)NULL; /* array of treetop strings */ int matflag = 0; /* read matrix from stdin */ +int orientflag = 0; /* 1 means orientation has been set */ int desiredframe = 0; /* frame to start at */ int finalframe = -1; /* frame to halt at */ int curframe = 0; /* current frame number, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Achieve unprecedented app performance and reliability What every C/C++ and Fortran developer should know. Learn how Intel has extended the reach of its next-generation tools to help boost performance applications - inlcuding clusters. http://p.sf.net/sfu/intel-dev2devmay _______________________________________________ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits