[brlcad-commits] SF.net SVN: brlcad:[33088] brlcad/trunk/src/mged/rtif.c
Revision: 33088
http://brlcad.svn.sourceforge.net/brlcad/?rev=33088&view=rev
Author: starseeker
Date: 2008-10-28 18:48:34 + (Tue, 28 Oct 2008)
Log Message:
---
Remove dead duplicate code.
Modified Paths:
--
brlcad/trunk/src/mged/rtif.c
Modified: brlcad/trunk/src/mged/rtif.c
===
--- brlcad/trunk/src/mged/rtif.c2008-10-28 15:26:48 UTC (rev 33087)
+++ brlcad/trunk/src/mged/rtif.c2008-10-28 18:48:34 UTC (rev 33088)
@@ -1761,7 +1761,6 @@
int
f_nirt(ClientData clientData, Tcl_Interp *interp, int argc, char **argv)
{
-#if 1
const char *ptr;
char buf[256];
@@ -1769,11 +1768,11 @@
ptr = bu_brlcad_root("bin", 1);
if (ptr) {
-# ifdef _WIN32
+#ifdef _WIN32
snprintf(buf, 256, "\"%s/%s\"", ptr, argv[0]);
-# else
+#else
snprintf(buf, 256, "%s/%s", ptr, argv[0]);
-# endif
+#endif
argv[0] = buf;
}
@@ -1797,507 +1796,12 @@
} else {
return dgo_nirt_cmd(dgop, view_state->vs_vop, interp, argc, argv);
}
-#else
-register char **vp;
-FILE *fp_in;
-FILE *fp_out, *fp_err;
-int pid;
-int rpid;
-# ifndef _WIN32
-int retcode;
-int pipe_in[2] = {0, 0};
-int pipe_out[2] = {0, 0};
-int pipe_err[2] = {0, 0};
-# else
-DWORD retcode;
-HANDLE pipe_in[2], hSaveStdin, pipe_inDup;
-HANDLE pipe_out[2], hSaveStdout, pipe_outDup;
-HANDLE pipe_err[2], hSaveStderr, pipe_errDup;
-STARTUPINFO si = {0};
-PROCESS_INFORMATION pi = {0};
-SECURITY_ATTRIBUTES sa = {0};
-char name[1024] = {0};
-char line1[2048] = {0};
-# endif
-int use_input_orig = 0;
-vect_t center_model;
-vect_t dir;
-vect_t cml;
-register int i;
-register struct solid *sp;
-char line[RT_MAXLINE] = {0};
-char *val;
-struct bu_vls vls;
-struct bu_vls o_vls;
-struct bu_vls p_vls;
-struct bu_vls t_vls;
-struct bn_vlblock *vbp;
-struct qray_dataList *ndlp;
-struct qray_dataList HeadQRayData;
-char *ptr = (char *)NULL;
-char *buf[256];
-
-CHECK_DBI_NULL;
-
-if (argc < 1 || MAXARGS < argc) {
- bu_vls_init(&vls);
- bu_vls_printf(&vls, "help %s", argv[0]);
- Tcl_Eval(interp, bu_vls_addr(&vls));
- bu_vls_free(&vls);
-
- return TCL_ERROR;
-}
-
-ptr = bu_brlcad_root("bin", 1);
-if (ptr) {
- /* argv[0] might be nirt or query_ray, so specify nirt
-* specifically.
-*/
-# ifdef _WIN32
- snprintf(buf, 256, "\"%s/%s\"", ptr, "nirt");
-# else
- snprintf(buf, 256, "%s/%s", ptr, "nirt");
-# endif
- argv[0] = buf;
-}
-
-vp = &rt_cmd_vec[0];
-*vp++ = argv[0];
-
-/* swipe x, y, z off the end if present */
-if (argc > 3) {
- if (sscanf(argv[argc-3], "%lf", ¢er_model[X]) == 1 &&
- sscanf(argv[argc-2], "%lf", ¢er_model[Y]) == 1 &&
- sscanf(argv[argc-1], "%lf", ¢er_model[Z]) == 1) {
- use_input_orig = 1;
- argc -= 3;
- VSCALE(center_model, center_model, local2base);
- } else if (adc_state->adc_draw)
- *vp++ = "-b";
-} else if (adc_state->adc_draw)
- *vp++ = "-b";
-
-if (mged_variables->mv_use_air) {
- *vp++ = "-u";
- *vp++ = "1";
-}
-
-/* Calculate point from which to fire ray */
-if (!use_input_orig && adc_state->adc_draw) {
- vect_t view_ray_orig;
-
- VSET(view_ray_orig, (fastf_t)adc_state->adc_dv_x,
(fastf_t)adc_state->adc_dv_y, GED_MAX);
- VSCALE(view_ray_orig, view_ray_orig, INV_GED);
- MAT4X3PNT(center_model, view_state->vs_vop->vo_view2model,
view_ray_orig);
-} else if (!use_input_orig) {
- VSET(center_model, -view_state->vs_vop->vo_center[MDX],
--view_state->vs_vop->vo_center[MDY],
-view_state->vs_vop->vo_center[MDZ]);
-}
-
-if (mged_variables->mv_perspective_mode) {
- point_t pt, eye;
-
- /* get eye point */
- VSET(pt, 0.0, 0.0, 1.0);
- MAT4X3PNT(eye, view_state->vs_vop->vo_view2model, pt);
- VSCALE(eye, eye, base2local);
-
- /* point passed in is actually the aim point */
- VSCALE(cml, center_model, base2local);
- VSUB2(dir, cml, eye);
- VUNITIZE(dir);
-
- /* copy eye point to cml (cml is used for the "xyz" command to nirt */
- VMOVE(cml, eye);
-} else {
- VSCALE(cml, center_model, base2local);
- VMOVEN(dir, view_state->vs_vop->vo_rotation + 8, 3);
- VSCALE(dir, dir, -1.0);
-}
-
-bu_vls_init(&p_vls);
-bu_vls_printf(&p_vls, "xyz %lf %lf %lf;",
- cml[X], cml[Y], cml[Z]);
-bu_vls_printf(&p_vls, "dir %lf %lf %lf; s",
- dir[X], dir[Y], dir[Z]);
-
-i = 0;
-if (QRAY_GRAPHICS) {
-
- *vp++ = "-e";
- *vp++ = QRAY_FORMAT_NULL;
-
- /* first ray returns partitions */
- *vp++ = "-e";
- *vp++ = QRAY_FORMAT_P;
-
-
[brlcad-commits] SF.net SVN: brlcad:[33087] brlcad/trunk/doc/docbook/system/man1/en/g_qa.xml
Revision: 33087 http://brlcad.svn.sourceforge.net/brlcad/?rev=33087&view=rev Author: starseeker Date: 2008-10-28 15:26:48 + (Tue, 28 Oct 2008) Log Message: --- Tweak g_qa docbook man page. Modified Paths: -- brlcad/trunk/doc/docbook/system/man1/en/g_qa.xml Modified: brlcad/trunk/doc/docbook/system/man1/en/g_qa.xml === --- brlcad/trunk/doc/docbook/system/man1/en/g_qa.xml2008-10-28 15:17:06 UTC (rev 33086) +++ brlcad/trunk/doc/docbook/system/man1/en/g_qa.xml2008-10-28 15:26:48 UTC (rev 33087) @@ -234,7 +234,7 @@ report generated - + A all @@ -267,7 +267,7 @@ w Weight - + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33086] brlcad/trunk
Revision: 33086
http://brlcad.svn.sourceforge.net/brlcad/?rev=33086&view=rev
Author: bob1961
Date: 2008-10-28 15:17:06 + (Tue, 28 Oct 2008)
Log Message:
---
Added the echo function to libged.
Modified Paths:
--
brlcad/trunk/include/ged.h
brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj
brlcad/trunk/src/libged/Makefile.am
brlcad/trunk/src/libtclcad/ged_obj.c
Added Paths:
---
brlcad/trunk/src/libged/echo.c
Modified: brlcad/trunk/include/ged.h
===
--- brlcad/trunk/include/ged.h 2008-10-28 13:49:07 UTC (rev 33085)
+++ brlcad/trunk/include/ged.h 2008-10-28 15:17:06 UTC (rev 33086)
@@ -1398,6 +1398,14 @@
GED_EXPORT BU_EXTERN(int ged_eac, (struct ged *gedp, int argc, const char
*argv[]));
/**
+ * Echo the specified arguments.
+ *
+ * Usage:
+ * echo args
+ */
+GED_EXPORT BU_EXTERN(int ged_echo, (struct ged *gedp, int argc, const char
*argv[]));
+
+/**
* Text edit the color table
*
* Usage:
Modified: brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj
===
--- brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2008-10-28 13:49:07 UTC
(rev 33085)
+++ brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2008-10-28 15:17:06 UTC
(rev 33086)
@@ -410,6 +410,10 @@
>
+
+
Modified: brlcad/trunk/src/libged/Makefile.am
===
--- brlcad/trunk/src/libged/Makefile.am 2008-10-28 13:49:07 UTC (rev 33085)
+++ brlcad/trunk/src/libged/Makefile.am 2008-10-28 15:17:06 UTC (rev 33086)
@@ -49,6 +49,7 @@
dump.c \
dup.c \
eac.c \
+ echo.c \
edcodes.c \
edcomb.c \
editit.c \
Added: brlcad/trunk/src/libged/echo.c
===
--- brlcad/trunk/src/libged/echo.c (rev 0)
+++ brlcad/trunk/src/libged/echo.c 2008-10-28 15:17:06 UTC (rev 33086)
@@ -0,0 +1,71 @@
+/* E C H O . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2008 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file echo.c
+ *
+ * The echo command.
+ *
+ */
+
+#include "common.h"
+#include "bio.h"
+
+#include
+#include
+#include
+
+#include "ged_private.h"
+
+int
+ged_echo(struct ged *gedp, int argc, const char *argv[])
+{
+register int i;
+
+static const char *usage = "args";
+
+GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+GED_CHECK_ARGC_GT_0(gedp, argc, BRLCAD_ERROR);
+
+/* initialize result */
+bu_vls_trunc(&gedp->ged_result_str, 0);
+
+/* must be wanting help */
+if (argc == 1) {
+ bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
+ return BRLCAD_HELP;
+}
+
+for (i=1; i < argc; i++) {
+ bu_vls_printf(&gedp->ged_result_str, "%s%s", i==1 ? "" : " ", argv[i]);
+}
+
+bu_vls_printf(&gedp->ged_result_str, "\n");
+
+return BRLCAD_OK;
+}
+
+/*
+ * Local Variables:
+ * tab-width: 8
+ * mode: C
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Property changes on: brlcad/trunk/src/libged/echo.c
___
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: brlcad/trunk/src/libtclcad/ged_obj.c
===
--- brlcad/trunk/src/libtclcad/ged_obj.c2008-10-28 13:49:07 UTC (rev
33085)
+++ brlcad/trunk/src/libtclcad/ged_obj.c2008-10-28 15:17:06 UTC (rev
33086)
@@ -400,6 +400,7 @@
{"E", (char *)0, MAXARGS, go_autoview_func, ged_E},
{"e", (char *)0, MAXARGS, go_autoview_func, ged_draw},
{"eac",(char *)0, MAXARGS, go_autoview_func, ged_eac},
+{"echo", (char *)0, MAXARGS, go_pass_through_func, ged_echo},
{"edcodes",(char *)0, MAXARGS, go_pass_through_func, ged_edcodes},
{"edcomb", (char *)0, MAXARGS, go_pass_through_func, ged_edcomb},
{"edmater",(char *)0, MAXARGS, go_p
[brlcad-commits] SF.net SVN: brlcad:[33085] brlcad/trunk
Revision: 33085
http://brlcad.svn.sourceforge.net/brlcad/?rev=33085&view=rev
Author: bob1961
Date: 2008-10-28 13:49:07 + (Tue, 28 Oct 2008)
Log Message:
---
Added the rrt function to libged.
Modified Paths:
--
brlcad/trunk/include/ged.h
brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj
brlcad/trunk/src/libged/Makefile.am
brlcad/trunk/src/libged/ged_private.h
brlcad/trunk/src/libged/preview.c
brlcad/trunk/src/libtclcad/ged_obj.c
Added Paths:
---
brlcad/trunk/src/libged/rrt.c
Modified: brlcad/trunk/include/ged.h
===
--- brlcad/trunk/include/ged.h 2008-10-27 23:57:22 UTC (rev 33084)
+++ brlcad/trunk/include/ged.h 2008-10-28 13:49:07 UTC (rev 33085)
@@ -2209,6 +2209,14 @@
GED_EXPORT BU_EXTERN(int ged_rot_point, (struct ged *gedp, int argc, const
char *argv[]));
/**
+ * Invoke any raytracing application with the current view.
+ *
+ * Usage:
+ * rrt [args]
+ */
+GED_EXPORT BU_EXTERN(int ged_rrt, (struct ged *gedp, int argc, const char
*argv[]));
+
+/**
* Run the raytracing application.
*
* Usage:
Modified: brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj
===
--- brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2008-10-27 23:57:22 UTC
(rev 33084)
+++ brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2008-10-28 13:49:07 UTC
(rev 33085)
@@ -818,6 +818,10 @@
>
+
+
Modified: brlcad/trunk/src/libged/Makefile.am
===
--- brlcad/trunk/src/libged/Makefile.am 2008-10-27 23:57:22 UTC (rev 33084)
+++ brlcad/trunk/src/libged/Makefile.am 2008-10-28 13:49:07 UTC (rev 33085)
@@ -151,6 +151,7 @@
rot_point.c \
rotate_about.c \
rotate_arb_face.c \
+ rrt.c \
rt.c \
rtabort.c \
rtcheck.c \
Modified: brlcad/trunk/src/libged/ged_private.h
===
--- brlcad/trunk/src/libged/ged_private.h 2008-10-27 23:57:22 UTC (rev
33084)
+++ brlcad/trunk/src/libged/ged_private.h 2008-10-28 13:49:07 UTC (rev
33085)
@@ -286,6 +286,12 @@
(struct db_i *dbip,
register int num_entries));
+/* defined in preview.c */
+BU_EXTERN (void ged_setup_rt,
+ (struct ged *gedp,
+ register char **vp,
+ int printcmd));
+
/* defined in red.c */
extern char ged_tmpfil[MAXPATHLEN];
extern char ged_tmpcomb[17];
@@ -309,7 +315,6 @@
BU_EXTERN(void ged_print_matrix,
(FILE *fp, matp_t matrix));
-
/* defined in rt.c */
BU_EXTERN (void ged_rt_set_eye_model,
(struct ged *gedp,
Modified: brlcad/trunk/src/libged/preview.c
===
--- brlcad/trunk/src/libged/preview.c 2008-10-27 23:57:22 UTC (rev 33084)
+++ brlcad/trunk/src/libged/preview.c 2008-10-28 13:49:07 UTC (rev 33085)
@@ -42,11 +42,8 @@
static int preview_currentframe;
static int preview_tree_walk_needed;
-static char *rt_cmd_vec[MAXARGS];
-static int rt_cmd_vec_len;
static char rt_cmd_storage[MAXARGS*9];
-static void ged_setup_rt(struct ged *gedp, register char **vp, int printcmd);
int
ged_cm_anim(int argc, char **argv)
@@ -134,8 +131,8 @@
av[1] = NULL;
(void)ged_zap(ged_current_gedp, 1, av );
- ged_eraseobjpath(ged_current_gedp, rt_cmd_vec_len, (const char
**)rt_cmd_vec, LOOKUP_QUIET, 0);
- ged_drawtrees(ged_current_gedp, rt_cmd_vec_len, (const char
**)rt_cmd_vec, preview_mode, (struct ged_client_data *)0);
+ ged_eraseobjpath(ged_current_gedp,
ged_current_gedp->ged_gdp->gd_rt_cmd_len, (const char
**)ged_current_gedp->ged_gdp->gd_rt_cmd, LOOKUP_QUIET, 0);
+ ged_drawtrees(ged_current_gedp,
ged_current_gedp->ged_gdp->gd_rt_cmd_len, (const char
**)ged_current_gedp->ged_gdp->gd_rt_cmd, preview_mode, (struct ged_client_data
*)0);
ged_color_soltab((struct solid
*)&ged_current_gedp->ged_gdp->gd_headSolid);
}
@@ -182,28 +179,28 @@
for ( i = 1; i < argc && i < MAXARGS; i++ ) {
bu_strlcpy(cp, argv[i], MAXARGS*9);
- rt_cmd_vec[i] = cp;
+ ged_current_gedp->ged_gdp->gd_rt_cmd[i] = cp;
cp += strlen(cp) + 1;
}
-rt_cmd_vec[i] = (char *)0;
-rt_cmd_vec_len = i;
+ged_current_gedp->ged_gdp->gd_rt_cmd[i] = (char *)0;
+ged_current_gedp->ged_gdp->gd_rt_cmd_len = i;
preview_tree_walk_needed = 1;
return 0;
}
-static void
+void
ged_setup_rt(struct ged *gedp, register char **vp, int printcmd)
{
-rt_cmd_vec_len = vp - rt_cmd_vec;
-rt_cmd_vec_len += ged_build_tops(gedp,
+ged_current_gedp->ged_gdp->gd_rt_cmd_len = vp -
ged_current_gedp->ged_gdp->gd_rt_cmd;
+ged_current_
