Thread: [brlcad-commits] SF.net SVN: brlcad:[31997] brlcad/trunk/src/mged
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <br...@us...> - 2008-07-28 21:34:54
|
Revision: 31997 http://brlcad.svn.sourceforge.net/brlcad/?rev=31997&view=rev Author: brlcad Date: 2008-07-28 21:35:00 +0000 (Mon, 28 Jul 2008) Log Message: ----------- remove the seemingly unused/dead HeadSolid list and distinguish the FreeSolid list from the same-named libged global (bleh) Modified Paths: -------------- brlcad/trunk/src/mged/chgview.c brlcad/trunk/src/mged/dodraw.c brlcad/trunk/src/mged/dozoom.c brlcad/trunk/src/mged/mged.c brlcad/trunk/src/mged/mged.h brlcad/trunk/src/mged/mged_solid.h Modified: brlcad/trunk/src/mged/chgview.c =================================================================== --- brlcad/trunk/src/mged/chgview.c 2008-07-28 20:03:09 UTC (rev 31996) +++ brlcad/trunk/src/mged/chgview.c 2008-07-28 21:35:00 UTC (rev 31997) @@ -836,8 +836,8 @@ register struct solid *sp; register struct bn_vlist *vp; - FOR_ALL_SOLIDS(sp, &FreeSolid.l) { - GET_SOLID(sp, &FreeSolid.l); + FOR_ALL_SOLIDS(sp, &MGED_FreeSolid.l) { + GET_SOLID(sp, &MGED_FreeSolid.l); bu_free((genptr_t)sp, "mged_freemem: struct solid"); } @@ -1447,7 +1447,7 @@ button(BE_REJECT); BU_LIST_DEQUEUE(&sp->l); - FREE_SOLID(sp, &FreeSolid.l); + FREE_SOLID(sp, &MGED_FreeSolid.l); } sp = nsp; } @@ -1506,7 +1506,7 @@ button( BE_REJECT ); BU_LIST_DEQUEUE(&sp->l); - FREE_SOLID(sp, &FreeSolid.l); + FREE_SOLID(sp, &MGED_FreeSolid.l); } sp = nsp; } Modified: brlcad/trunk/src/mged/dodraw.c =================================================================== --- brlcad/trunk/src/mged/dodraw.c 2008-07-28 20:03:09 UTC (rev 31996) +++ brlcad/trunk/src/mged/dodraw.c 2008-07-28 21:35:00 UTC (rev 31997) @@ -848,7 +848,7 @@ if ( !existing_sp ) { /* Handling a new solid */ - GET_SOLID(sp, &FreeSolid.l); + GET_SOLID(sp, &MGED_FreeSolid.l); /* NOTICE: The structure is dirty & not initialized for you! */ sp->s_dlist = BU_LIST_LAST(solid, &dgop->dgo_headSolid)->s_dlist + 1; @@ -1196,7 +1196,7 @@ #else /* Obtain a fresh solid structure, and fill it in */ - GET_SOLID(sp, &FreeSolid.l); + GET_SOLID(sp, &MGED_FreeSolid.l); if ( copy ) { BU_LIST_INIT( &(sp->s_vlist) ); Modified: brlcad/trunk/src/mged/dozoom.c =================================================================== --- brlcad/trunk/src/mged/dozoom.c 2008-07-28 20:03:09 UTC (rev 31996) +++ brlcad/trunk/src/mged/dozoom.c 2008-07-28 21:35:00 UTC (rev 31997) @@ -51,8 +51,6 @@ point_t eye_pos_scr = { 0, 0, 1 }; #endif -struct solid FreeSolid; /* Head of freelist */ -struct solid HeadSolid; /* Head of solid table */ /* * P E R S P _ M A T Modified: brlcad/trunk/src/mged/mged.c =================================================================== --- brlcad/trunk/src/mged/mged.c 2008-07-28 20:03:09 UTC (rev 31996) +++ brlcad/trunk/src/mged/mged.c 2008-07-28 21:35:00 UTC (rev 31997) @@ -130,6 +130,8 @@ jmp_buf jmp_env; /* For non-local gotos */ double frametime; /* time needed to draw last frame */ +struct solid MGED_FreeSolid; /* Head of freelist */ + int cmd_stuff_str(ClientData clientData, Tcl_Interp *interp, int argc, char **argv); void (*cur_sigint)(); /* Current SIGINT status */ void sig2(int); @@ -402,8 +404,7 @@ } /* Set up linked lists */ - BU_LIST_INIT(&HeadSolid.l); - BU_LIST_INIT(&FreeSolid.l); + BU_LIST_INIT(&MGED_FreeSolid.l); BU_LIST_INIT(&rt_g.rtg_vlfree); BU_LIST_INIT(&rt_g.rtg_headwdb.l); BU_LIST_INIT(&head_run_rt.l); Modified: brlcad/trunk/src/mged/mged.h =================================================================== --- brlcad/trunk/src/mged/mged.h 2008-07-28 20:03:09 UTC (rev 31996) +++ brlcad/trunk/src/mged/mged.h 2008-07-28 21:35:00 UTC (rev 31997) @@ -160,6 +160,7 @@ extern mat_t incr_change; /* change(s) from last cycle */ extern point_t recip_vanishing_point; + /* * Identity matrix. Handy to have around. - initialized in e1.c */ @@ -182,6 +183,7 @@ extern FILE *outfile; extern jmp_buf jmp_env; extern Tcl_Interp *interp; +extern struct solid MGED_FreeSolid; /* Head of freelist */ /* * GED functions referenced in more than one source file: Modified: brlcad/trunk/src/mged/mged_solid.h =================================================================== --- brlcad/trunk/src/mged/mged_solid.h 2008-07-28 20:03:09 UTC (rev 31996) +++ brlcad/trunk/src/mged/mged_solid.h 2008-07-28 21:35:00 UTC (rev 31997) @@ -23,12 +23,6 @@ * */ -#include "solid.h" - -/* instantiated in dozoom.c */ -extern struct solid FreeSolid; /* Head of freelist */ -extern struct solid HeadSolid; /* Head of doubly linked solid tab */ - /* * Local Variables: * mode: C This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-07-29 01:51:51
|
Revision: 32016 http://brlcad.svn.sourceforge.net/brlcad/?rev=32016&view=rev Author: brlcad Date: 2008-07-29 01:51:55 +0000 (Tue, 29 Jul 2008) Log Message: ----------- remove the now empty mged_solid.h header Modified Paths: -------------- brlcad/trunk/src/mged/Makefile.am brlcad/trunk/src/mged/anal.c brlcad/trunk/src/mged/animedit.c brlcad/trunk/src/mged/attach.c brlcad/trunk/src/mged/buttons.c brlcad/trunk/src/mged/chgmodel.c brlcad/trunk/src/mged/chgtree.c brlcad/trunk/src/mged/chgview.c brlcad/trunk/src/mged/cmd.c brlcad/trunk/src/mged/dir.c brlcad/trunk/src/mged/dodraw.c brlcad/trunk/src/mged/dozoom.c brlcad/trunk/src/mged/edarb.c brlcad/trunk/src/mged/edars.c brlcad/trunk/src/mged/edpipe.c brlcad/trunk/src/mged/edsol.c brlcad/trunk/src/mged/facedef.c brlcad/trunk/src/mged/inside.c brlcad/trunk/src/mged/mater.c brlcad/trunk/src/mged/mged.c brlcad/trunk/src/mged/mover.c brlcad/trunk/src/mged/overlay.c brlcad/trunk/src/mged/plot.c brlcad/trunk/src/mged/polyif.c brlcad/trunk/src/mged/predictor.c brlcad/trunk/src/mged/rtif.c brlcad/trunk/src/mged/set.c brlcad/trunk/src/mged/share.c brlcad/trunk/src/mged/solids_on_ray.c brlcad/trunk/src/mged/titles.c brlcad/trunk/src/mged/usepen.c brlcad/trunk/src/mged/vdraw.c Removed Paths: ------------- brlcad/trunk/src/mged/mged_solid.h Modified: brlcad/trunk/src/mged/Makefile.am =================================================================== --- brlcad/trunk/src/mged/Makefile.am 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/Makefile.am 2008-07-29 01:51:55 UTC (rev 32016) @@ -174,7 +174,6 @@ mgdev.h \ mged.h \ mged_dm.h \ - mged_solid.h \ mgedtcl.h \ objdir.h \ qray.h \ Modified: brlcad/trunk/src/mged/anal.c =================================================================== --- brlcad/trunk/src/mged/anal.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/anal.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -34,7 +34,6 @@ #include "raytrace.h" #include "rtgeom.h" #include "./mged.h" -#include "./mged_solid.h" #include "./mged_dm.h" Modified: brlcad/trunk/src/mged/animedit.c =================================================================== --- brlcad/trunk/src/mged/animedit.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/animedit.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -29,7 +29,6 @@ #include "dg.h" #include "rtgeom.h" #include "./mged.h" -#include "./mged_solid.h" #include "./joints.h" extern struct db_i *dbip; /* database instance pointer */ Modified: brlcad/trunk/src/mged/attach.c =================================================================== --- brlcad/trunk/src/mged/attach.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/attach.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -47,7 +47,6 @@ #include "./mged.h" #include "./titles.h" #include "./sedit.h" -#include "./mged_solid.h" #include "./mged_dm.h" #define NEED_GUI(_type) ( \ Modified: brlcad/trunk/src/mged/buttons.c =================================================================== --- brlcad/trunk/src/mged/buttons.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/buttons.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -33,7 +33,6 @@ #include "dg.h" #include "./mged.h" -#include "./mged_solid.h" #include "./mged_dm.h" #include "./sedit.h" Modified: brlcad/trunk/src/mged/chgmodel.c =================================================================== --- brlcad/trunk/src/mged/chgmodel.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/chgmodel.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -43,7 +43,6 @@ #include "wdb.h" #include "./mged.h" -#include "./mged_solid.h" #include "./mged_dm.h" #include "./sedit.h" #include "./cmd.h" Modified: brlcad/trunk/src/mged/chgtree.c =================================================================== --- brlcad/trunk/src/mged/chgtree.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/chgtree.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -44,7 +44,6 @@ #include "./sedit.h" #include "./mged.h" -#include "./mged_solid.h" #include "./mged_dm.h" #include "./cmd.h" Modified: brlcad/trunk/src/mged/chgview.c =================================================================== --- brlcad/trunk/src/mged/chgview.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/chgview.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -38,7 +38,6 @@ #include "nmg.h" #include "./sedit.h" #include "./mged.h" -#include "./mged_solid.h" #include "./mged_dm.h" #include "./cmd.h" Modified: brlcad/trunk/src/mged/cmd.c =================================================================== --- brlcad/trunk/src/mged/cmd.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/cmd.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -55,7 +55,6 @@ #include "./mged.h" #include "./cmd.h" -#include "./mged_solid.h" #include "./mged_dm.h" #include "./sedit.h" Modified: brlcad/trunk/src/mged/dir.c =================================================================== --- brlcad/trunk/src/mged/dir.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/dir.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -37,7 +37,6 @@ #include "db.h" #include "./mged.h" -#include "./mged_solid.h" #include "./mged_dm.h" Modified: brlcad/trunk/src/mged/dodraw.c =================================================================== --- brlcad/trunk/src/mged/dodraw.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/dodraw.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -36,7 +36,6 @@ #include "db.h" #include "./mged.h" -#include "./mged_solid.h" #include "./mged_dm.h" #include "./cmd.h" Modified: brlcad/trunk/src/mged/dozoom.c =================================================================== --- brlcad/trunk/src/mged/dozoom.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/dozoom.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -32,7 +32,6 @@ #include "dg.h" #include "./mged.h" -#include "./mged_solid.h" #include "./sedit.h" #include "./mged_dm.h" Modified: brlcad/trunk/src/mged/edarb.c =================================================================== --- brlcad/trunk/src/mged/edarb.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/edarb.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -38,7 +38,6 @@ #include "./sedit.h" #include "./mged.h" -#include "./mged_solid.h" #include "./mged_dm.h" #include "./cmd.h" Modified: brlcad/trunk/src/mged/edars.c =================================================================== --- brlcad/trunk/src/mged/edars.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/edars.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -43,7 +43,6 @@ #include "wdb.h" #include "./mged.h" -#include "./mged_solid.h" #include "./sedit.h" #include "./mged_dm.h" Modified: brlcad/trunk/src/mged/edpipe.c =================================================================== --- brlcad/trunk/src/mged/edpipe.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/edpipe.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -43,7 +43,6 @@ #include "wdb.h" #include "./mged.h" -#include "./mged_solid.h" #include "./sedit.h" #include "./mged_dm.h" Modified: brlcad/trunk/src/mged/edsol.c =================================================================== --- brlcad/trunk/src/mged/edsol.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/edsol.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -43,7 +43,6 @@ #include "db.h" #include "./mged.h" -#include "./mged_solid.h" #include "./sedit.h" #include "./mged_dm.h" Modified: brlcad/trunk/src/mged/facedef.c =================================================================== --- brlcad/trunk/src/mged/facedef.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/facedef.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -37,7 +37,6 @@ #include "raytrace.h" #include "./mged.h" #include "./sedit.h" -#include "./mged_solid.h" extern struct rt_db_internal es_int; extern struct bn_tol mged_tol; Modified: brlcad/trunk/src/mged/inside.c =================================================================== --- brlcad/trunk/src/mged/inside.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/inside.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -43,7 +43,6 @@ #include "./mged.h" #include "./sedit.h" -#include "./mged_solid.h" #include "./mged_dm.h" #include "./cmd.h" Modified: brlcad/trunk/src/mged/mater.c =================================================================== --- brlcad/trunk/src/mged/mater.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/mater.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -29,14 +29,14 @@ #include <stdlib.h> #include <string.h> +#include "bio.h" -#include "bio.h" #include "vmath.h" #include "db.h" #include "mater.h" #include "dg.h" + #include "./mged.h" -#include "./mged_solid.h" #include "./mged_dm.h" /* Modified: brlcad/trunk/src/mged/mged.c =================================================================== --- brlcad/trunk/src/mged/mged.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/mged.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -50,7 +50,6 @@ /* private */ #include "./mged.h" #include "./titles.h" -#include "./mged_solid.h" #include "./sedit.h" #include "./mged_dm.h" #include "./cmd.h" Deleted: brlcad/trunk/src/mged/mged_solid.h =================================================================== --- brlcad/trunk/src/mged/mged_solid.h 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/mged_solid.h 2008-07-29 01:51:55 UTC (rev 32016) @@ -1,34 +0,0 @@ -/* M G E D _ S O L I D . H - * BRL-CAD - * - * Copyright (c) 1985-2008 United States Government as represented by - * the U.S. Army Research Laboratory. - * - * This program 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 program 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 mged_solid.h - * - * Solids structure definition - * - */ - -/* - * Local Variables: - * mode: C - * tab-width: 8 - * indent-tabs-mode: t - * c-file-style: "stroustrup" - * End: - * ex: shiftwidth=4 tabstop=8 - */ Modified: brlcad/trunk/src/mged/mover.c =================================================================== --- brlcad/trunk/src/mged/mover.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/mover.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -26,15 +26,15 @@ #include <stdio.h> #include <math.h> #include <string.h> +#include "bio.h" -#include "bio.h" #include "bu.h" #include "vmath.h" #include "bn.h" #include "raytrace.h" #include "wdb.h" + #include "./mged.h" -#include "./mged_solid.h" /* default region ident codes */ int item_default = 1000; /* GIFT region ID */ Modified: brlcad/trunk/src/mged/overlay.c =================================================================== --- brlcad/trunk/src/mged/overlay.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/overlay.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -26,14 +26,14 @@ #include <math.h> #include <signal.h> #include <stdio.h> +#include "bio.h" -#include "bio.h" #include "vmath.h" #include "mater.h" #include "dg.h" + #include "./mged.h" #include "./sedit.h" -#include "./mged_solid.h" #include "./mged_dm.h" /* Usage: overlay file.pl [name] */ Modified: brlcad/trunk/src/mged/plot.c =================================================================== --- brlcad/trunk/src/mged/plot.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/plot.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -32,8 +32,8 @@ #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> #endif - #include "bio.h" + #include "bu.h" #include "vmath.h" #include "mater.h" @@ -41,7 +41,6 @@ #include "plot3.h" #include "./mged.h" -#include "./mged_solid.h" #include "./mged_dm.h" Modified: brlcad/trunk/src/mged/polyif.c =================================================================== --- brlcad/trunk/src/mged/polyif.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/polyif.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -27,17 +27,16 @@ #include "common.h" -#include <stdio.h> #include <string.h> #include <math.h> #include <signal.h> - #include "bio.h" + #include "vmath.h" #include "mater.h" #include "dg.h" + #include "./mged.h" -#include "./mged_solid.h" #include "./mged_dm.h" /* XXX When finalized, this stuff belongs in a header file of it's own */ Modified: brlcad/trunk/src/mged/predictor.c =================================================================== --- brlcad/trunk/src/mged/predictor.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/predictor.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -38,14 +38,14 @@ #include <stdio.h> #include <string.h> #include <math.h> +#include "bio.h" -#include "bio.h" #include "bu.h" #include "vmath.h" #include "bn.h" #include "ged.h" + #include "./mged.h" -#include "./mged_solid.h" #include "./cmd.h" #include "./mged_dm.h" Modified: brlcad/trunk/src/mged/rtif.c =================================================================== --- brlcad/trunk/src/mged/rtif.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/rtif.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -48,9 +48,9 @@ #include "vmath.h" #include "dg.h" #include "mater.h" + #include "./sedit.h" #include "./mged.h" -#include "./mged_solid.h" #include "./mged_dm.h" #include "./qray.h" #include "./cmd.h" Modified: brlcad/trunk/src/mged/set.c =================================================================== --- brlcad/trunk/src/mged/set.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/set.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -23,14 +23,14 @@ #include "common.h" -#include <stdio.h> #include "bio.h" + #include "bu.h" #include "vmath.h" #include "dg.h" + #include "./sedit.h" #include "./mged.h" -#include "./mged_solid.h" #include "./mged_dm.h" #include "tcl.h" Modified: brlcad/trunk/src/mged/share.c =================================================================== --- brlcad/trunk/src/mged/share.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/share.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -29,14 +29,14 @@ #include <math.h> #include <stdio.h> #include <string.h> +#include "bio.h" -#include "bio.h" #include "bu.h" #include "vmath.h" #include "bn.h" #include "dg.h" + #include "./mged.h" -#include "./mged_solid.h" #include "./mged_dm.h" #define RESOURCE_TYPE_ADC 0 Modified: brlcad/trunk/src/mged/solids_on_ray.c =================================================================== --- brlcad/trunk/src/mged/solids_on_ray.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/solids_on_ray.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -26,18 +26,17 @@ #include "common.h" #include <stdlib.h> -#include <stdio.h> #include <math.h> #include <signal.h> #include <string.h> - #include "bio.h" + #include "tcl.h" #include "bu.h" #include "vmath.h" #include "raytrace.h" + #include "./mged.h" -#include "./mged_solid.h" #include "./mged_dm.h" Modified: brlcad/trunk/src/mged/titles.c =================================================================== --- brlcad/trunk/src/mged/titles.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/titles.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -23,18 +23,17 @@ #include "common.h" -#include <stdio.h> #include <math.h> #include <string.h> - #include "bio.h" + #include "bu.h" #include "vmath.h" #include "bn.h" #include "ged.h" + #include "./mged.h" #include "./titles.h" -#include "./mged_solid.h" #include "./sedit.h" #include "./mged_dm.h" Modified: brlcad/trunk/src/mged/usepen.c =================================================================== --- brlcad/trunk/src/mged/usepen.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/usepen.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -24,11 +24,10 @@ #include "common.h" #include <stdlib.h> -#include <stdio.h> #include <math.h> #include <string.h> - #include "bio.h" + #include "bu.h" #include "vmath.h" #include "bn.h" @@ -36,7 +35,6 @@ #include "./mged.h" #include "./titles.h" -#include "./mged_solid.h" #include "./mged_dm.h" #include "./sedit.h" Modified: brlcad/trunk/src/mged/vdraw.c =================================================================== --- brlcad/trunk/src/mged/vdraw.c 2008-07-29 01:27:11 UTC (rev 32015) +++ brlcad/trunk/src/mged/vdraw.c 2008-07-29 01:51:55 UTC (rev 32016) @@ -101,22 +101,21 @@ #include "common.h" -#include <stdio.h> #include <string.h> #include <math.h> #include <signal.h> +#include "bio.h" #include "tcl.h" -#include "bio.h" #include "bu.h" #include "vmath.h" #include "mater.h" #include "nmg.h" #include "raytrace.h" + #include "./sedit.h" #include "./mged.h" -#include "./mged_solid.h" #include "./mged_dm.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2008-07-29 12:01:51
|
Revision: 32038 http://brlcad.svn.sourceforge.net/brlcad/?rev=32038&view=rev Author: bob1961 Date: 2008-07-29 12:02:00 +0000 (Tue, 29 Jul 2008) Log Message: ----------- Added the killrefs command that kills/removes all references of the specified objects by combinations. The objects themselves are not killed. Also added the -a option to killtree that arranges for "all" references to also be removed. Modified Paths: -------------- brlcad/trunk/src/mged/dir.c brlcad/trunk/src/mged/setup.c Modified: brlcad/trunk/src/mged/dir.c =================================================================== --- brlcad/trunk/src/mged/dir.c 2008-07-29 11:53:31 UTC (rev 32037) +++ brlcad/trunk/src/mged/dir.c 2008-07-29 12:02:00 UTC (rev 32038) @@ -334,15 +334,6 @@ int argc, char **argv) { -#if 0 - CHECK_DBI_NULL; - - return wdb_killall_cmd(wdbp, interp, argc, argv); -#else - register int i, k; - register struct directory *dp; - struct rt_db_internal intern; - struct rt_comb_internal *comb; int ret; CHECK_DBI_NULL; @@ -365,8 +356,38 @@ return TCL_OK; } - ret = TCL_OK; + ret = cmd_killrefs(clientData, interp, argc, argv); + if ( ret != TCL_OK ) { + Tcl_AppendResult(interp, "KILL skipped because of earlier errors.\n", (char *)NULL); + return ret; + } + + /* ALL references removed...now KILL the object[s] */ + /* reuse argv[] */ + argv[0] = "kill"; + (void)signal( SIGINT, SIG_IGN ); + return cmd_kill( clientData, interp, argc, argv ); +} + + +int +cmd_killrefs(ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv) +{ + register int k; + register struct directory *dp; + struct rt_db_internal intern; + struct rt_comb_internal *comb; + int ret; + + if (argc < 2) { + Tcl_AppendResult(interp, "Usage: killrefs object(s)", (char *)0); + return TCL_ERROR; + } + /* Examine all COMB nodes */ FOR_ALL_DIRECTORY_START(dp, dbip) { if ( !(dp->d_flags & DIR_COMB) ) @@ -406,19 +427,15 @@ } } FOR_ALL_DIRECTORY_END; - if ( ret != TCL_OK ) { - Tcl_AppendResult(interp, "KILL skipped because of earlier errors.\n", (char *)NULL); - return ret; - } - - /* ALL references removed...now KILL the object[s] */ - /* reuse argv[] */ - argv[0] = "kill"; - (void)signal( SIGINT, SIG_IGN ); - return cmd_kill( clientData, interp, argc, argv ); -#endif + return TCL_OK; } +struct mged_killtree_data { + Tcl_Interp *interp; + int killrefs; + int ac; + char *av[MAXARGS]; +}; /* F _ K I L L T R E E ( ) * @@ -436,6 +453,7 @@ return wdb_kill_cmd(wdbp, interp, argc, argv); #else + struct mged_killtree_data mktd; register struct directory *dp; register int i; @@ -457,12 +475,32 @@ else return TCL_OK; + mktd.interp = interp; + mktd.ac = 1; + mktd.av[0] = "killrefs"; + mktd.av[1] = (char *)0; + + if (argv[1][0] == '-' && argv[1][1] == 'a' && argv[1][2] == '\0') { + mktd.killrefs = 1; + --argc; + ++argv; + } else + mktd.killrefs = 0; + for (i=1; i<argc; i++) { if ( (dp = db_lookup( dbip, argv[i], LOOKUP_NOISY) ) == DIR_NULL ) continue; - db_functree( dbip, dp, killtree, killtree, &rt_uniresource, (genptr_t)interp ); + db_functree( dbip, dp, killtree, killtree, &rt_uniresource, (genptr_t)&mktd ); } + if (mktd.killrefs && mktd.ac > 1) { + (void)cmd_killrefs(clientData, interp, mktd.ac, mktd.av); + + for (i=1; i<mktd.ac; i++) { + bu_free((genptr_t)mktd.av[i], "ged_killtree_data"); + } + } + (void)signal( SIGINT, SIG_IGN ); solid_list_callback(); return TCL_OK; @@ -475,20 +513,41 @@ void killtree(struct db_i *dbip, struct directory *dp, genptr_t ptr) { - Tcl_Interp *interp = (Tcl_Interp *)ptr; + struct mged_killtree_data *mktdp = (struct mged_killtree_data *)ptr; struct directory *dpp[2] = {DIR_NULL, DIR_NULL}; if (dbip == DBI_NULL) return; - Tcl_AppendResult(interp, "KILL ", (dp->d_flags & DIR_COMB) ? "COMB" : "Solid", + Tcl_AppendResult(mktdp->interp, "KILL ", (dp->d_flags & DIR_COMB) ? "COMB" : "Solid", ": ", dp->d_namep, "\n", (char *)NULL); dpp[0] = dp; eraseobjall(dpp); - if (db_delete(dbip, dp) < 0 || db_dirdelete(dbip, dp) < 0) { - TCL_DELETE_ERR(""); + if (!mktdp->killrefs) { + if (db_delete(dbip, dp) < 0 || db_dirdelete(dbip, dp) < 0) { + Tcl_AppendResult(mktdp->interp, "an error occurred while deleting ", dp->d_namep, "\n", (char *)0); + } + } else { + if (mktdp->ac < MAXARGS-1) { + mktdp->av[mktdp->ac++] = bu_strdup(dp->d_namep); + mktdp->av[mktdp->ac] = (char *)0; + + if (db_delete(dbip, dp) < 0 || db_dirdelete(dbip, dp) < 0) { + Tcl_AppendResult(mktdp->interp, "an error occurred while deleting ", dp->d_namep, "\n", (char *)0); + + /* Remove from list */ + bu_free((genptr_t)mktdp->av[--mktdp->ac], "ged_killtree_callback"); + mktdp->av[mktdp->ac] = (char *)0; + } + } else { + Tcl_AppendResult(mktdp->interp, "MAXARGS exceeded while scheduling ", dp->d_namep, " for a killrefs\n", (char *)0); + + if (db_delete(dbip, dp) < 0 || db_dirdelete(dbip, dp) < 0) { + Tcl_AppendResult(mktdp->interp, "an error occurred while deleting ", dp->d_namep, "\n", (char *)0); + } + } } } Modified: brlcad/trunk/src/mged/setup.c =================================================================== --- brlcad/trunk/src/mged/setup.c 2008-07-29 11:53:31 UTC (rev 32037) +++ brlcad/trunk/src/mged/setup.c 2008-07-29 12:02:00 UTC (rev 32038) @@ -187,6 +187,7 @@ {"keypoint", f_keypoint}, {"kill", cmd_kill}, {"killall", cmd_killall}, + {"killrefs", cmd_killrefs}, {"killtree", cmd_killtree}, {"knob", f_knob}, {"l", cmd_list}, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2008-08-11 18:26:41
|
Revision: 32393 http://brlcad.svn.sourceforge.net/brlcad/?rev=32393&view=rev Author: bob1961 Date: 2008-08-11 18:26:31 +0000 (Mon, 11 Aug 2008) Log Message: ----------- Getting rid of a few warning. Modified Paths: -------------- brlcad/trunk/src/mged/buttons.c brlcad/trunk/src/mged/dodraw.c brlcad/trunk/src/mged/muves.c brlcad/trunk/src/mged/qray.c brlcad/trunk/src/mged/rtif.c brlcad/trunk/src/mged/setup.c Modified: brlcad/trunk/src/mged/buttons.c =================================================================== --- brlcad/trunk/src/mged/buttons.c 2008-08-11 17:45:32 UTC (rev 32392) +++ brlcad/trunk/src/mged/buttons.c 2008-08-11 18:26:31 UTC (rev 32393) @@ -42,7 +42,8 @@ extern int mged_zoom(double val); extern void set_absolute_tran(void); /* defined in set.c */ extern void set_scroll_private(void); /* defined in set.c */ -extern void adc_set_scroll(void); /* defined in adc.c */ +extern void adc_set_scroll(void); /* defined in adc.c */ +extern void stateChange(int, int); /* defined in dm-generic.c */ /* * This flag indicates that Primitive editing is in effect. Modified: brlcad/trunk/src/mged/dodraw.c =================================================================== --- brlcad/trunk/src/mged/dodraw.c 2008-08-11 17:45:32 UTC (rev 32392) +++ brlcad/trunk/src/mged/dodraw.c 2008-08-11 18:26:31 UTC (rev 32393) @@ -31,9 +31,10 @@ #include "vmath.h" #include "bn.h" #include "nmg.h" -#include "dg.h" #include "rtgeom.h" /* for ID_POLY special support */ +#include "raytrace.h" #include "db.h" +#include "dg.h" #include "./mged.h" #include "./mged_dm.h" Modified: brlcad/trunk/src/mged/muves.c =================================================================== --- brlcad/trunk/src/mged/muves.c 2008-08-11 17:45:32 UTC (rev 32392) +++ brlcad/trunk/src/mged/muves.c 2008-08-11 18:26:31 UTC (rev 32393) @@ -41,6 +41,8 @@ #include "./mged.h" #include "./sedit.h" +/* defined in chgview.c */ +extern int edit_com(int argc, const char *argv[], int kind, int catch_sigint); /* Maximum line length allowed for MUVES input files */ #define MUVES_LINE_LEN 256 Modified: brlcad/trunk/src/mged/qray.c =================================================================== --- brlcad/trunk/src/mged/qray.c 2008-08-11 17:45:32 UTC (rev 32392) +++ brlcad/trunk/src/mged/qray.c 2008-08-11 18:26:31 UTC (rev 32393) @@ -32,6 +32,7 @@ #include "bu.h" #include "vmath.h" #include "raytrace.h" +#include "dg.h" #include "./mged.h" #include "./mged_dm.h" #include "./qray.h" Modified: brlcad/trunk/src/mged/rtif.c =================================================================== --- brlcad/trunk/src/mged/rtif.c 2008-08-11 17:45:32 UTC (rev 32392) +++ brlcad/trunk/src/mged/rtif.c 2008-08-11 18:26:31 UTC (rev 32393) @@ -56,6 +56,9 @@ #include "./cmd.h" +/* defined in chgview.c */ +extern int edit_com(int argc, const char **argv, int kind, int catch_sigint); + extern int mged_svbase(void); extern void set_perspective(); /* from set.c */ @@ -422,6 +425,7 @@ /* output buffer */ #ifndef _WIN32 + int rpid; char line[RT_MAXLINE+1] = {0}; #else char line[5120+1] = {0}; @@ -440,7 +444,6 @@ # define DWORD int #endif DWORD retcode = 0; - int rpid; int aborted; display_error(); @@ -1255,7 +1258,7 @@ editArgv[0] = "e"; editArgv[1] = objects; editArgv[2] = (char *)NULL; - if (edit_com( 2, editArgv, 1, 1 ) != 0) { + if (edit_com(2, (const char **)editArgv, 1, 1) != 0) { Tcl_AppendResult(interp, "Unable to load object: ", objects, "\n", (char *)NULL); } @@ -1785,7 +1788,7 @@ insertArgv[0] = "-u"; insertArgv[1] = "1"; insertArgv[2] = (char *)0; - newArgv = bu_dupinsert_argv(1, insertArgc, insertArgv, argc, argv); + newArgv = bu_dupinsert_argv(1, insertArgc, (const char **)insertArgv, argc, (const char **)argv); newArgc = argc + insertArgc; ret = dgo_nirt_cmd(dgop, view_state->vs_vop, interp, newArgc, newArgv); bu_free_argv(newArgc, newArgv); @@ -2553,7 +2556,7 @@ av[1] = NULL; (void)cmd_zap( (ClientData)NULL, interp, 1, av ); - edit_com( rt_cmd_vec_len, rt_cmd_vec, rtif_mode, 0 ); + edit_com(rt_cmd_vec_len, (const char **)rt_cmd_vec, rtif_mode, 0); } view_state->vs_flag = 1; Modified: brlcad/trunk/src/mged/setup.c =================================================================== --- brlcad/trunk/src/mged/setup.c 2008-08-11 17:45:32 UTC (rev 32392) +++ brlcad/trunk/src/mged/setup.c 2008-08-11 18:26:31 UTC (rev 32393) @@ -45,8 +45,8 @@ #include "./cmd.h" extern void init_qray(void); +extern void mged_global_variable_setup(Tcl_Interp *interp); - struct gedtab { char *name; int (*func)(int, const char *[]); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-08-22 04:30:08
|
Revision: 32502 http://brlcad.svn.sourceforge.net/brlcad/?rev=32502&view=rev Author: brlcad Date: 2008-08-22 04:30:17 +0000 (Fri, 22 Aug 2008) Log Message: ----------- quell constness warnings Modified Paths: -------------- brlcad/trunk/src/mged/chgmodel.c brlcad/trunk/src/mged/chgtree.c brlcad/trunk/src/mged/cmd.c brlcad/trunk/src/mged/muves.c brlcad/trunk/src/mged/utility2.c Modified: brlcad/trunk/src/mged/chgmodel.c =================================================================== --- brlcad/trunk/src/mged/chgmodel.c 2008-08-22 04:25:37 UTC (rev 32501) +++ brlcad/trunk/src/mged/chgmodel.c 2008-08-22 04:30:17 UTC (rev 32502) @@ -576,9 +576,9 @@ av[6] = argv[2]; av[7] = (char *)0; - ret = ged_make(&ged, 7, av); + ret = ged_make(&ged, 7, (const char **)av); } else - ret = ged_make(&ged, argc, argv); + ret = ged_make(&ged, argc, (const char **)argv); /* Convert to Tcl codes */ if (ret == BRLCAD_OK) Modified: brlcad/trunk/src/mged/chgtree.c =================================================================== --- brlcad/trunk/src/mged/chgtree.c 2008-08-22 04:25:37 UTC (rev 32501) +++ brlcad/trunk/src/mged/chgtree.c 2008-08-22 04:30:17 UTC (rev 32502) @@ -265,7 +265,7 @@ GED_INIT_FROM_WDBP(&ged, wdbp); #endif - ret = ged_arced(&ged, argc, argv); + ret = ged_arced(&ged, argc, (const char **)argv); /* Convert to Tcl codes */ if (ret == BRLCAD_OK) Modified: brlcad/trunk/src/mged/cmd.c =================================================================== --- brlcad/trunk/src/mged/cmd.c 2008-08-22 04:25:37 UTC (rev 32501) +++ brlcad/trunk/src/mged/cmd.c 2008-08-22 04:30:17 UTC (rev 32502) @@ -1995,7 +1995,7 @@ GED_INIT_FROM_WDBP(&ged, wdbp); #endif - ret = ged_make_name(&ged, argc, argv); + ret = ged_make_name(&ged, argc, (const char **)argv); /* Convert to Tcl codes */ if (ret == BRLCAD_OK) Modified: brlcad/trunk/src/mged/muves.c =================================================================== --- brlcad/trunk/src/mged/muves.c 2008-08-22 04:25:37 UTC (rev 32501) +++ brlcad/trunk/src/mged/muves.c 2008-08-22 04:30:17 UTC (rev 32502) @@ -644,7 +644,7 @@ } if ( e_argc > 1 ) - return( edit_com( e_argc, e_argv, 1, 0 ) ); + return( edit_com( e_argc, (const char **)e_argv, 1, 0 ) ); bu_free( (char *)e_argv, "e_argv" ); Modified: brlcad/trunk/src/mged/utility2.c =================================================================== --- brlcad/trunk/src/mged/utility2.c 2008-08-22 04:25:37 UTC (rev 32501) +++ brlcad/trunk/src/mged/utility2.c 2008-08-22 04:30:17 UTC (rev 32502) @@ -116,11 +116,11 @@ if ( lim > 1 ) { int retval; - const char **new_argv; + char **new_argv; new_argv = (char **)bu_calloc( lim+1, sizeof( char *), "f_eac: new_argv" ); new_argc = bu_argv_from_string( new_argv, lim, bu_vls_addr( &v ) ); - retval = cmd_draw( clientData, interp, new_argc, new_argv ); + retval = cmd_draw( clientData, interp, new_argc, (const char **)new_argv ); bu_free( (genptr_t)new_argv, "f_eac: new_argv" ); bu_vls_free( &v ); (void)signal( SIGINT, SIG_IGN ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-09-18 22:45:12
|
Revision: 32684 http://brlcad.svn.sourceforge.net/brlcad/?rev=32684&view=rev Author: brlcad Date: 2008-09-19 05:45:22 +0000 (Fri, 19 Sep 2008) Log Message: ----------- dead code cleanup Modified Paths: -------------- brlcad/trunk/src/mged/edsol.c brlcad/trunk/src/mged/mged.h Modified: brlcad/trunk/src/mged/edsol.c =================================================================== --- brlcad/trunk/src/mged/edsol.c 2008-09-19 05:29:15 UTC (rev 32683) +++ brlcad/trunk/src/mged/edsol.c 2008-09-19 05:45:22 UTC (rev 32684) @@ -9012,57 +9012,7 @@ pl[npl].str[0] = '\0'; /* Mark ending */ } -#if 0 -#ifndef HIDE_MGEDS_ARB_ROUTINES -/* -------------------------------- */ -/* - * R T _ A R B _ C A L C _ P L A N E S - * - * Calculate the plane (face) equations for an arb - * output previously went to es_peqn[i]. - * - * Returns - - * -1 Failure - * 0 OK - */ -int -rt_arb_calc_planes( - plane_t planes[6], - struct rt_arb_internal *arb, - int type, - const struct bn_tol *tol) -{ - register int i, p1, p2, p3; - RT_ARB_CK_MAGIC( arb); - BN_CK_TOL( tol ); - - type -= 4; /* ARB4 at location 0, ARB5 at 1, etc */ - - for (i=0; i<6; i++) { - if (rt_arb_faces[type][i*4] == -1) - break; /* faces are done */ - p1 = rt_arb_faces[type][i*4]; - p2 = rt_arb_faces[type][i*4+1]; - p3 = rt_arb_faces[type][i*4+2]; - - if ( bn_mk_plane_3pts( planes[i], - arb->pt[p1], arb->pt[p2], arb->pt[p3], tol ) < 0 ) { - struct bu_vls tmp_vls; - - bu_vls_init(&tmp_vls); - bu_vls_printf(&tmp_vls, "rt_arb_calc_planes: No eqn for face %d%d%d%d\n", - p1+1, p2+1, p3+1, rt_arb_faces[type][i*4+3]+1); - Tcl_AppendResult(interp, bu_vls_addr(&tmp_vls), (char *)NULL); - bu_vls_free(&tmp_vls); - return -1; - } - } - return 0; -} -#endif -#endif - /* -------------------------------- */ void sedit_vpick( point_t v_pos ) Modified: brlcad/trunk/src/mged/mged.h =================================================================== --- brlcad/trunk/src/mged/mged.h 2008-09-19 05:29:15 UTC (rev 32683) +++ brlcad/trunk/src/mged/mged.h 2008-09-19 05:45:22 UTC (rev 32684) @@ -773,46 +773,25 @@ void oedit_reject(void); void objedit_mouse( const vect_t mousevec ); extern int nurb_closest2d(int *surface, int *uval, int *vval, const struct rt_nurb_internal *spl, const fastf_t *ref_pt, const fastf_t *mat); -void label_edited_solid( - int *num_lines, - point_t *lines, - struct rt_point_labels pl[], - int max_pl, - const mat_t xform, - struct rt_db_internal *ip); +void label_edited_solid(int *num_lines, point_t *lines, struct rt_point_labels pl[], int max_pl, const mat_t xform, struct rt_db_internal *ip); void init_oedit(void); void init_sedit(void); -#if 0 -#ifdef HIDE_MGEDS_ARB_ROUTINES -# define rt_arb_calc_planes(planes, arb, type, tol) \ -rt_arb_calc_planes(interp, arb, type, planes, tol) -#else -int rt_arb_calc_planes( - plane_t planes[6], - struct rt_arb_internal *arb, - int type, - const struct bn_tol *tol); -#endif -#endif +int rt_arb_calc_planes(plane_t planes[6], struct rt_arb_internal *arb, int type, const struct bn_tol *tol); - /* share.c */ void usurp_all_resources(struct dm_list *dlp1, struct dm_list *dlp2); /* inside.c */ -int torin(struct rt_db_internal *ip, fastf_t thick[6] ); +int torin(struct rt_db_internal *ip, fastf_t thick[6]); int tgcin(struct rt_db_internal *ip, fastf_t thick[6]); int rhcin(struct rt_db_internal *ip, fastf_t thick[4]); int rpcin(struct rt_db_internal *ip, fastf_t thick[4]); -int partin(struct rt_db_internal *ip, fastf_t *thick ); -int nmgin( struct rt_db_internal *ip, fastf_t thick ); -int arbin( - struct rt_db_internal *ip, - fastf_t thick[6], - int nface, - int cgtype, /* # of points, 4..8 */ - plane_t planes[6]); +int partin(struct rt_db_internal *ip, fastf_t *thick); +int nmgin(struct rt_db_internal *ip, fastf_t thick); + +/* cgtype is # of points, 4..8 */ +int arbin(struct rt_db_internal *ip, fastf_t thick[6], int face, int cgtype, plane_t planes[6]); int ehyin(struct rt_db_internal *ip, fastf_t thick[2]); int ellgin(struct rt_db_internal *ip, fastf_t thick[6]); int epain(struct rt_db_internal *ip, fastf_t thick[2]); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2008-09-20 23:03:36
|
Revision: 32700 http://brlcad.svn.sourceforge.net/brlcad/?rev=32700&view=rev Author: starseeker Date: 2008-09-20 23:03:29 +0000 (Sat, 20 Sep 2008) Log Message: ----------- tweak headers of man pages for cad_boundp and cad_parea Modified Paths: -------------- brlcad/trunk/src/mged/cad_boundp.1 brlcad/trunk/src/mged/cad_parea.1 Modified: brlcad/trunk/src/mged/cad_boundp.1 =================================================================== --- brlcad/trunk/src/mged/cad_boundp.1 2008-09-20 22:58:54 UTC (rev 32699) +++ brlcad/trunk/src/mged/cad_boundp.1 2008-09-20 23:03:29 UTC (rev 32700) @@ -1,4 +1,4 @@ -.TH CAD_BOUNDP 1V VMB +.TH CAD_BOUNDP 1 BRL-CAD .\" C A D _ B O U N D P . 1 .\" BRL-CAD .\" Modified: brlcad/trunk/src/mged/cad_parea.1 =================================================================== --- brlcad/trunk/src/mged/cad_parea.1 2008-09-20 22:58:54 UTC (rev 32699) +++ brlcad/trunk/src/mged/cad_parea.1 2008-09-20 23:03:29 UTC (rev 32700) @@ -1,4 +1,4 @@ -.TH CAD_PAREA 1V VMB +.TH CAD_PAREA 1 BRL-CAD .\" C A D _ P A R E A . 1 .\" BRL-CAD .\" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-10-05 03:17:39
|
Revision: 32827 http://brlcad.svn.sourceforge.net/brlcad/?rev=32827&view=rev Author: brlcad Date: 2008-10-05 03:16:00 +0000 (Sun, 05 Oct 2008) Log Message: ----------- removed unused objdir.h header Modified Paths: -------------- brlcad/trunk/src/mged/Makefile.am Removed Paths: ------------- brlcad/trunk/src/mged/objdir.h Modified: brlcad/trunk/src/mged/Makefile.am =================================================================== --- brlcad/trunk/src/mged/Makefile.am 2008-10-04 19:21:38 UTC (rev 32826) +++ brlcad/trunk/src/mged/Makefile.am 2008-10-05 03:16:00 UTC (rev 32827) @@ -175,7 +175,6 @@ mged.h \ mged_dm.h \ mgedtcl.h \ - objdir.h \ qray.h \ scroll.h \ sedit.h \ Deleted: brlcad/trunk/src/mged/objdir.h =================================================================== --- brlcad/trunk/src/mged/objdir.h 2008-10-04 19:21:38 UTC (rev 32826) +++ brlcad/trunk/src/mged/objdir.h 2008-10-05 03:16:00 UTC (rev 32827) @@ -1,57 +0,0 @@ -/* O B J D I R . H - * BRL-CAD - * - * Copyright (c) 1985-2008 United States Government as represented by - * the U.S. Army Research Laboratory. - * - * This program 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 program 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 objdir.h - * - * The in-core object directory - * - */ - -struct directory { - char *d_namep; /* pointer to name string */ - long d_addr; /* disk address in obj file */ - short d_flags; /* flags */ - short d_len; /* # of db granules used by obj */ - short d_nref; /* # times referenced by COMBs */ - struct directory *d_forw; /* forward link */ -}; -#define DIR_NULL ((struct directory *) NULL) - -#define DIR_SOLID 0x1 /* this name is a solid */ -#define DIR_COMB 0x2 /* combination */ -#define DIR_REGION 0x4 /* region */ -#define DIR_BRANCH 0x8 /* branch name */ - -#define LOOKUP_QUIET 0 -#define LOOKUP_NOISY 1 - -/* should come from db.h */ -#ifndef NAMESIZE -# define NAMESIZE 16 -#endif - -/* - * Local Variables: - * mode: C - * tab-width: 8 - * indent-tabs-mode: t - * c-file-style: "stroustrup" - * End: - * ex: shiftwidth=4 tabstop=8 - */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-10-05 04:02:10
|
Revision: 32832 http://brlcad.svn.sourceforge.net/brlcad/?rev=32832&view=rev Author: brlcad Date: 2008-10-05 04:01:29 +0000 (Sun, 05 Oct 2008) Log Message: ----------- 'identity' matrix is no longer used. the cool kids are all using bn_mat_identity. Modified Paths: -------------- brlcad/trunk/src/mged/mged.c brlcad/trunk/src/mged/mged.h Modified: brlcad/trunk/src/mged/mged.c =================================================================== --- brlcad/trunk/src/mged/mged.c 2008-10-05 03:59:09 UTC (rev 32831) +++ brlcad/trunk/src/mged/mged.c 2008-10-05 04:01:29 UTC (rev 32832) @@ -554,7 +554,6 @@ owner = 1; frametime = 1; - MAT_IDN( identity ); /* Handy to have around */ MAT_IDN( modelchanges ); MAT_IDN( acc_rot_sol ); Modified: brlcad/trunk/src/mged/mged.h =================================================================== --- brlcad/trunk/src/mged/mged.h 2008-10-05 03:59:09 UTC (rev 32831) +++ brlcad/trunk/src/mged/mged.h 2008-10-05 04:01:29 UTC (rev 32832) @@ -153,12 +153,6 @@ extern mat_t incr_change; /* change(s) from last cycle */ extern point_t recip_vanishing_point; - -/* - * Identity matrix. Handy to have around. - initialized in e1.c - */ -extern mat_t identity; - /* defined in buttons.c */ extern fastf_t acc_sc_sol; /* accumulate solid scale factor */ extern fastf_t acc_sc_obj; /* accumulate global object scale factor */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-10-05 04:02:14
|
Revision: 32830 http://brlcad.svn.sourceforge.net/brlcad/?rev=32830&view=rev Author: brlcad Date: 2008-10-05 03:57:25 +0000 (Sun, 05 Oct 2008) Log Message: ----------- get rid of more unnecessary and unused crap. begone MGED_EXTERN too. Modified Paths: -------------- brlcad/trunk/src/mged/cmd.h brlcad/trunk/src/mged/edsol.c brlcad/trunk/src/mged/mged.h Modified: brlcad/trunk/src/mged/cmd.h =================================================================== --- brlcad/trunk/src/mged/cmd.h 2008-10-05 03:45:14 UTC (rev 32829) +++ brlcad/trunk/src/mged/cmd.h 2008-10-05 03:57:25 UTC (rev 32830) @@ -23,273 +23,273 @@ #include "common.h" -#include "./mged.h" /* for MGED_EXTERN */ +#include "./mged.h" /* for BU_EXTERN */ /* Commands */ -MGED_EXTERN(int cmd_E, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_adjust, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_ae2dir, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_aetview, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_arot, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_attr, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_autoview, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); -MGED_EXTERN(int cmd_blast, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); -MGED_EXTERN(int cmd_bot_decimate, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_bot_face_sort, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_bot_smooth, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_cat, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_center, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_cmd_win, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_color, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_comb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_comb_std, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_concat, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_copy, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_copyeval, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_dbip, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_dbversion, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_dir2ae, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_draw, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); -MGED_EXTERN(int cmd_dump, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_dup, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_echo, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_emuves, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_erase, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_erase_all, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_ev, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); -MGED_EXTERN(int cmd_expand, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_export_body, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_eye_pt, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_find, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_form, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_get, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_get_autoview, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_get_comb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_get_more_default, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_get_ptr, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_group, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_has_embedded_fb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_hide, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_hist, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_import_body, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_instance, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_keep, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_kill, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_killall, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_killtree, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_list, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_lm, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_lookat, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_ls, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_lt, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_make_bb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_make_name, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_match, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_mged_glob, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_mmenu_get, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_mrot, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_mvall, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_name, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_nmg_collapse, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_nmg_simplify, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_nop, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_oed, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_orientation, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_output_hook, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_overlay, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_parse_points, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_pathlist, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_pathsum, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_pov, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_prcolor, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_push, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_put, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_put_comb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_redraw_vlist, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_region, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_remove, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_rot, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_rrt, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_rt, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_rt_gettrees, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_rtabort, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_sca, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_search, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_set_more_default, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_setview, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_shaded_mode, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_shells, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_showmats, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_size, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_solid_report, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_solids_on_ray, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_stub, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_stuff_str, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_summary, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_title, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_tk, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_tol, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_tops, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_tra, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_tree, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_unhide, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_units, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_vdraw, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_viewdir, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_viewget, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_viewset, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_vrot, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_whatid, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_which, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_who, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_xpush, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int cmd_zap, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); -MGED_EXTERN(int cmd_zoom, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_3ptarb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_adc, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_aip, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_amtrack, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_analyze, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_arbdef, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_arced, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_area, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_attach, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_bev, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_bo, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_bomb, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); -MGED_EXTERN(int f_bot_condense, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_bot_face_fuse, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_bot_fuse, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_bot_merge, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_bot_split, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_clone, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_closedb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_comb_color, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_comm, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_copy_inv, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_copymat, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_debugbu, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_debugdir, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_debuglib, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_debugmem, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_debugnmg, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_decompose, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_delay, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_dm, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_e_muves, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_eac, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_edcodes, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_edcolor, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_edcomb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_edgedir, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_edmater, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); -MGED_EXTERN(int f_eqn, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_extrude, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_facedef, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_facetize, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_fhelp, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_fix, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_fracture, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_get_dm_list, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_get_sedit, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_get_sedit_menus, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_get_solid_keypoint, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_grid2model_lu, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_grid2view_lu, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_help, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_hideline, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_history, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_ill, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); -MGED_EXTERN(int f_in, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_inside, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_itemair, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); -MGED_EXTERN(int f_joint, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_journal, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_keypoint, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_knob, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_l_muves, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_labelvert, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_loadview, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_make, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_mater, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_matpick, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_memprint, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_mirface, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_mirror, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); -MGED_EXTERN(int f_model2grid_lu, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_model2view, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_model2view_lu, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_mouse, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_nirt, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_oedit_apply, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_oedit_reset, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_opendb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_param, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_permute, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_pl, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_plot, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_polybinout, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_prefix, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_press, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_preview, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_ps, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_put_sedit, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_putmat, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_qorot, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_qray, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_quit, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_quit, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_qvrot, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_rcodes, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_read_muves, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_red, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_refresh, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_regdebug, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_regdef, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_release, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_rfarb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_rmater, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); -MGED_EXTERN(int f_rmats, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_rot_obj, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_rset, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_savekey, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_saveview, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_sc_obj, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_sed, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); -MGED_EXTERN(int f_sedit_apply, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_sedit_reset, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_set, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_shader, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_share, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_slewview, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_source, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_status, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_svbase, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_sync, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_t_muves, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_tables, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_tabobj, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_tedit, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_tie, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_tr_obj, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_tracker, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_update, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_view, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_view2grid_lu, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_view2model, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_view2model_lu, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_view2model_vec, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_view_ring, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_vnirt, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_vrmgr, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_vrot_center, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_wait, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_wcodes, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_which_shader, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_winset, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); -MGED_EXTERN(int f_wmater, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); +BU_EXTERN(int cmd_E, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_adjust, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_ae2dir, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_aetview, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_arot, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_attr, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_autoview, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); +BU_EXTERN(int cmd_blast, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); +BU_EXTERN(int cmd_bot_decimate, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_bot_face_sort, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_bot_smooth, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_cat, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_center, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_cmd_win, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_color, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_comb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_comb_std, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_concat, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_copy, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_copyeval, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_dbip, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_dbversion, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_dir2ae, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_draw, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); +BU_EXTERN(int cmd_dump, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_dup, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_echo, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_emuves, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_erase, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_erase_all, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_ev, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); +BU_EXTERN(int cmd_expand, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_export_body, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_eye_pt, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_find, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_form, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_get, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_get_autoview, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_get_comb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_get_more_default, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_get_ptr, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_group, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_has_embedded_fb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_hide, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_hist, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_import_body, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_instance, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_keep, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_kill, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_killall, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_killtree, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_list, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_lm, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_lookat, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_ls, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_lt, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_make_bb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_make_name, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_match, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_mged_glob, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_mmenu_get, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_mrot, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_mvall, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_name, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_nmg_collapse, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_nmg_simplify, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_nop, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_oed, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_orientation, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_output_hook, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_overlay, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_parse_points, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_pathlist, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_pathsum, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_pov, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_prcolor, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_push, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_put, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_put_comb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_redraw_vlist, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_region, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_remove, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_rot, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_rrt, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_rt, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_rt_gettrees, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_rtabort, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_sca, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_search, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_set_more_default, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_setview, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_shaded_mode, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_shells, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_showmats, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_size, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_solid_report, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_solids_on_ray, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_stub, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_stuff_str, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_summary, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_title, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_tk, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_tol, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_tops, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_tra, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_tree, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_unhide, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_units, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_vdraw, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_viewdir, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_viewget, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_viewset, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_vrot, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_whatid, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_which, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_who, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_xpush, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int cmd_zap, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); +BU_EXTERN(int cmd_zoom, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_3ptarb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_adc, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_aip, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_amtrack, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_analyze, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_arbdef, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_arced, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_area, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_attach, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_bev, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_bo, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_bomb, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); +BU_EXTERN(int f_bot_condense, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_bot_face_fuse, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_bot_fuse, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_bot_merge, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_bot_split, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_clone, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_closedb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_comb_color, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_comm, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_copy_inv, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_copymat, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_debugbu, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_debugdir, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_debuglib, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_debugmem, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_debugnmg, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_decompose, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_delay, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_dm, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_e_muves, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_eac, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_edcodes, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_edcolor, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_edcomb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_edgedir, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_edmater, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); +BU_EXTERN(int f_eqn, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_extrude, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_facedef, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_facetize, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_fhelp, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_fix, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_fracture, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_get_dm_list, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_get_sedit, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_get_sedit_menus, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_get_solid_keypoint, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_grid2model_lu, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_grid2view_lu, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_help, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_hideline, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_history, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_ill, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); +BU_EXTERN(int f_in, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_inside, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_itemair, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); +BU_EXTERN(int f_joint, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_journal, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_keypoint, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_knob, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_l_muves, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_labelvert, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_loadview, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_make, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_mater, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_matpick, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_memprint, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_mirface, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_mirror, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); +BU_EXTERN(int f_model2grid_lu, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_model2view, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_model2view_lu, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_mouse, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_nirt, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_oedit_apply, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_oedit_reset, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_opendb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_param, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_permute, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_pl, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_plot, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_polybinout, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_prefix, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_press, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_preview, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_ps, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_put_sedit, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_putmat, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_qorot, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_qray, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_quit, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_quit, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_qvrot, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_rcodes, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_read_muves, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_red, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_refresh, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_regdebug, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_regdef, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_release, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_rfarb, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_rmater, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); +BU_EXTERN(int f_rmats, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_rot_obj, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_rset, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_savekey, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_saveview, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_sc_obj, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_sed, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); +BU_EXTERN(int f_sedit_apply, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_sedit_reset, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_set, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_shader, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_share, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_slewview, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_source, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_status, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_svbase, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_sync, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_t_muves, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_tables, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_tabobj, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_tedit, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_tie, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_tr_obj, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_tracker, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_update, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_view, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_view2grid_lu, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_view2model, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_view2model_lu, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_view2model_vec, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_view_ring, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_vnirt, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_vrmgr, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_vrot_center, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_wait, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_wcodes, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_which_shader, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_winset, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +BU_EXTERN(int f_wmater, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])); /* * Local Variables: Modified: brlcad/trunk/src/mged/edsol.c =================================================================== --- brlcad/trunk/src/mged/edsol.c 2008-10-05 03:45:14 UTC (rev 32829) +++ brlcad/trunk/src/mged/edsol.c 2008-10-05 03:57:25 UTC (rev 32830) @@ -71,10 +71,10 @@ point_t curr_e_axes_pos; short int fixv; /* used in ECMD_ARB_ROTATE_FACE,f_eqn(): fixed vertex */ -MGED_EXTERN( struct wdb_pipept *find_pipept_nearest_pt, (const struct bu_list *pipe_hd, const point_t pt ) ); -MGED_EXTERN( void split_pipept, (struct bu_list *pipe_hd, struct wdb_pipept *ps, point_t pt ) ); -MGED_EXTERN( struct wdb_pipept *del_pipept, (struct wdb_pipept *ps ) ); -MGED_EXTERN( struct wdb_pipept *add_pipept, (struct rt_pipe_internal *pipe, struct wdb_pipept *pp, const point_t new_pt ) ); +BU_EXTERN( struct wdb_pipept *find_pipept_nearest_pt, (const struct bu_list *pipe_hd, const point_t pt ) ); +BU_EXTERN( void split_pipept, (struct bu_list *pipe_hd, struct wdb_pipept *ps, point_t pt ) ); +BU_EXTERN( struct wdb_pipept *del_pipept, (struct wdb_pipept *ps ) ); +BU_EXTERN( struct wdb_pipept *add_pipept, (struct rt_pipe_internal *pipe, struct wdb_pipept *pp, const point_t new_pt ) ); /* data for solid editing */ int sedraw; /* apply solid editing changes */ Modified: brlcad/trunk/src/mged/mged.h =================================================================== --- brlcad/trunk/src/mged/mged.h 2008-10-05 03:45:14 UTC (rev 32829) +++ brlcad/trunk/src/mged/mged.h 2008-10-05 03:57:25 UTC (rev 32830) @@ -76,24 +76,24 @@ /* Needed to define struct solid */ #include "solid.h" -#define HIDE_MGEDS_ARB_ROUTINES 1 #define MGED_DB_NAME "db" #define MGED_INMEM_NAME ".inmem" #define MGED_DG_NAME "dg" -#define MGED_EXTERN(type_and_name, args) extern type_and_name args -extern double degtorad, radtodeg; /* Defined in usepen.c */ +/* Defined in usepen.c */ +extern double degtorad; +extern double radtodeg; /* * All GED files are stored in a fixed base unit (MM). * These factors convert database unit to local (or working) units. */ -extern struct db_i *dbip; /* defined in mged.c */ -extern int dbih; /* defined in mged.c */ -extern struct rt_wdb *wdbp; /* defined in mged.c */ -extern struct dg_obj *dgop; /* defined in mged.c */ +extern struct db_i *dbip; /* defined in mged.c */ +extern int dbih; /* defined in mged.c */ +extern struct rt_wdb *wdbp; /* defined in mged.c */ +extern struct dg_obj *dgop; /* defined in mged.c */ #define base2local (dbip->dbi_base2local) #define local2base (dbip->dbi_local2base) #define cur_title (dbip->dbi_title) /* current model title */ @@ -109,24 +109,16 @@ # define TRUE 1 #endif -#ifndef False -# define False (0) -#endif - -#ifndef True -# define True (1) -#endif - /* Tolerances */ -extern double mged_abs_tol; /* abs surface tolerance */ -extern double mged_rel_tol; /* rel surface tolerance */ -extern double mged_nrm_tol; /* surface normal tolerance */ +extern double mged_abs_tol; /* abs surface tolerance */ +extern double mged_rel_tol; /* rel surface tolerance */ +extern double mged_nrm_tol; /* surface normal tolerance */ -/* default region codes defined in mover.c */ -extern int item_default; -extern int air_default; -extern int mat_default; -extern int los_default; +/* default region codes defined in mover.c */ +extern int item_default; +extern int air_default; +extern int mat_default; +extern int los_default; /** * Definitions. @@ -190,43 +182,67 @@ * GED functions referenced in more than one source file: */ -extern int tran(), irot(); +extern int tran(); +extern int irot(); extern void mged_setup(void); -extern void dir_build(), buildHrot(fastf_t *, double, double, double), dozoom(int which_eye), - pr_schain(struct solid *startp, int lvl); +extern void dir_build(); +extern void buildHrot(fastf_t *, double, double, double); +extern void dozoom(int which_eye); +extern void pr_schain(struct solid *startp, int lvl); #ifndef _WIN32 extern void itoa(int n, char *s, int w); #endif -extern void eraseobj(register struct directory **dpp), eraseobjall(register struct directory **dpp), mged_finish(int exitcode), slewview(fastf_t *view_pos), - mmenu_init(void), moveHinstance(struct directory *cdp, struct directory *dp, matp_t xlate), moveHobj(register struct directory *dp, matp_t xlate), - quit(void), refresh(void), rej_sedit(), sedit(void), - setview(double a1, double a2, double a3), - adcursor(void), mmenu_display(int y_top), mmenu_set(int index, struct menu_item *value), mmenu_set_all(int index, struct menu_item *value), - col_item(), col_putchar(), col_eol(), col_pr4v(); +extern void eraseobj(register struct directory **dpp); +extern void eraseobjall(register struct directory **dpp); +extern void mged_finish(int exitcode); +extern void slewview(fastf_t *view_pos); +extern void mmenu_init(void); +extern void moveHinstance(struct directory *cdp, struct directory *dp, matp_t xlate); +extern void moveHobj(register struct directory *dp, matp_t xlate); +extern void quit(void); +extern void refresh(void); +extern void rej_sedit(); +extern void sedit(void); +extern void setview(double a1, double a2, double a3); +extern void adcursor(void); +extern void mmenu_display(int y_top); +extern void mmenu_set(int index, struct menu_item *value); +extern void mmenu_set_all(int index, struct menu_item *value); +extern void + col_item(); +extern void col_putchar(); +extern void col_eol(); +extern void col_pr4v(); extern void sedit_menu(void); -extern void attach(), get_attached(void); +extern void attach(); +extern void get_attached(void); extern void (*cur_sigint)(); /* Current SIGINT status */ -extern void sig2(int), sig3(int); +extern void sig2(int); +extern void sig3(int); extern void aexists(char *name); -extern int getname(), use_pen(), dir_print(); -extern int mged_cmd_arg_check(), release(char *name, int need_close); -extern struct directory *combadd(), **dir_getspace(); +extern int getname(); +extern int use_pen(); +extern int dir_print(); +extern int mged_cmd_arg_check(); +extern int release(char *name, int need_close); +extern struct directory *combadd(); +extern struct directory **dir_getspace(); extern void ellipse(); /* mged.c */ extern void mged_view_obj_callback(genptr_t clientData, struct view_obj *vop); /* buttons.c */ -MGED_EXTERN(void button, (int bnum) ); -MGED_EXTERN(void press, (char *str) ); -MGED_EXTERN(char *label_button, (int bnum) ); -MGED_EXTERN(int not_state, (int desired, char *str) ); -MGED_EXTERN(int chg_state, (int from, int to, char *str) ); -MGED_EXTERN(void state_err, (char *str) ); +BU_EXTERN(void button, (int bnum) ); +BU_EXTERN(void press, (char *str) ); +BU_EXTERN(char *label_button, (int bnum) ); +BU_EXTERN(int not_state, (int desired, char *str) ); +BU_EXTERN(int chg_state, (int from, int to, char *str) ); +BU_EXTERN(void state_err, (char *str) ); -MGED_EXTERN(void do_list, (struct bu_vls *outstrp, struct directory *dp, int verbose)); -MGED_EXTERN(int invoke_db_wrapper, (Tcl_Interp *interpreter, int argc, char **argv)); +BU_EXTERN(void do_list, (struct bu_vls *outstrp, struct directory *dp, int verbose)); +BU_EXTERN(int invoke_db_wrapper, (Tcl_Interp *interpreter, int argc, char **argv)); /* history.c */ void history_record( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-10-05 04:24:40
|
Revision: 32829 http://brlcad.svn.sourceforge.net/brlcad/?rev=32829&view=rev Author: brlcad Date: 2008-10-05 03:45:14 +0000 (Sun, 05 Oct 2008) Log Message: ----------- get rid of MINVIEW define, use RT_MINVIEWSIZE Modified Paths: -------------- brlcad/trunk/src/mged/chgview.c brlcad/trunk/src/mged/mged_dm.h Modified: brlcad/trunk/src/mged/chgview.c =================================================================== --- brlcad/trunk/src/mged/chgview.c 2008-10-05 03:44:29 UTC (rev 32828) +++ brlcad/trunk/src/mged/chgview.c 2008-10-05 03:45:14 UTC (rev 32829) @@ -3255,8 +3255,8 @@ view_state->vs_vop->vo_scale = view_state->vs_i_Viewscale * (1.0 + (view_state->vs_absolute_scale * -9.0)); } - if (view_state->vs_vop->vo_scale < MINVIEW) - view_state->vs_vop->vo_scale = MINVIEW; + if (view_state->vs_vop->vo_scale < RT_MINVIEWSIZE) + view_state->vs_vop->vo_scale = RT_MINVIEWSIZE; vo_zoom(view_state->vs_vop, interp, 1.0); Modified: brlcad/trunk/src/mged/mged_dm.h =================================================================== --- brlcad/trunk/src/mged/mged_dm.h 2008-10-05 03:44:29 UTC (rev 32828) +++ brlcad/trunk/src/mged/mged_dm.h 2008-10-05 03:45:14 UTC (rev 32829) @@ -496,7 +496,6 @@ #define scroll_y curr_dm_list->dml_scroll_y #define scroll_array curr_dm_list->dml_scroll_array -#define MINVIEW 0.001 #define VIEWSIZE (2.0*view_state->vs_Viewscale) /* Width of viewing cube */ #define VIEWFACTOR (1/view_state->vs_Viewscale) /* 2.0 / VIEWSIZE */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-10-05 04:29:11
|
Revision: 32836 http://brlcad.svn.sourceforge.net/brlcad/?rev=32836&view=rev Author: brlcad Date: 2008-10-05 04:26:32 +0000 (Sun, 05 Oct 2008) Log Message: ----------- enable compilation of the former 'hideline' functionality and f_hideline callback for an 'H' command. it's not clear to me just quite yet what exactly this even does as it's untested, but it is at least no longer 'dead' code. cursory review seems to be that it's shooting rays for all vlist segments producing some sort of plot file as a result. Modified Paths: -------------- brlcad/trunk/src/mged/Makefile.am brlcad/trunk/src/mged/hideline.c brlcad/trunk/src/mged/mged_dm.h Modified: brlcad/trunk/src/mged/Makefile.am =================================================================== --- brlcad/trunk/src/mged/Makefile.am 2008-10-05 04:21:49 UTC (rev 32835) +++ brlcad/trunk/src/mged/Makefile.am 2008-10-05 04:26:32 UTC (rev 32836) @@ -90,6 +90,7 @@ facedef.c \ fbserv.c \ grid.c \ + hideline.c \ history.c \ inside.c \ mater.c \ @@ -204,7 +205,6 @@ dm-X.c \ dm-tk.c \ fbserv_win32.c \ - hideline.c \ memalloc.c \ mged.bat \ mged.dsp Modified: brlcad/trunk/src/mged/hideline.c =================================================================== --- brlcad/trunk/src/mged/hideline.c 2008-10-05 04:21:49 UTC (rev 32835) +++ brlcad/trunk/src/mged/hideline.c 2008-10-05 04:26:32 UTC (rev 32836) @@ -19,24 +19,18 @@ */ /** @file hideline.c * - * Takes the vector list for the current display and raytraces - * along those vectors. If the first point hit in the model is the - * same as that vector, continue the line through that point; - * otherwise, stop drawing that vector or draw dotted line. - * Produces Unix-plot type output. + * Takes the vector list for the current display and raytraces along + * those vectors. If the first point hit in the model is the same as + * that vector, continue the line through that point; otherwise, stop + * drawing that vector or draw dotted line. Produces Unix-plot type + * output. * - * The command is "H file.pl [stepsize] [%epsilon]". Stepsize is the - * number of segments into which the window size should be broken. - * %Epsilon specifies how close two points must be before they are - * considered equal. A good values for stepsize and %epsilon are 128 - * and 1, respectively. + * The command is "H file.pl [stepsize] [%epsilon]". Stepsize is the + * number of segments into which the window size should be broken. + * %Epsilon specifies how close two points must be before they are + * considered equal. A good values for stepsize and %epsilon are 128 + * and 1, respectively. * - * Author - - * Mark Huston Bowden - * - * History - - * 01 Aug 88 Began initial coding - * */ #include "common.h" @@ -55,33 +49,29 @@ #define MAXOBJECTS 3000 -#define VIEWSIZE (2*view_state->vs_Viewscale) -#define TRUE 1 -#define FALSE 0 - #define MOVE(v) VMOVE(last_move, (v)) #define DRAW(v) { vect_t a, b;\ - MAT4X3PNT(a, view_state->vs_model2view, last_move);\ - MAT4X3PNT(b, view_state->vs_model2view, (v));\ + MAT4X3PNT(a, view_state->vs_vop->vo_model2view, last_move);\ + MAT4X3PNT(b, view_state->vs_vop->vo_model2view, (v));\ pdv_3line(plotfp, a, b ); } extern struct db_i *dbip; /* current database instance */ fastf_t epsilon; vect_t aim_point; -struct solid *sp; -/* + +/** * hit_headon - routine called by rt_shootray if ray hits model */ - static int -hit_headon(struct application *ap, struct partition *PartHeadp) +hit_headon(struct application *ap, struct partition *PartHeadp, struct seg *segp) { register char diff_solid; vect_t diff; register fastf_t len; + struct solid *sp; if (PartHeadp->pt_forw->pt_forw != PartHeadp) Tcl_AppendResult(interp, "hit_headon: multiple partitions\n", (char *)NULL); @@ -94,17 +84,14 @@ PartHeadp->pt_forw->pt_inseg->seg_stp->st_dp); len = MAGNITUDE(diff); - if ( NEAR_ZERO(len, epsilon) - || - ( diff_solid && - VDOT(diff, ap->a_ray.r_dir) > 0 ) - ) + if (NEAR_ZERO(len, epsilon) || (diff_solid && VDOT(diff, ap->a_ray.r_dir) > 0)) return(1); else return(0); } -/* + +/** * hit_tangent - routine called by rt_shootray if ray misses model * * We know we are shooting at the model since we are aiming at the @@ -113,24 +100,24 @@ * time rt_shootray reports a miss. Therefore, this routine is really * a "hit" routine. */ - static int -hit_tangent(struct application *ap, struct partition *PartHeadp) +hit_tangent(struct application *ap) { return(1); /* always a hit */ } -/* + +/** * hit_overlap - called by rt_shootray if ray hits an overlap */ - static int -hit_overlap(struct application *ap, struct partition *PartHeadp) +hit_overlap(struct application *ap, struct partition *ph, struct region *r1, struct region *r2, struct partition *hp) { return(0); /* never a hit */ } -/* + +/** * F _ H I D E L I N E */ int @@ -149,6 +136,7 @@ vect_t temp; vect_t last, dir; register struct bn_vlist *vp; + struct solid *sp; CHECK_DBI_NULL; @@ -171,9 +159,9 @@ /* Build list of objects being viewed */ numobjs = 0; - FOR_ALL_SOLIDS(sp) { - for (i = 0; i < numobjs; i++) { - if ( objname[i] == FIRST_SOLID(sp)->d_namep ) + FOR_ALL_SOLIDS(sp, &dgop->dgo_headSolid) { + for (i = 0; i < numobjs; i++) { + if (objname[i] == FIRST_SOLID(sp)->d_namep) break; } if (i == numobjs) @@ -203,12 +191,12 @@ if (argc > 2) { sscanf(argv[2], "%f", &step); - step = view_state->vs_Viewscale/step; + step = view_state->vs_vop->vo_scale/step; sscanf(argv[3], "%f", &epsilon); - epsilon *= view_state->vs_Viewscale/100; + epsilon *= view_state->vs_vop->vo_scale/100; } else { - step = view_state->vs_Viewscale/256; - epsilon = 0.1*view_state->vs_Viewscale; + step = view_state->vs_vop->vo_scale/256; + epsilon = 0.1*view_state->vs_vop->vo_scale; } for (i = 0; i < numobjs; i++) @@ -218,24 +206,24 @@ /* Crawl along the vectors raytracing as we go */ VSET(temp, 0.0, 0.0, -1.0); /* looking at model */ - MAT4X3VEC(a.a_ray.r_dir, view_state->vs_view2model, temp); + MAT4X3VEC(a.a_ray.r_dir, view_state->vs_vop->vo_view2model, temp); VUNITIZE(a.a_ray.r_dir); - FOR_ALL_SOLIDS(sp) { + FOR_ALL_SOLIDS(sp, &dgop->dgo_headSolid) { ratio = sp->s_size / VIEWSIZE; /* ignore if small or big */ - if (ratio >= dmp->dmr_bound || ratio < 0.001) + if (ratio >= dmp->dm_bound || ratio < 0.001) continue; Tcl_AppendResult(interp, "Primitive\n", (char *)NULL); - for ( BU_LIST_FOR( vp, bn_vlist, &(sp->s_vlist) ) ) { + for (BU_LIST_FOR(vp, bn_vlist, &(sp->s_vlist))) { register int i; register int nused = vp->nused; register int *cmd = vp->cmd; register point_t *pt = vp->pt; - for ( i = 0; i < nused; i++, cmd++, pt++ ) { + for (i = 0; i < nused; i++, cmd++, pt++) { Tcl_AppendResult(interp, "\tVector\n", (char *)NULL); - switch ( *cmd ) { + switch (*cmd) { case BN_VLIST_POLY_START: case BN_VLIST_POLY_VERTNORM: break; @@ -263,17 +251,17 @@ } for (u = 0; u <= len; u += step) { VJOIN1(aim_point, last, u, dir); - MAT4X3PNT(temp, view_state->vs_model2view, aim_point); + MAT4X3PNT(temp, view_state->vs_vop->vo_model2view, aim_point); temp[Z] = 100; /* parallel project */ - MAT4X3PNT(a.a_ray.r_pt, view_state->vs_view2model, temp); + MAT4X3PNT(a.a_ray.r_pt, view_state->vs_vop->vo_view2model, temp); if (rt_shootray(&a)) { if (!visible) { - visible = TRUE; + visible = 1; MOVE(aim_point); } } else { if (visible) { - visible = FALSE; + visible = 0; DRAW(aim_point); } } Modified: brlcad/trunk/src/mged/mged_dm.h =================================================================== --- brlcad/trunk/src/mged/mged_dm.h 2008-10-05 04:21:49 UTC (rev 32835) +++ brlcad/trunk/src/mged/mged_dm.h 2008-10-05 04:26:32 UTC (rev 32836) @@ -496,8 +496,8 @@ #define scroll_y curr_dm_list->dml_scroll_y #define scroll_array curr_dm_list->dml_scroll_array -#define VIEWSIZE (2.0*view_state->vs_Viewscale) /* Width of viewing cube */ -#define VIEWFACTOR (1/view_state->vs_Viewscale) /* 2.0 / VIEWSIZE */ +#define VIEWSIZE (2.0*view_state->vs_vop->vo_scale) /* Width of viewing cube */ +#define VIEWFACTOR (1/view_state->vs_vop->vo_scale) /* 2.0 / VIEWSIZE */ #define RATE_ROT_FACTOR 6.0 #define ABS_ROT_FACTOR 180.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-10-05 04:38:35
|
Revision: 32839 http://brlcad.svn.sourceforge.net/brlcad/?rev=32839&view=rev Author: brlcad Date: 2008-10-05 04:37:40 +0000 (Sun, 05 Oct 2008) Log Message: ----------- remove editobjGui.h .. it doesn't seem to be used anywhere Modified Paths: -------------- brlcad/trunk/src/mged/Makefile.am Removed Paths: ------------- brlcad/trunk/src/mged/editobjGui.h Modified: brlcad/trunk/src/mged/Makefile.am =================================================================== --- brlcad/trunk/src/mged/Makefile.am 2008-10-05 04:34:14 UTC (rev 32838) +++ brlcad/trunk/src/mged/Makefile.am 2008-10-05 04:37:40 UTC (rev 32839) @@ -166,7 +166,6 @@ noinst_HEADERS = \ cmd.h \ comb_bool.h \ - editobjGui.h \ fbserv.h \ htmlLibraryUi.h \ icreateGui.h \ Deleted: brlcad/trunk/src/mged/editobjGui.h =================================================================== --- brlcad/trunk/src/mged/editobjGui.h 2008-10-05 04:34:14 UTC (rev 32838) +++ brlcad/trunk/src/mged/editobjGui.h 2008-10-05 04:37:40 UTC (rev 32839) @@ -1,159 +0,0 @@ -/* E D I T O B J G U I . H - * BRL-CAD - * - * Copyright (c) 2004-2008 United States Government as represented by - * the U.S. Army Research Laboratory. - * - * This program 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 program 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 editobjGui.h - * - */ - -char *editobj_gui_str = "\ -set eoname(V) \"Vertex\";\ -set eoname(A) \"A vector\";\ -set eoname(B) \"B vector\";\ -set eoname(C) \"C vector\";\ -set eoname(D) \"D vector\";\ -set eoname(H) \"H vector\";\ -set eoname(r) \"Radius\";\ -set eoname(r_a) \"Radius a\";\ -set eoname(r_h) \"Radius h\";\ -\ -proc editobj { id oname } {\ - global eofin$oname;\ - global eoname;\ - global player_screen;\ -\ - set vals [db get $oname];\ - set form [db form [lindex $vals 0]];\ - set len [llength $form];\ -\ - if { [winfo exists .eo$oname] } {\ - return \"Someone is already editing $oname\";\ - };\ -\ - toplevel .eo$oname -screen $player_screen($id);\ - wm title .eo$oname \"Object editor: $oname\";\ -\ - frame .eo$oname.t -borderwidth 2;\ - pack .eo$oname.t -side top -fill x -expand yes;\ -\ - frame .eo$oname.t.l;\ - frame .eo$oname.t.r;\ - pack .eo$oname.t.l -side left -fill y -expand yes;\ - pack .eo$oname.t.r -side left -fill x -expand yes;\ -\ - set eofin$oname \"db adjust $oname\";\ -\ - for { set i 0 } { $i<$len } { incr i } {\ - set attr [lindex $form $i];\ - incr i;\ -\ - frame .eo$oname.t.r.f$attr;\ - pack .eo$oname.t.r.f$attr -side top -fill x -expand yes;\ - set eofin$oname [eval concat \\[set eofin$oname\\] $attr \\\\\\\"];\ -\ - set field [lindex $form $i];\ - set fieldlen [llength $field];\ - for { set num 0 } { $num<$fieldlen } { incr num } {\ - if { [string first \"%f\" $field]>-1 } {\ - button .eo$oname.t.r.f$attr.dec$num -text \- -command \ - \"eodec $oname .eo$oname.t.r.f$attr.e$num\";\ - button .eo$oname.t.r.f$attr.inc$num -text \+ -command \ - \"eoinc $oname .eo$oname.t.r.f$attr.e$num\";\ - entry .eo$oname.t.r.f$attr.e$num -width 6 -relief sunken;\ - pack .eo$oname.t.r.f$attr.dec$num -side left;\ - pack .eo$oname.t.r.f$attr.e$num -side left -fill x -expand yes;\ - pack .eo$oname.t.r.f$attr.inc$num -side left;\ - .eo$oname.t.r.f$attr.e$num insert insert \ - [lindex [lindex $vals [expr $i+1]] $num];\ - set eofin$oname [eval concat \\[set eofin$oname\\] \ - \\\\\\[.eo$oname.t.r.f$attr.e$num get\\\\\\]];\ - bind .eo$oname.t.r.f$attr.e$num <Key-Return> \"eoapply $oname\";\ - };\ - };\ -\ - set eofin$oname [eval concat \\[set eofin$oname\\] \\\\\\\"];\ -\ - if { [catch { label .eo$oname.t.l.l$attr -text \"$eoname($attr)\" \ - -anchor w }]!=0 } {\ - label .eo$oname.t.l.l$attr -text \"$attr\" -anchor w;\ - };\ -\ - pack .eo$oname.t.l.l$attr -side top -anchor w -fill y -expand yes;\ - };\ -\ - frame .eo$oname.b -borderwidth 2;\ - pack .eo$oname.b -side top -fill x -expand yes;\ - button .eo$oname.b.apply -text \"Apply\" -command \"eoapply $oname\";\ - button .eo$oname.b.cancel -text \"Close\" -command \"destroy .eo$oname\";\ - pack .eo$oname.b.apply .eo$oname.b.cancel -side left -fill x -expand yes;\ -};\ -\ -proc eoapply { oname } {\ - global eofin$oname;\ - global eoname;\ -\ - eval [set eofin$oname];\ -\ - set vals [db get $oname];\ - set form [db form [lindex $vals 0]];\ - set len [llength $form];\ -\ - for { set i 0 } { $i<$len } { incr i } {\ - set attr [lindex $form $i];\ - incr i;\ -\ - set field [lindex $form $i];\ - set fieldlen [llength $field];\ - for { set num 0 } { $num<$fieldlen } { incr num } {\ - if { [string first \"%f\" $field]>-1 } {\ - .eo$oname.t.r.f$attr.e$num delete 0 end;\ - .eo$oname.t.r.f$attr.e$num insert insert \ - [lindex [lindex $vals [expr $i+1]] $num];\ - };\ - };\ - };\ -};\ -\ -proc eoinc { oname entryfield } {\ - set oldval [$entryfield get];\ - set increase [expr $oldval*0.1];\ - if { $increase<0.1 } { set increase 0.1 };\ - $entryfield delete 0 end;\ - $entryfield insert insert [expr $oldval+$increase];\ - eoapply $oname;\ -};\ -\ -proc eodec { oname entryfield } {\ - set oldval [$entryfield get];\ - set decrease [expr $oldval*0.1];\ - if { $decrease<0.1 } { set decrease 0.1 };\ - $entryfield delete 0 end;\ - $entryfield insert insert [expr $oldval-$decrease];\ - eoapply $oname;\ -};\ -"; - -/* - * Local Variables: - * mode: C - * tab-width: 8 - * indent-tabs-mode: t - * c-file-style: "stroustrup" - * End: - * ex: shiftwidth=4 tabstop=8 - */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-10-05 04:43:00
|
Revision: 32840 http://brlcad.svn.sourceforge.net/brlcad/?rev=32840&view=rev Author: brlcad Date: 2008-10-05 04:42:10 +0000 (Sun, 05 Oct 2008) Log Message: ----------- remove the (apparently) unused icreateGui.h too Modified Paths: -------------- brlcad/trunk/src/mged/Makefile.am Removed Paths: ------------- brlcad/trunk/src/mged/icreateGui.h Modified: brlcad/trunk/src/mged/Makefile.am =================================================================== --- brlcad/trunk/src/mged/Makefile.am 2008-10-05 04:37:40 UTC (rev 32839) +++ brlcad/trunk/src/mged/Makefile.am 2008-10-05 04:42:10 UTC (rev 32840) @@ -168,7 +168,6 @@ comb_bool.h \ fbserv.h \ htmlLibraryUi.h \ - icreateGui.h \ joints.h \ menu.h \ mgdev.h \ Deleted: brlcad/trunk/src/mged/icreateGui.h =================================================================== --- brlcad/trunk/src/mged/icreateGui.h 2008-10-05 04:37:40 UTC (rev 32839) +++ brlcad/trunk/src/mged/icreateGui.h 2008-10-05 04:42:10 UTC (rev 32840) @@ -1,197 +0,0 @@ -/* I C R E A T E G U I . H - * BRL-CAD - * - * Copyright (c) 2004-2008 United States Government as represented by - * the U.S. Army Research Laboratory. - * - * This program 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 program 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 icreateGui.h - * - */ - -char *icreate_gui_str = "\ -set ic(winnum) 0;\ -set ic(default_type) \"\";\ -set ic(default_path) \"\";\ -set ic(default_indexvar) index;\ -set ic(default_operation) \"incr index\";\ -\ -proc icreate { id args } {\ - global ic;\ - global $ic(default_indexvar);\ - global player_screen;\ -\ - set w .ic$ic(winnum);\ - incr ic(winnum);\ -\ - if { [llength $args]>0 } {\ - set ic(default_type) [lindex $args 0];\ - };\ -\ - catch { destroy $w };\ - toplevel $w -screen $player_screen($id);\ - wm title $w \"Instance Creation\";\ -\ - frame $w.t;\ - frame $w.b;\ -\ - pack $w.t $w.b -side top -fill x -expand yes;\ -\ - frame $w.t.l;\ - frame $w.t.r;\ -\ - pack $w.t.l -side left -fill y;\ - pack $w.t.r -side left -fill x -expand yes;\ -\ - label $w.t.l.format -text \"Format of name\";\ - label $w.t.l.indexvar -text \"Index variable\";\ - label $w.t.l.index -text \"Index\";\ - label $w.t.l.oper -text \"Operation\";\ - label $w.t.l.type -text \"Prototype\";\ - label $w.t.l.comb -text \"Comb to add to\";\ - label $w.t.l.ref -text \"Reference path\" -relief raised -bd 1;\ - bind $w.t.l.ref <1> \"ic_reflist $w $id\";\ -\ - pack $w.t.l.format $w.t.l.indexvar $w.t.l.index $w.t.l.oper $w.t.l.type \ - $w.t.l.comb $w.t.l.ref -side top -fill y -expand yes -anchor w;\ -\ - set ic($w,format) \"my$ic(default_type).\$$ic(default_indexvar)\";\ - set ic($w,indexvar) $ic(default_indexvar);\ - if { [catch { set ic($w,index) [set $ic(default_indexvar)] }]!=0 } {\ - set ic($w,index) 1;\ - set $ic(default_indexvar) 1;\ - };\ - set ic($w,oper) $ic(default_operation);\ - set ic($w,type) $ic(default_type);\ - set ic($w,comb) \"\";\ - if { [catch { set ic($w,ref) [lindex [pathlist $ic($w,type)] 0] }] != 0 } {\ - set ic($w,ref) \"\";\ - };\ -\ - entry $w.t.r.format -relief sunken -width 16 -textvar ic($w,format);\ - entry $w.t.r.indexvar -relief sunken -width 16 -textvar ic($w,indexvar);\ - entry $w.t.r.index -relief sunken -width 16 -textvar ic($w,index);\ - entry $w.t.r.oper -relief sunken -width 16 -textvar ic($w,oper);\ - entry $w.t.r.type -relief sunken -width 16 -textvar ic($w,type);\ - entry $w.t.r.comb -relief sunken -width 16 -textvar ic($w,comb);\ - entry $w.t.r.ref -relief sunken -width 12 -textvar ic($w,ref);\ -\ - bind $w.t.r.indexvar <Key-Return> \"ic_newvar $w\";\ - bind $w.t.r.index <Key-Return> \"set \$ic($w,indexvar) \$ic($w,index)\";\ -\ - pack $w.t.r.format $w.t.r.indexvar $w.t.r.index $w.t.r.oper $w.t.r.type \ - $w.t.r.comb $w.t.r.ref -side top -fill x -expand yes;\ -\ - button $w.b.quit -text \"Quit\" -command \"ic_quit $w\";\ - button $w.b.create -text \"Create\" -command \"ic_create $w\";\ - pack $w.b.quit $w.b.create -side left -fill x -expand yes;\ -\ - button $w.accept -text \"Accept\" -state disabled -command \"ic_accept $w\";\ - pack $w.accept -side top -fill x -expand yes;\ -};\ -\ -proc ic_newvar { w } {\ - global ic;\ - global $ic($w,indexvar);\ -\ - if { [catch { set ic($w,index) [set $ic($w,indexvar)] }] != 0 } {\ - set ic($w,index) 1;\ - set $ic($w,indexvar) 1;\ - };\ -};\ -\ -proc ic_accept { w } {\ - $w.accept configure -state disabled;\ - $w.b.create configure -state normal;\ - press accept;\ -};\ -\ -proc ic_quit { w } {\ - global ic;\ - global $ic($w,indexvar);\ -\ - set $ic($w,indexvar) $ic($w,index);\ - set ic(default_indexvar) $ic($w,indexvar);\ - set ic(default_type) $ic($w,type);\ - set ic(default_oper) $ic($w,oper);\ -\ - destroy $w;\ -};\ -\ -proc ic_create { w } {\ - global ic;\ - global $ic($w,indexvar);\ -\ - set $ic($w,indexvar) $ic($w,index);\ -\ - # Perform the formatting of the \"name format\" supplied by the user\ - set name [eval list $ic($w,format)];\ -\ - # Perform the operation described by the \"index operation\" supplied by user\ - eval $ic($w,oper);\ -\ - set ic(default_indexvar) $ic($w,indexvar);\ - set ic(default_type) $ic($w,type);\ - set ic(default_oper) $ic($w,oper);\ -\ - g $name $ic($w,type);\ - if { $ic($w,comb)!=\"\" } {\ - i $ic($w,comb) $name;\ - };\ - e $ic($w,comb)/$name;\ - oed $ic($w,comb) $name$ic($w,ref);\ - press oxy;\ -\ - $w.accept configure -state normal;\ - $w.b.create configure -state disabled;\ -};\ -\ -proc ic_reflist { w id } {\ - global ic;\ - global player_screen;\ -\ - catch { destroy $w.ref };\ - if {[llength $ic($w,type)]==0} {\ - error \"Please enter a prototype first.\";\ - return;\ - };\ - \ - toplevel $w.ref -screen $player_screen($id);\ - wm title $w.ref \"Reference solid list\";\ -\ - listbox $w.ref.lbox;\ -\ - foreach solid [pathlist $ic($w,type)] {\ - $w.ref.lbox insert end $solid;\ - };\ -\ - bind $w.ref.lbox <Double-Button-1> \"set ic($w,ref) \[selection get\]\";\ -\ - button $w.ref.dismiss -text \"Dismiss\" -command \"destroy $w.ref\";\ -\ - pack $w.ref.lbox -side top -fill y -fill x -expand yes;\ - pack $w.ref.dismiss -side top -fill x;\ -};\ -"; - -/* - * Local Variables: - * mode: C - * tab-width: 8 - * indent-tabs-mode: t - * c-file-style: "stroustrup" - * End: - * ex: shiftwidth=4 tabstop=8 - */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-10-05 04:48:08
|
Revision: 32841 http://brlcad.svn.sourceforge.net/brlcad/?rev=32841&view=rev Author: brlcad Date: 2008-10-05 04:47:50 +0000 (Sun, 05 Oct 2008) Log Message: ----------- dm-sun is gone, so sunicon should die too Modified Paths: -------------- brlcad/trunk/src/mged/Makefile.am Removed Paths: ------------- brlcad/trunk/src/mged/sunicon.h Modified: brlcad/trunk/src/mged/Makefile.am =================================================================== --- brlcad/trunk/src/mged/Makefile.am 2008-10-05 04:42:10 UTC (rev 32840) +++ brlcad/trunk/src/mged/Makefile.am 2008-10-05 04:47:50 UTC (rev 32841) @@ -177,7 +177,6 @@ qray.h \ scroll.h \ sedit.h \ - sunicon.h \ titles.h \ vgdev.h \ vld_std.h \ Deleted: brlcad/trunk/src/mged/sunicon.h =================================================================== --- brlcad/trunk/src/mged/sunicon.h 2008-10-05 04:42:10 UTC (rev 32840) +++ brlcad/trunk/src/mged/sunicon.h 2008-10-05 04:47:50 UTC (rev 32841) @@ -1,69 +0,0 @@ -/* S U N I C O N . H - * BRL-CAD - * - * Copyright (c) 2004-2008 United States Government as represented by - * the U.S. Army Research Laboratory. - * - * This program 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 program 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 sunicon.h - * - */ - -/* MGED Icon for dm-sun.c */ - -/* Format_version=1, Width=64, Height=64, Depth=1, Valid_bits_per_item=16 - */ -0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x8002, 0x0000, 0x0000, 0x0001, - 0x8002, 0x0000, 0x0000, 0x0001, 0x8002, 0x0000, 0x0000, 0x0001, - 0x8002, 0x000C, 0x0000, 0x0001, 0xFFFE, 0x0032, 0x0000, 0x0001, - 0x8000, 0x006E, 0x0000, 0x0001, 0x8000, 0x00BF, 0x0000, 0x0001, - 0x8000, 0x01E5, 0x0000, 0x0001, 0x8000, 0x03C5, 0x0000, 0x0001, - 0x8000, 0x03C5, 0x8000, 0x0001, 0x8000, 0x02C7, 0x8000, 0x0001, - 0x8000, 0x0385, 0x0000, 0x0001, 0x8000, 0x0385, 0x0000, 0x0001, - 0x8000, 0x078F, 0x8000, 0x0001, 0x8000, 0x078E, 0xE000, 0x0001, - 0x8000, 0x078A, 0xC000, 0x0001, 0x8000, 0x039D, 0xA0C0, 0x0001, - 0x8000, 0x02BE, 0x23B8, 0x0001, 0x8000, 0x03FF, 0x2C86, 0x0001, - 0x8000, 0x02FF, 0xEB8E, 0x0001, 0x8000, 0x03E1, 0xFCF2, 0x0001, - 0x8000, 0x0F8C, 0x1FA2, 0x0001, 0x8000, 0x17CC, 0x0BFA, 0x0001, - 0x8000, 0x7B4C, 0x08FF, 0x0001, 0x8000, 0xA520, 0x093F, 0xE001, - 0x8003, 0x4520, 0x0E26, 0xFC01, 0x8005, 0x8520, 0x0F2C, 0x1F81, - 0x801A, 0x07E0, 0x00F0, 0x03E1, 0x806C, 0x08B0, 0x0000, 0x00E1, - 0x8090, 0x0890, 0x0000, 0x01C1, 0x8360, 0x0FE0, 0x0000, 0x0701, - 0x8680, 0x0000, 0x0000, 0x1E01, 0x87C0, 0x0000, 0x0000, 0x2801, - 0x8638, 0x0000, 0x0000, 0xF001, 0x81C7, 0x0000, 0x0001, 0x4001, - 0x8038, 0xE000, 0x0006, 0x8001, 0x8007, 0x1E00, 0x000B, 0x0001, - 0x8000, 0xE1C0, 0x0034, 0x0001, 0x8000, 0x1E38, 0x00D8, 0x0001, - 0x8000, 0x01C7, 0x0120, 0x0001, 0x8000, 0x0038, 0xE6C0, 0x0001, - 0x8000, 0x0007, 0x1900, 0x0001, 0x8000, 0x0000, 0xEE00, 0x0001, - 0x8000, 0x0000, 0x1800, 0x0001, 0x8000, 0x0000, 0x0000, 0x0001, - 0x8000, 0x0000, 0x0000, 0x0001, 0x8000, 0x108E, 0x3E70, 0x0001, - 0x8000, 0x1091, 0x2048, 0x0001, 0x8000, 0x1990, 0x2044, 0x0001, - 0x8000, 0x1990, 0x2044, 0x0001, 0x8000, 0x1693, 0x3C44, 0x0001, - 0x8000, 0x1691, 0x2044, 0x0001, 0x8000, 0x1091, 0x2044, 0x0001, - 0x8000, 0x1093, 0x2048, 0x0001, 0x8000, 0x108D, 0x3E70, 0x0001, - 0x8000, 0x0000, 0x0000, 0x0001, 0x8000, 0x0000, 0x0000, 0x0001, - 0x8000, 0x0000, 0x0000, 0x0001, 0x8000, 0x0000, 0x0000, 0x0001, - 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x8000, 0x0000, 0x0000, 0x0001, - 0x8000, 0x0000, 0x0000, 0x0001, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF - -/* - * Local Variables: - * mode: C - * tab-width: 8 - * indent-tabs-mode: t - * c-file-style: "stroustrup" - * End: - * ex: shiftwidth=4 tabstop=8 - */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-10-05 04:51:45
|
Revision: 32842 http://brlcad.svn.sourceforge.net/brlcad/?rev=32842&view=rev Author: brlcad Date: 2008-10-05 04:51:43 +0000 (Sun, 05 Oct 2008) Log Message: ----------- Our hats are off to you General Vector, sir. Thank you for all the fond memories and vectorish goodness. Modified Paths: -------------- brlcad/trunk/src/mged/Makefile.am Removed Paths: ------------- brlcad/trunk/src/mged/vgdev.h Modified: brlcad/trunk/src/mged/Makefile.am =================================================================== --- brlcad/trunk/src/mged/Makefile.am 2008-10-05 04:47:50 UTC (rev 32841) +++ brlcad/trunk/src/mged/Makefile.am 2008-10-05 04:51:43 UTC (rev 32842) @@ -178,7 +178,6 @@ scroll.h \ sedit.h \ titles.h \ - vgdev.h \ vld_std.h \ vmathUi.h Deleted: brlcad/trunk/src/mged/vgdev.h =================================================================== --- brlcad/trunk/src/mged/vgdev.h 2008-10-05 04:47:50 UTC (rev 32841) +++ brlcad/trunk/src/mged/vgdev.h 2008-10-05 04:51:43 UTC (rev 32842) @@ -1,193 +0,0 @@ -/* V G D E V . H - * BRL-CAD - * - * Copyright (c) 2004-2008 United States Government as represented by - * the U.S. Army Research Laboratory. - * - * This program 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 program 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 vgdev.h - * - */ - -/* SCCSID %W% %E% VAX version */ -/* - * V G D E V . H - * - * This file contains definitions for building displaylists for the VG, - * and will ordinarily be included in all user programs which use the VG. - * - * There is a companion file vgreg.h which contains defnitions for - * operating the UNIBUS interface to the VG. - * - * REVISION HISTORY: - * - * 06-Sep-83 DAG Created from /sys/vaxuba/vgdev.h with shorter - * symbols, etc. to aid portability - */ - -/* - * IOCTL definitions - */ -#define VGIOHALT 0x20007600 /* Halt display processor */ -#define VGIOSTART 0x80047601 /* Start display processor */ - -/* - * DISPLAY REGISTER DESIGNATIONS - */ -#define VGR_FS 000 /* Function switches unit 1 */ -#define VGR_LTH 000 /* Function sw lamps 0-7 */ -#define VGR_KBR 001 /* Keyboard character */ -#define VGR_LTL 001 /* Function sw lamps 8-15 */ -#define VGR_TIX 002 /* Tablet X input */ -#define VGR_T_PRESS 01 /* PRESS is detected */ -#define VGR_T_NEAR 02 /* NEAR is detected */ -#define VGR_TIY 003 /* Tablet Y input */ -#define VGR_PIR 004 /* Priority interrupt requests & name */ -#define VGR_MCR 005 /* Mode & control (incl. intr enables) */ -#define VGR_IR 006 /* Display instruction */ -#define VGR_WCR 007 /* Word count */ -#define VGR_XR 010 /* X coordinate */ -#define VGR_YR 011 /* Y coordinate */ -#define VGR_ZR 012 /* Z coordinate */ -#define VGR_AIR 013 /* Autoincrement */ -#define VGR_IOR 014 /* Intensity offset (dimming) */ -#define VGR_ISR 015 /* Intensity scale (depth cueing) */ -#define VGR_MAR 016 /* Memory fetch address */ -#define VGR_SPR 017 /* Stack pointer */ -#define VGR_TGR 020 /* Temp. general purpose */ -#define VGR_PSR 021 /* Picture scale */ -#define VGR_NMR 022 /* Name byte */ -#define VGR_CSR 023 /* Coordinate scale */ -#define VGR_DXR 024 /* Coordinate X displacement */ -#define VGR_DYR 025 /* Coordinate Y displacement */ -#define VGR_DZR 026 /* Coordinate Z displacement */ -#define VGR_R11R 027 -#define VGR_R12R 030 -#define VGR_R13R 031 -#define VGR_R21R 032 -#define VGR_R22R 033 -#define VGR_R23R 034 -#define VGR_R31R 035 -#define VGR_R32R 036 -#define VGR_R33R 037 -#define VGR_WMCR 040 /* Window mode control */ -#define VGR_PDXR 047 /* Picture X dislplacement */ -#define VGR_PDYR 050 /* Picture Y displacement */ -#define VGR_PIRX 056 /* Extended devices priority intr requests */ -#define VGR_MCRX 057 /* Extended devices interrupt enables */ -#define VGR_PENR 060 /* Pen hit resolution count */ -#define VGR_FS2 064 /* Function switches unit 2 */ -#define VGR_LT2H 064 /* 2nd lights unit */ - -#define VGR_PX 0100 /* Picture X coordinate */ -#define VGR_PY 0101 /* Picture Y coordinate */ -#define VGR_PZ 0102 /* Picture Z coordinate */ -#define VGR_JX 0103 /* Joystick X input */ -#define VGR_JY 0104 /* Joystick Y input */ -#define VGR_JZ 0105 /* Joystick Z input */ -#define VGR_DIAL 0106 /* Start of 1st dial box: (dial n = DIAL+n) */ -#define VGR_CXR 0120 /* Window acquisition X coordinate */ -#define VGR_CYR 0121 /* Window acquisition Y coordinate */ -#define VGR_CZR 0122 /* Window acquisition Z coordinate */ -#define VGR_JX2 0123 /* Joystick #2 X input */ -#define VGR_JY2 0124 /* Joystick #2 Y input */ -#define VGR_JZ2 0125 /* Joystick #2 Z input */ -#define VGR_CD11 0126 /* Start of second dial box */ -#define VGR_TBX 0140 /* Track ball X coordinate */ -#define VGR_TBY 0141 /* Track ball Y coordinate */ - -/* - * VG Instructions - */ -#define VGI_NOP 0 -#define VGI_SPC 020000 -#define VGI_CH 010017 -#define VGI_CHI 010016 -#define VGI_CH_BSWAP 004000 /* swap bytes in char data */ -#define VGI_CHS0 0x0040 /* character size 0: 120x60 */ -#define VGI_CHS1 0x0050 /* character size 1: 81x41 */ -#define VGI_CHS2 0x0060 /* character size 2: 60x30 */ -#define VGI_CHS3 0x0070 /* character size 3: 32x16 */ -#define VGI_CH_END 000024 /* Draw characters end marker (character) */ - -#define VGI_VA 010004 /* Vector Absolute */ -#define VGI_VR 010000 /* Vector relative display */ -#define VA_DOTDASH 000120 /* dash-dot line */ -#define VA_DOTTED 000040 /* dotted line */ -#define VA_DASH 000020 /* dashed line */ - -#define VGI_SHOW(pt, coord, op) ((pt)<<4|(coord)|(op)) /* Compose a vector */ -#define VGI_V_X 1 /* Vector Drawing: X coordinate */ -#define VGI_V_Y 2 -#define VGI_V_Z 3 -#define VGI_V_LOAD 00 /* Vector Drawing: Operation */ -#define VGI_V_DRAW 04 -#define VGI_V_MOVE 010 -#define VGI_V_DT 014 /* (originally VGI_V_DRAWT) */ -#define VGI_V_OPMASK ~014 - -/* Convert a float from [-1.0..+1.0] to a VG displaylist (<<4) coord. */ -#define VGI_V_CVT(x) ( (displaylist_t)((float)(x) * 32767.0) & 0xFFF0 ) - -#define VGI_LD 040000 -#define VGI_TERMINATE 000001 /* "Terminate" bit */ -#define VGI_LDS 044000 -#define VGI_STS 074000 -#define VGI_STSM 074200 -#define VGI_RTS 044016 /* Return from subroutine */ - -#define VGI_HALT 030000 /* Regular halt */ -#define VGI_RHALT 034000 /* Special refresh halt */ - -/* - * The following macro converts a byte address into - * the word address of the format required to load the MAR - * or stack pointer from inside the display list. - */ -#define BATODLA(b) ( (b)<<3 & 0xFFF0 | (b)>>12 & 0x000E ) -/* 3, not 4, to convert byte address to word addr */ - -/* - * Format of /dev/vgrs0 (buffered and signalled register device) - */ -struct vgregb { - short vg_fs1; /* Function Switch Unit 1 */ - short vg_fs2; /* Function Switch Unit 1 */ - short vg_tix; /* Tablet X input */ - short vg_tiy; /* Tablet Y input */ - short vg_jx; /* Joystick X input */ - short vg_jy; /* Joystick Y input */ - short vg_jz; /* Joystick Z input */ - short vg_d0; /* Dial 0 */ - short vg_d1; /* Dial 1 */ - short vg_d2; /* Dial 2 */ - short vg_d3; /* Dial 3 */ - short vg_d4; /* Dial 4 */ - short vg_d5; /* Dial 5 */ - short vg_d6; /* Dial 6 */ - short vg_d7; /* Dial 7 */ - short vg_d8; /* Dial 8 */ - short vg_d9; /* Dial 9 */ -}; - -/* - * Local Variables: - * mode: C - * tab-width: 8 - * indent-tabs-mode: t - * c-file-style: "stroustrup" - * End: - * ex: shiftwidth=4 tabstop=8 - */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-10-05 05:07:02
|
Revision: 32843 http://brlcad.svn.sourceforge.net/brlcad/?rev=32843&view=rev Author: brlcad Date: 2008-10-05 05:06:45 +0000 (Sun, 05 Oct 2008) Log Message: ----------- get rid of doug gwyn's rather unnecessary vld_std.h header wrappings for 'standard C programming definitions' Modified Paths: -------------- brlcad/trunk/src/mged/Makefile.am brlcad/trunk/src/mged/cad_boundp.c brlcad/trunk/src/mged/cad_parea.c Removed Paths: ------------- brlcad/trunk/src/mged/vld_std.h Modified: brlcad/trunk/src/mged/Makefile.am =================================================================== --- brlcad/trunk/src/mged/Makefile.am 2008-10-05 04:51:43 UTC (rev 32842) +++ brlcad/trunk/src/mged/Makefile.am 2008-10-05 05:06:45 UTC (rev 32843) @@ -178,7 +178,6 @@ scroll.h \ sedit.h \ titles.h \ - vld_std.h \ vmathUi.h man_MANS = \ Modified: brlcad/trunk/src/mged/cad_boundp.c =================================================================== --- brlcad/trunk/src/mged/cad_boundp.c 2008-10-05 04:51:43 UTC (rev 32842) +++ brlcad/trunk/src/mged/cad_boundp.c 2008-10-05 05:06:45 UTC (rev 32843) @@ -47,10 +47,9 @@ #include <stdarg.h> #include "bu.h" +#include "vmath.h" -#include "./vld_std.h" - typedef struct { /* The following are float instead of double, to save space: */ @@ -80,16 +79,16 @@ point *endpoint; /* -> endpt of ray from point */ } queue; /* entry in list of endpoints */ -static bool_t Build(void), Chop(void), EndPoint(register coords *p, register segment *segp), GetArgs(int argc, char **argv), Input(register segment *inp), +static int Build(void), Chop(void), EndPoint(register coords *p, register segment *segp), GetArgs(int argc, char **argv), Input(register segment *inp), Near(register coords *ap, register coords *bp), Search(void), Split(coords *p, register segment *oldp, register segment *listh), Usage(void); static coords *Intersect(register segment *a, register segment *b); static point *LookUp(register coords *coop), *NewPoint(register coords *coop), *PutList(register coords *coop); -static pointer Alloc(unsigned int size); +static void * Alloc(unsigned int size); static queue *Enqueue(register point *addp, register point *startp); -static void Output(register coords *coop), Toss(register pointer ptr); +static void Output(register coords *coop), Toss(register void * ptr); -static bool_t initial = true; /* false after first Output */ -static bool_t vflag = false; /* set if "-v" option found */ +static int initial = 1; /* false after first Output */ +static int vflag = 0; /* set if "-v" option found */ static double tolerance = 0.0; /* point matching slop */ static double tolsq = 0.0; /* `tolerance' ^ 2 */ static point *headp = NULL; /* head of list of points */ @@ -97,7 +96,7 @@ &seghead }; /* segment list head */ -static bool_t +static int Usage(void) /* print usage message */ { return @@ -126,14 +125,14 @@ } -static bool_t +static int GetArgs(int argc, char **argv) /* process command arguments */ /* argument count */ /* argument strings */ { - static bool_t iflag = false; /* set if "-i" option found */ - static bool_t oflag = false; /* set if "-o" option found */ - static bool_t tflag = false; /* set if "-t" option found */ + static int iflag = 0; /* set if "-i" option found */ + static int oflag = 0; /* set if "-o" option found */ + static int tflag = 0; /* set if "-t" option found */ int c; /* option letter */ #ifdef DEBUG @@ -146,7 +145,7 @@ if ( iflag ) return fprintf(stderr, "too many -i options" ); - iflag = true; + iflag = 1; if ( strcmp( bu_optarg, "-" ) != 0 && freopen( bu_optarg, "r", stdin ) == NULL @@ -159,7 +158,7 @@ if ( oflag ) return fprintf(stderr, "too many -o options" ); - oflag = true; + oflag = 1; if ( strcmp( bu_optarg, "-" ) != 0 && freopen( bu_optarg, "w", stdout ) == NULL @@ -172,7 +171,7 @@ if ( tflag ) return fprintf(stderr, "too many -t options" ); - tflag = true; + tflag = 1; if ( sscanf( bu_optarg, "%le", &tolerance ) != 1 ) return @@ -181,14 +180,14 @@ break; case 'v': - vflag = true; + vflag = 1; break; case '?': return Usage(); /* print usage message */ } - return true; + return 1; } @@ -199,7 +198,7 @@ process. It is also hard to do right; thus the elaborateness. */ -static bool_t +static int Chop(void) /* chop vectors into segments */ { segment *inp; /* -> input whole segment */ @@ -260,7 +259,7 @@ || ( !EndPoint( i, segp ) && !Split( i, segp, &seghead ) ) ) /* out of memory */ - return false; + return 0; break; /* next `segp' */ } @@ -299,13 +298,13 @@ pp->links = seghead.links; /* last-piece link */ seghead.links = piecehead.links; /* add pieces */ } - Toss( (pointer)inp ); /* unused segment at EOF */ + Toss( (void *)inp ); /* unused segment at EOF */ return inp != NULL; } -static bool_t +static int Split(coords *p, register segment *oldp, register segment *listh) /* split segment in two */ /* -> break point */ /* -> segment to be split */ @@ -321,18 +320,18 @@ ); #endif if ( (newp = (segment *)Alloc( (unsigned)sizeof(segment) )) == NULL ) - return false; /* out of heap space */ + return 0; /* out of heap space */ newp->links = listh->links; newp->sxy = *p; newp->exy = oldp->exy; oldp->exy = *p; /* old entry, new endpoint */ listh->links = newp; /* attach to list head */ - return true; + return 1; } -static bool_t +static int Build(void) /* build linked lists */ { register segment *listp; /* -> segment list entry */ @@ -343,7 +342,7 @@ #endif /* When we are finished, `seghead' will become invalid. */ for ( listp = seghead.links; listp != &seghead; - deadp = listp, listp = listp->links, Toss( (pointer)deadp ) + deadp = listp, listp = listp->links, Toss( (void *)deadp ) ) { register point *startp, *endp; /* -> segment endpts */ @@ -352,14 +351,14 @@ || Enqueue( startp, endp ) == NULL || Enqueue( endp, startp ) == NULL ) - return false; /* out of heap space */ + return 0; /* out of heap space */ } - return true; + return 1; } -static bool_t +static int Search(void) /* output bounding polygon */ { double from; /* backward edge direction */ @@ -370,7 +369,7 @@ fprintf(stderr, "\n\t\tSearch\n" ); #endif if ( headp == NULL ) - return true; /* trivial case */ + return 1; /* trivial case */ /* Locate the lowest point; this is the first polygon vertex. */ { @@ -407,13 +406,13 @@ if ( vflag && !initial ) Output( &first ); /* closure */ - return true; /* been here before => done */ + return 1; /* been here before => done */ } Output( ¤tp->xy ); /* found vertex */ if ( vflag && initial ) { - initial = false; + initial = 0; first = currentp->xy; /* save for closure */ } @@ -442,7 +441,7 @@ (endp->xy.y - currentp->xy.y), (double) (endp->xy.x - currentp->xy.x) - ) * DEGRAD; + ) * DEG2RAD; #ifdef DEBUG fprintf(stderr, "to %g", to ); #endif @@ -584,10 +583,10 @@ b->exy.x + tolerance /* b right */ || a->exy.x < /* a right */ b->sxy.x - tolerance /* b left */ - || Min( a->sxy.y, a->exy.y ) > /* a bottom */ - Max( b->sxy.y, b->exy.y ) + tolerance /* b top */ - || Max( a->sxy.y, a->exy.y ) < /* a top */ - Min( b->sxy.y, b->exy.y ) - tolerance /* b bottom */ + || FMIN( a->sxy.y, a->exy.y ) > /* a bottom */ + FMAX( b->sxy.y, b->exy.y ) + tolerance /* b top */ + || FMAX( a->sxy.y, a->exy.y ) < /* a top */ + FMIN( b->sxy.y, b->exy.y ) - tolerance /* b bottom */ ) { #ifdef DEBUG fprintf(stderr, "ranges don't intersect"); @@ -609,17 +608,17 @@ double t; /* test value for norm */ norm = 0.0; - if ( (t = Abs( xaeas )) > norm ) + if ( (t = fabs( xaeas )) > norm ) norm = t; - if ( (t = Abs( xbebs )) > norm ) + if ( (t = fabs( xbebs )) > norm ) norm = t; - if ( (t = Abs( yaeas )) > norm ) + if ( (t = fabs( yaeas )) > norm ) norm = t; - if ( (t = Abs( ybebs )) > norm ) + if ( (t = fabs( ybebs )) > norm ) norm = t; #define EPSILON 1.0e-06 /* relative `det' size thresh */ - if ( Abs( det ) <= EPSILON * norm * norm ) + if ( fabs( det ) <= EPSILON * norm * norm ) { #ifdef DEBUG fprintf(stderr, "parallel: det=%g, norm=%g", det, norm ); @@ -629,7 +628,7 @@ #undef EPSILON } { - /* `p' must be static; Intersect returns a pointer to it! */ + /* `p' must be static; Intersect returns a void * to it! */ static coords p; /* point of intersection */ double lambda, mu; /* segment parameters */ double onemmu; /* 1.0 - mu, for efficiency */ @@ -677,7 +676,7 @@ } -static bool_t +static int EndPoint(register coords *p, register segment *segp) /* check for segment endpoint */ /* -> point being tested */ /* -> segment */ @@ -694,7 +693,7 @@ } -static bool_t +static int Near(register coords *ap, register coords *bp) /* check if within tolerance */ /* -> points being checked */ { @@ -718,11 +717,11 @@ } -static pointer +static void * Alloc(unsigned int size) /* allocate storage from heap */ /* # bytes required */ { - register pointer ptr; /* -> allocated storage */ + register void * ptr; /* -> allocated storage */ if ( (ptr = malloc( size * sizeof(char) )) == NULL ) fprintf(stderr, "out of memory"); @@ -732,7 +731,7 @@ static void -Toss(register pointer ptr) /* return storage to heap */ +Toss(register void * ptr) /* return storage to heap */ /* -> allocated storage */ { if ( ptr != NULL ) @@ -740,7 +739,7 @@ } -static bool_t +static int Input(register segment *inp) /* input stroke record */ /* -> input segment */ { @@ -763,13 +762,13 @@ continue; /* skip color, comment, etc. */ if ( cvt == 4 ) - return true; /* successfully converted */ + return 1; /* successfully converted */ fprintf(stderr, "bad input: %s", inbuf); bu_exit( 5, NULL ); /* return false insufficient */ } - return false; /* EOF */ + return 0; /* EOF */ } Modified: brlcad/trunk/src/mged/cad_parea.c =================================================================== --- brlcad/trunk/src/mged/cad_parea.c 2008-10-05 04:51:43 UTC (rev 32842) +++ brlcad/trunk/src/mged/cad_parea.c 2008-10-05 05:06:45 UTC (rev 32843) @@ -33,16 +33,14 @@ #include "bu.h" -#include "./vld_std.h" - typedef struct { double x; /* X coordinate */ double y; /* Y coordinate */ } point; /* polygon vertex */ -static bool_t GetArgs(int argc, char **argv), Input(register point *coop); +static int GetArgs(int argc, char **argv), Input(register point *coop); static void Output(double result), Usage(void); @@ -62,7 +60,7 @@ point previous; /* previous point */ point current; /* current point */ point first; /* saved first point */ - register bool_t saved; /* "`first' valid" flag */ + register int saved; /* "`first' valid" flag */ double sum; /* accumulator */ if ( !GetArgs( argc, argv ) ) /* process command arguments */ @@ -71,7 +69,7 @@ return 1; } - saved = false; + saved = 0; sum = 0.0; while ( Input( ¤t ) ) @@ -81,7 +79,7 @@ { /* first input only */ first = current; - saved = true; + saved = 1; } else /* accumulate cross-product */ sum += previous.x * current.y - @@ -98,13 +96,13 @@ } -static bool_t +static int GetArgs(int argc, char **argv) /* process command arguments */ /* argument count */ /* argument strings */ { - static bool_t iflag = false; /* set if "-i" option found */ - static bool_t oflag = false; /* set if "-o" option found */ + static int iflag = 0; /* set if "-i" option found */ + static int oflag = 0; /* set if "-o" option found */ int c; /* option letter */ while ( (c = bu_getopt( argc, argv, "i:o:" )) != EOF ) @@ -116,9 +114,9 @@ (void)printf( "cad_parea: too many -i options\n" ); - return false; + return 0; } - iflag = true; + iflag = 1; if ( strcmp( bu_optarg, "-" ) != 0 && freopen( bu_optarg, "r", stdin ) == NULL @@ -127,7 +125,7 @@ "cad_parea: can't open \"%s\"\n", bu_optarg ); - return false; + return 0; } break; @@ -137,9 +135,9 @@ (void)printf( "cad_parea: too many -o options\n" ); - return false; + return 0; } - oflag = true; + oflag = 1; if ( strcmp( bu_optarg, "-" ) != 0 && freopen( bu_optarg, "w", stdout ) == NULL @@ -148,20 +146,20 @@ "cad_parea: can't create \"%s\"\n", bu_optarg ); - return false; + return 0; } break; case '?': Usage(); /* print usage message */ - return false; + return 0; } - return true; + return 1; } -static bool_t +static int Input(register point *coop) /* input a coordinate record */ /* -> input coordinates */ { @@ -178,7 +176,7 @@ continue; /* skip color, comment, etc. */ if ( cvt == 2 ) - return true; /* successfully converted */ + return 1; /* successfully converted */ (void)printf( "cad_parea: bad input:\n%s\n", inbuf ); @@ -186,7 +184,7 @@ bu_exit( 2, NULL ); /* return false insufficient */ } - return false; /* EOF */ + return 0; /* EOF */ } Deleted: brlcad/trunk/src/mged/vld_std.h =================================================================== --- brlcad/trunk/src/mged/vld_std.h 2008-10-05 04:51:43 UTC (rev 32842) +++ brlcad/trunk/src/mged/vld_std.h 2008-10-05 05:06:45 UTC (rev 32843) @@ -1,132 +0,0 @@ -/* V L D _ S T D . H - * BRL-CAD - * - * Copyright (c) 2004-2008 United States Government as represented by - * the U.S. Army Research Laboratory. - * - * This program 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 program 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 vld_std.h - std.h -- Douglas A. Gwyn's standard C programming definitions - - When installing a VLD/VMB software distribution, - this file may need to be tailored slightly to fit the target system. - Usually this just involves enabling some of the "kludges for deficient - C implementations" at the end of this file. -*/ - -#ifndef VLD_STD_H_ -#define VLD_STD_H_ /* once-only latch */ - -/* Extended data types */ - -typedef int bool_t; /* Boolean data */ -#define false 0 -#define true 1 - -typedef int bs_type; /* 3-way "bug/status" result type */ -#define bs_good 1 -#define bs_bad 0 -#define bs_ugly (-1) - -typedef void *pointer; /* generic pointer */ - - -/* Universal constants */ - -#define DEGRAD 57.2957795130823208767981548141051703324054724665642 -/* degrees per radian */ -#define E 2.71828182845904523536028747135266249775724709369996 -/* base of natural logs */ -#define GAMMA 0.57721566490153286061 -/* Euler's constant */ -#define LOG10E 0.43429448190325182765112891891660508229439700580367 -/* log of e to the base 10 */ -#define PHI 1.618033988749894848204586834365638117720309180 -/* golden ratio */ -#if !defined(PI) /* sometimes found in math.h */ -#define PI 3.14159265358979323846264338327950288419716939937511 -/* ratio of circumf. to diam. */ -#endif - -/* Useful macros */ - -/* - The comment "UNSAFE" means that the macro argument(s) may be evaluated - more than once, so the programmer must realize that the macro doesn't - quite act like a genuine function. This matters only when evaluating - an argument produces "side effects". -*/ - -/* arbitrary numerical arguments and value: */ -#define Abs( x ) ((x) < 0 ? -(x) : (x)) /* UNSAFE */ -#define Max( a, b ) ((a) > (b) ? (a) : (b)) /* UNSAFE */ -#define Min( a, b ) ((a) < (b) ? (a) : (b)) /* UNSAFE */ - -/* floating-point arguments and value: */ -#define Round( d ) floor( (d) + 0.5 ) /* requires <math.h> */ - -/* arbitrary numerical arguments, integer value: */ -#define Sgn( x ) ((x) == 0 ? 0 : (x) > 0 ? 1 : -1) /* UNSAFE */ - -/* string arguments, boolean value: */ -#ifdef gould /* UTX-32 2.0 compiler has problems with "..."[] */ -#define StrEq( a, b ) (strcmp( a, b ) == 0) /* UNSAFE */ -#else -#define StrEq( a, b ) (*(a) == *(b) && strcmp( a, b ) == 0) /* UNSAFE */ -#endif - -/* array argument, integer value: */ -#define Elements( a ) (sizeof a / sizeof a[0]) - -/* integer (or character) arguments and value: */ -#define fromhostc( c ) (c) /* map host char set to ASCII */ -#define tohostc( c ) (c) /* map ASCII to host char set */ -#define tonumber( c ) ((c) - '0') /* convt digit char to number */ -#define todigit( n ) ((n) + '0') /* convt digit number to char */ - -/* weird macros for special tricks with source code symbols: */ -#ifdef STD_C -#define PASTE( a, b ) a ## b -/* paste together two token strings */ -#define STRINGIZE( s ) # s -/* convert tokens to string literal */ -#else -/* Q8JOIN is for internal <std.h> use only: */ -#define Q8JOIN( s ) s -#define PASTE( a, b ) Q8JOIN(a)b -/* paste together two token strings */ -/* WARNING: This version of PASTE may expand its arguments - before pasting, unlike the Standard C version. */ -#define STRINGIZE( s ) "s" /* (Reiser cpp behavior assumed) */ - /* convert tokens to string literal */ -/* WARNING: This version of STRINGIZE does not properly handle " and - \ characters in character-constant and string-literal tokens. */ -#endif - -#if defined(sgi) && defined(mips) /* missing from <signal.h>: */ -extern void (*signal(int, void (*)(int)))(int); -#endif - -#endif /* VLD_STD_H_ */ - -/* - * Local Variables: - * mode: C - * tab-width: 8 - * indent-tabs-mode: t - * c-file-style: "stroustrup" - * End: - * ex: shiftwidth=4 tabstop=8 - */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-10-05 05:13:15
|
Revision: 32844 http://brlcad.svn.sourceforge.net/brlcad/?rev=32844&view=rev Author: brlcad Date: 2008-10-05 05:13:13 +0000 (Sun, 05 Oct 2008) Log Message: ----------- replicating most of the vmath interface in tcl doesn't sound so hot .. 'maybe' via C callbacks, but still.. ugh. Modified Paths: -------------- brlcad/trunk/src/mged/Makefile.am Removed Paths: ------------- brlcad/trunk/src/mged/vmathUi.h Modified: brlcad/trunk/src/mged/Makefile.am =================================================================== --- brlcad/trunk/src/mged/Makefile.am 2008-10-05 05:06:45 UTC (rev 32843) +++ brlcad/trunk/src/mged/Makefile.am 2008-10-05 05:13:13 UTC (rev 32844) @@ -177,8 +177,7 @@ qray.h \ scroll.h \ sedit.h \ - titles.h \ - vmathUi.h + titles.h man_MANS = \ cad_boundp.1 \ Deleted: brlcad/trunk/src/mged/vmathUi.h =================================================================== --- brlcad/trunk/src/mged/vmathUi.h 2008-10-05 05:06:45 UTC (rev 32843) +++ brlcad/trunk/src/mged/vmathUi.h 2008-10-05 05:13:13 UTC (rev 32844) @@ -1,736 +0,0 @@ -/* V M A T H U I . H - * BRL-CAD - * - * Copyright (c) 2004-2008 United States Government as represented by - * the U.S. Army Research Laboratory. - * - * This program 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 program 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 vmathUi.h - * - */ - -char *vmath_ui_str = "\ -set M_E 2.7182818284590452354;\ -set M_LOG2E 1.4426950408889634074;\ -set M_LOG10E 0.43429448190325182765;\ -set M_LN2 0.69314718055994530942;\ -set M_LN10 2.30258509299404568402;\ -set M_PI 3.14159265358979323846;\ -set M_PI_2 1.57079632679489661923;\ -set M_PI_4 0.78539816339744830962;\ -set M_1_PI 0.31830988618379067154;\ -set M_2_PI 0.63661977236758134308;\ -set M_2_SQRTPI 1.12837916709551257390;\ -set M_SQRT2 1.41421356237309504880;\ -set M_SQRT1_2 0.70710678118654752440;\ -\ -proc near_zero { val epsilon } {\ - return [expr abs([lindex $val 0])<$epsilon && \ - abs([lindex $val 1])<$epsilon && \ - abs([lindex $val 2])<$epsilon];\ -};\ -\ -proc dist_pt_plane { pt plane } {\ - return [expr [vdot $pt $plane]-[lindex $plane 3]];\ -};\ -\ -proc dist_pt_pt { a b } {\ - return [magnitude [vsub2 $a $b]];\ -};\ -\ -proc mat_deltas { m } {\ - return [list [lindex $m 3] [lindex $m 7] [lindex $m 11]];\ -};\ -\ -proc mat_zero { } {\ - return { 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 };\ -};\ -\ -proc mat_idn { } {\ - return { 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 };\ -};\ -\ -proc vreverse { v } {\ - return [list [expr -1.0*[lindex $v 0]] \ - [expr -1.0*[lindex $v 1]] \ - [expr -1.0*[lindex $v 2]]];\ -};\ -\ -proc hreverse { h } {\ - return [list [expr -1.0*[lindex $h 0]] \ - [expr -1.0*[lindex $h 1]] \ - [expr -1.0*[lindex $h 2]] \ - [expr -1.0*[lindex $h 3]]];\ -};\ -\ -proc vadd2 { u v } {\ - return [list [expr [lindex $u 0]+[lindex $v 0]] \ - [expr [lindex $u 1]+[lindex $v 1]] \ - [expr [lindex $u 2]+[lindex $v 2]]];\ -};\ -\ -proc vsub2 { u v } {\ - return [list [expr [lindex $u 0]-[lindex $v 0]] \ - [expr [lindex $u 1]-[lindex $v 1]] \ - [expr [lindex $u 2]-[lindex $v 2]]];\ -};\ -\ -proc hadd2 { g h } {\ - return [list [expr [lindex $g 0]+[lindex $h 0]] \ - [expr [lindex $g 1]+[lindex $h 1]] \ - [expr [lindex $g 2]+[lindex $h 2]] \ - [expr [lindex $g 3]+[lindex $h 3]]];\ -};\ -\ -proc hsub2 { g h } {\ - return [list [expr [lindex $g 0]-[lindex $h 0]] \ - [expr [lindex $g 1]-[lindex $h 1]] \ - [expr [lindex $g 2]-[lindex $h 2]] \ - [expr [lindex $g 3]-[lindex $h 3]]];\ -};\ -\ -proc vadd3 { u v w } {\ - return [vadd2 $u [vadd2 $v $w]];\ -};\ -\ -proc vsub3 { u v w } {\ - return [vsub2 $u [vadd2 $v $w]];\ -};\ -\ -proc vadd4 { u v w x } {\ - return [vadd2 $u [vadd3 $v $w $x]];\ -};\ -\ -proc vsub4 { u v w x } {\ - return [vsub2 $u [vadd3 $v $w $x]];\ -};\ -\ -proc vadd args {\ - if { [llength $args]==0 } then {\ - return \"0 0 0\";\ - } else {\ - return [vadd2 [lindex $args 0] \ - [eval vadd [lrange $args 1 end]]];\ - };\ -};\ -\ -proc hadd args {\ - if { [llength $args]==0 } then {\ - return \"0 0 0 0\";\ - } else {\ - return [hadd2 [lindex $args 0] \ - [eval hadd [lrange $args 1 end]]];\ - };\ -};\ -\ -proc vsub args {\ - if { [llength $args]==0 } then {\ - return \"0 0 0\";\ - } else {\ - return [vsub2 [lindex $args 0] \ - [eval vadd [lrange $args 1 end]]];\ - };\ -};\ -\ -proc hsub args {\ - if { [llength $args]==0 } then {\ - return \"0 0 0 0\";\ - } else {\ - return [hsub2 [lindex $args 0] \ - [eval hadd [lrange $args 1 end]]];\ - };\ -};\ -\ -proc v2add2 { x y } {\ - return [list [expr [lindex $x 0]+[lindex $y 0]] \ - [expr [lindex $x 1]+[lindex $y 1]]];\ -};\ -\ -proc v2sub2 { x y } {\ - return [list [expr [lindex $x 0]-[lindex $y 0]] \ - [expr [lindex $x 1]-[lindex $y 1]]];\ -};\ -\ -proc v2add args {\ - if { [llength $args]==0 } then {\ - return \"0 0\";\ - } else {\ - return [v2add2 [lindex $args 0] \ - [eval vadd [lrange $args 1 end]]];\ - };\ -};\ -\ -proc v2sub args {\ - if { [llength $args]==0 } then {\ - return \"0 0\";\ - } else {\ - return [v2sub2 [lindex $args 0] \ - [eval v2add [lrange $args 1 end]]];\ - };\ -};\ -\ -proc vscale { v c } {\ - if { [llength $v] > 2 } then {\ - return [list [expr [lindex $v 0]*$c] \ - [expr [lindex $v 1]*$c] \ - [expr [lindex $v 2]*$c]];\ - } else {\ - return [list [expr [lindex $c 0]*$v] \ - [expr [lindex $c 0]*$v] \ - [expr [lindex $c 0]*$v]];\ - };\ -};\ -\ -proc hscale { h c } {\ - if { [llength $h] > 3 } then {\ - return [list [expr [lindex $h 0]*$c] \ - [expr [lindex $h 1]*$c] \ - [expr [lindex $h 2]*$c] \ - [expr [lindex $h 3]*$c]];\ - } else {\ - return [list [expr [lindex $c 0]*$h] \ - [expr [lindex $c 1]*$h] \ - [expr [lindex $c 2]*$h] \ - [expr [lindex $c 3]*$h]];\ - };\ -};\ -\ -proc v2scale { x c } {\ - if { [llength $x] > 1 } then {\ - return [list [expr [lindex $x 0]*$c] \ - [expr [lindex $x 1]*$c]];\ - } else {\ - return [list [expr [lindex $c 0]*$x] \ - [expr [lindex $c 0]*$x]];\ - };\ -};\ - \ -proc vadd2scale { a b s } {\ - return [vscale [vadd2 $a $b] $s];\ -};\ -\ -proc vsub2scale { a b s } {\ - return [vscale [vsub2 $a $b] $s];\ -};\ -\ -proc vcomb2 { a b c d } {\ - return [vadd2 [vscale $b $a] [vscale $d $c]];\ -};\ -\ -proc vcomb3 { a b c d e f } {\ - return [vadd3 [vscale $b $a] [vscale $d $c] [vscale $f $e]];\ -};\ -\ -proc vjoin1 { b c d } {\ - return [vcomb2 1 $b $c $d];\ -};\ -\ -proc vjoin2 { b c d e f } {\ - return [vcomb3 1 $b $c $d $e $f];\ -};\ -\ -proc vjoin3 { b c d e f g h } {\ - return [vadd2 $b [vcomb3 $c $d $e $f $g $h]];\ -};\ -\ -proc vjoin4 { b c d e f g h i j } {\ - return [vadd3 $b [vcomb3 $c $d $e $f $g $h] [vscale $j $i]];\ -};\ -\ -\ -proc hjoin1 { b c d } {\ - return [hadd2 $b [hscale $d $c]];\ -};\ -\ -proc v2join1 { b c d } {\ - return [v2add2 $b [v2scale $d $c]];\ -};\ -\ -proc vblend2 { b c d e } {\ - return [vcomb2 $c $b $e $d];\ -};\ -\ -proc vunitize { v } {\ - return [vscale $v [expr 1.0/[magnitude $v]]];\ -};\ -\ -proc magsq { v } {\ - return [vdot $v $v];\ -};\ -\ -proc vmagsq { v } {\ - return [magsq $v];\ -};\ -\ -proc magnitude { v } {\ - return [expr sqrt([vmagsq $v])];\ -};\ -\ -proc vmagnitude { v } {\ - return [magnitude $v];\ -};\ -\ -proc vcross { u v } {\ - return [list [expr [lindex $u 1]*[lindex $v 2]-[lindex $u 2]*[lindex $v 1]] \ - [expr [lindex $u 2]*[lindex $v 0]-[lindex $u 0]*[lindex $v 2]] \ - [expr [lindex $u 0]*[lindex $v 1]-[lindex $u 1]*[lindex $v 0]]];\ -};\ -\ -proc vdot { u v } {\ - return [expr [lindex $u 0]*[lindex $v 0] + \ - [lindex $u 1]*[lindex $v 1] + \ - [lindex $u 2]*[lindex $v 2]];\ -};\ -\ -proc hdot { g h } {\ - return [expr [lindex $g 0]*[lindex $h 0] + \ - [lindex $g 1]*[lindex $h 1] + \ - [lindex $g 2]*[lindex $h 2] + \ - [lindex $g 3]*[lindex $h 3]];\ -};\ -\ -proc v2dot { x y } {\ - return [expr [lindex $x 0]*[lindex $y 0] + [lindex $x 1]*[lindex $y 1]];\ -};\ -\ -proc vsub2dot { p2 p1 v } {\ - return [vdot [vsub2 $p2 $p1] $v];\ -};\ -\ -proc velmul { u v } {\ - return [list [expr [lindex $u 0]*[lindex $v 0]] \ - [expr [lindex $u 1]*[lindex $v 1]] \ - [expr [lindex $u 2]*[lindex $v 2]]];\ -};\ -\ -proc veldiv { u v } {\ - return [list [expr [lindex $u 0]*1.0/[lindex $v 0]] \ - [expr [lindex $u 1]*1.0/[lindex $v 1]] \ - [expr [lindex $u 2]*1.0/[lindex $v 2]]];\ -};\ -\ -proc vinvdir { v } {\ - return [veldiv { 1 1 1 } $v];\ -};\ -\ -proc mat3x3vec { m v } {\ - return [list [vdot [lrange $m 0 2] $v] \ - [vdot [lrange $m 4 6] $v] \ - [vdot [lrange $m 8 10] $v]];\ -};\ -\ -proc vec3x3mat { v m } {\ - return [list [vdot [list [lindex $m 0] [lindex $m 4] [lindex $m 8]] $v] \ - [vdot [list [lindex $m 1] [lindex $m 5] [lindex $m 9]] $v] \ - [vdot [list [lindex $m 2] [lindex $m 6] [lindex $m 10]] $v]];\ -};\ -\ -proc mat3x2vec { m v } {\ - return [list [v2dot [lrange $m 0 1] $v] \ - [v2dot [lrange $m 4 5] $v] \ - [v2dot [lrange $m 8 9] $v]];\ -};\ -\ -proc vec2x3mat { v m } {\ - return [list [v2dot [list [lindex $m 0] [lindex $m 4]] $v] \ - [v2dot [list [lindex $m 1] [lindex $m 5]] $v] \ - [v2dot [list [lindex $m 2] [lindex $m 6]] $v]];\ -};\ -\ -proc mat4x3pnt { m p } {\ - set f [expr 1.0/([vdot [lrange $m 12 14] $p]+[lindex $m 15])];\ - return [list [expr ([lindex $m 0]*[lindex $p 0] + \ - [lindex $m 1]*[lindex $p 1] + \ - [lindex $m 2]*[lindex $p 2] + [lindex $m 3])*$f] \ - [expr ([lindex $m 4]*[lindex $p 0] + \ - [lindex $m 5]*[lindex $p 1] + \ - [lindex $m 6]*[lindex $p 2] + [lindex $m 7])*$f] \ - [expr ([lindex $m 8]*[lindex $p 0] + \ - [lindex $m 9]*[lindex $p 1] + \ - [lindex $m 10]*[lindex $p 2] + [lindex $m 11])*$f]];\ -};\ -\ -proc pnt3x4mat { p m } {\ - set f [vdot [list [lindex $m 3] [lindex $m 7] [lindex $m 14]] $p];\ - set f [expr 1.0/($f+[lindex $m 15])];\ - return [list [expr ([lindex $m 0]*[lindex $p 0] + \ - [lindex $m 4]*[lindex $p 1] + \ - [lindex $m 8]*[lindex $p 2] + [lindex $m 12])*$f] \ - [expr ([lindex $m 1]*[lindex $p 0] + \ - [lindex $m 5]*[lindex $p 1] + \ - [lindex $m 9]*[lindex $p 2] + [lindex $m 13])*$f] \ - [expr ([lindex $m 2]*[lindex $p 0] + \ - [lindex $m 6]*[lindex $p 1] + \ - [lindex $m 10]*[lindex $p 2] + [lindex $m 14])*$f]];\ -};\ -\ -proc mat4x4pnt { m h } {\ - return [list [hdot [lrange $m 0 3] $h] \ - [hdot [lrange $m 4 7] $h] \ - [hdot [lrange $m 8 11] $h] \ - [hdot [lrange $m 12 15] $h]];\ -};\ -\ -proc mat4x3vec { m v } {\ - set f [expr 1.0/[lindex $m 15]];\ - return [list [expr [vdot [lrange $m 0 2] $v]*$f] \ - [expr [vdot [lrange $m 4 6] $v]*$f] \ - [expr [vdot [lrange $m 8 10] $v]*$f]];\ -};\ -\ -proc vec3x4mat { v m } {\ - set f [expr 1.0/[lindex $m 15]];\ - return [list [expr [vdot [list [lindex $m 0] [lindex $m 4] [lindex $m 8]] \ - $v]*$f] \ - [expr [vdot [list [lindex $m 1] [lindex $m 5] [lindex $m 9]] \ - $v]*$f] \ - [expr [vdot [list [lindex $m 2] [lindex $m 6] [lindex $m 10]]\ - $v]*$f]];\ -};\ -"; - -char *vmath_ui_str2 = "\ -proc vec2x4mat { v m } {\ - set f [expr 1.0/[lindex $m 15]];\ - return [list [expr [lindex $m 0]*[lindex $v 0]+[lindex $m 4]*[lindex $v 1]] \ - [expr [lindex $m 1]*[lindex $v 0]+[lindex $m 5]*[lindex $v 1]] \ - [expr [lindex $m 2]*[lindex $v 0]+[lindex $m 6]*[lindex $v 1]]];\ -};\ -\ -proc vequal { u v } {\ - return [expr [lindex $u 0]==[lindex $v 0] && \ - [lindex $u 1]==[lindex $v 1] && \ - [lindex $u 2]==[lindex $v 2]];\ -};\ -\ -proc vapproxequal { u v tol } {\ - return [near_zero [vsub $u $v] $tol];\ -};\ -\ -proc vnear_zero { v tol } {\ - return [vapproxequal { 0 0 0 } $v $tol];\ -};\ -\ -proc vmin { u v } {\ - set result \"\";\ - if { [lindex $u 0]<[lindex $v 0] } then {\ - lappend result [lindex $u 0];\ - } else {\ - lappend result [lindex $v 0];\ - };\ - if { [lindex $u 1]<[lindex $v 1] } then {\ - lappend result [lindex $u 1];\ - } else {\ - lappend result [lindex $v 1];\ - };\ - if { [lindex $u 2]<[lindex $v 2] } then {\ - lappend result [lindex $u 2];\ - } else {\ - lappend result [lindex $v 2];\ - };\ -\ - return $result;\ -};\ -\ -proc vmax { u v } {\ - set result \"\";\ - if { [lindex $u 0]>[lindex $v 0] } then {\ - lappend result [lindex $u 0];\ - } else {\ - lappend result [lindex $v 0];\ - };\ - if { [lindex $u 1]>[lindex $v 1] } then {\ - lappend result [lindex $u 1];\ - } else {\ - lappend result [lindex $v 1];\ - };\ - if { [lindex $u 2]>[lindex $v 2] } then {\ - lappend result [lindex $u 2];\ - } else {\ - lappend result [lindex $v 2];\ - };\ -\ - return $result;\ -};\ -\ -proc hdivide { h } {\ - return [vscale [lrange $h 0 2] [expr 1.0/[lindex $h 3]]];\ -};\ -\ -proc qadd2 { q r } {\ - return [hadd2 $q $r];\ -};\ -\ -proc qsub2 { q r } {\ - return [hsub2 $q $r];\ -};\ -\ -proc qadd args {\ - return [eval hadd $args];\ -};\ -\ -proc qsub args {\ - return [eval hsub $args];\ -};\ -\ -proc qscale { q c } {\ - return [hscale $q $c];\ -};\ -\ -proc qdot { q r } {\ - return [hdot $q $r];\ -};\ -\ -proc qmagsq { q } {\ - return [qdot $q $q];\ -};\ -\ -proc qmagnitude { q } {\ - return [expr sqrt([qmagsq $q])];\ -};\ -\ -proc qunitize { q } {\ - return [qscale $q [expr 1.0/[qmagnitude $q]]];\ -};\ -\ -proc qmul { q r } {\ - return [list [expr +[lindex $q 0]*[lindex $r 3] \ - +[lindex $q 1]*[lindex $r 2] \ - -[lindex $q 2]*[lindex $r 1] \ - +[lindex $q 3]*[lindex $r 0]] \ - [expr -[lindex $q 0]*[lindex $r 2] \ - +[lindex $q 1]*[lindex $r 3] \ - +[lindex $q 2]*[lindex $r 0] \ - +[lindex $q 3]*[lindex $r 1]] \ - [expr +[lindex $q 0]*[lindex $r 1] \ - -[lindex $q 1]*[lindex $r 0] \ - +[lindex $q 2]*[lindex $r 3] \ - +[lindex $q 3]*[lindex $r 2]] \ - [expr -[lindex $q 0]*[lindex $r 0] \ - -[lindex $q 1]*[lindex $r 1] \ - -[lindex $q 2]*[lindex $r 2] \ - +[lindex $q 3]*[lindex $r 3]]];\ -};\ -\ -proc qconjugate { q } {\ - return [concat [vreverse [lrange $q 0 2]] [lindex $q 3]];\ -};\ -\ -proc qinverse { q } {\ - return [qscale [qconjugate $q] [expr 1.0/[qmagsq $q]]];\ -};\ -\ -proc qblend2 { b c d e } {\ - return [qadd2 [qscale $c $b] [qscale $e $d]];\ -};\ -\ -proc v3rpp_overlap { l1 h1 l2 h2 } {\ - return [expr !([lindex $l1 0]>[lindex $h2 0] || \ - [lindex $l1 1]>[lindex $h2 1] || \ - [lindex $l1 2]>[lindex $h2 2] || \ - [lindex $l2 0]>[lindex $h1 0] || \ - [lindex $l2 1]>[lindex $h1 1] || \ - [lindex $l2 2]>[lindex $h1 2])];\ -};\ -\ -proc v3rpp_overlap_tol { l1 h1 l2 h2 toldist } {\ - return [expr !([lindex $l1 0]>([lindex $h2 0]+$toldist) || \ - [lindex $l1 1]>([lindex $h2 1]+$toldist) || \ - [lindex $l1 2]>([lindex $h2 2]+$toldist) || \ - [lindex $l2 0]>([lindex $h1 0]+$toldist) || \ - [lindex $l2 1]>([lindex $h1 1]+$toldist) || \ - [lindex $l2 2]>([lindex $h1 2]+$toldist))];\ -};\ -\ -proc v3pt_in_rpp { pt lo hi } {\ - return [expr [lindex $pt 0]>=[lindex $lo 0] && \ - [lindex $pt 0]<=[lindex $hi 0] && \ - [lindex $pt 1]>=[lindex $lo 1] && \ - [lindex $pt 1]<=[lindex $hi 1] && \ - [lindex $pt 2]>=[lindex $lo 2] && \ - [lindex $pt 2]<=[lindex $hi 2]];\ -};\ -\ -proc v3pt_in_rpp_tol { pt lo hi toldist } {\ - return [expr [lindex $pt 0]>=([lindex $lo 0]-$toldist) && \ - [lindex $pt 0]<=([lindex $hi 0]+$toldist) && \ - [lindex $pt 1]>=([lindex $lo 1]-$toldist) && \ - [lindex $pt 1]<=([lindex $hi 1]+$toldist) && \ - [lindex $pt 2]>=([lindex $lo 2]-$toldist) && \ - [lindex $pt 2]<=([lindex $hi 2]+$toldist)];\ -};\ -\ -proc v3rpp1_in_rpp2 { lo1 hi1 lo2 hi2 } {\ - return [expr [lindex $lo1 0]>=[lindex $lo2 0] && \ - [lindex $hi1 0]<=[lindex $hi2 0] && \ - [lindex $lo1 1]>=[lindex $lo2 1] && \ - [lindex $hi1 1]<=[lindex $hi2 1] && \ - [lindex $lo1 2]>=[lindex $lo2 2] && \ - [lindex $hi1 2]<=[lindex $hi2 2]];\ -};\ -\ -\ -\ -proc mat_deltas { m x y z } {\ - return [ list [lindex $m 0]\ - [lindex $m 1]\ - [lindex $m 2]\ - $x \ - [lindex $m 4]\ - [lindex $m 5]\ - [lindex $m 6]\ - $y \ - [lindex $m 8]\ - [lindex $m 9]\ - [lindex $m 10]\ - $z \ - [lindex $m 12]\ - [lindex $m 13]\ - [lindex $m 14]\ - [lindex $m 15]];\ -};\ -\ -proc mat_deltas_vec { m v } {\ - return [ mat_deltas $m [lindex $v 0]\ - [lindex $v 1]\ - [lindex $v 2]];\ -};\ -\ -proc mag2sq { v } {\ - return [expr [lindex $v 0]*[lindex $v 0] + \ - [lindex $v 1]*[lindex $v 1]];\ -};\ -\ -proc vminmax { min max pt } {\ - return [list [vmin $min $pt] [vmax $max $pt]];\ -};\ -\ -\ -proc vadd2n { u v n } {\ - set i 0;\ - while { $i < $n} {\ - lappend retlist [expr [lindex $u $i]+[lindex $v $i]];\ - incr i;\ - };\ - return $retlist;\ -};\ -\ -proc vsub2n { u v n } {\ - set i 0;\ - while { $i < $n} {\ - lappend retlist [expr [lindex $u $i]-[lindex $v $i]];\ - incr i;\ - };\ - return $retlist;\ -};\ -\ -proc vadd3n { u v w n } {\ - return [vadd2n $u [vadd2n $v $w $n] $n];\ -};\ -\ -proc vsub3n { u v w n } {\ - return [vsub2n $u [vadd3n $v $w $n] $n];\ -};\ -proc vadd4n { u v w x n } {\ - return [vadd2n $u [vadd3n $v $w $x $n] $n];\ -};\ -\ -proc vsub4n { u v w x n } {\ - return [vsub2n $u [vadd3n $v $w $x $n] $n];\ -};\ -\ -proc vzeron { n } {\ - set i 0;\ - while {$i < $n} {\ - lappend retlist 0;\ - incr i;\ - };\ - return $retlist;\ -};\ -\ -proc vaddn args {\ - set cur_length [llength $args];\ - if { $cur_length==1 } then {\ - return [vzeron [lindex $args 0]];\ - } else {\ - return [vadd2n [lindex $args 0] \ - [eval vaddn [lrange $args 1 end]] \ - [lindex $args [expr $cur_length-1]]];\ - };\ -};\ - \ -proc vsubn args {\ - set cur_length [llength $args];\ - if { $cur_length==1 } then {\ - return [vzeron [lindex $args 0]];\ - } else {\ - return [vsub2n [lindex $args 0] \ - [eval vaddn [lrange $args 1 end]] \ - [lindex $args [expr $cur_length-1]]];\ - };\ -};\ - \ -\ -proc vscalen { v c n } {\ - set i 0;\ - while { $i < $n } {\ - lappend retlist [expr [lindex $v $i]*$c];\ - incr i;\ - };\ - return $retlist;\ -};\ -\ -proc vadd2scalen { a b s n } {\ - return [vscalen [vadd2n $a $b $n] $s $n];\ -};\ -\ -proc vsub2scalen { a b s n } {\ - return [vscalen [vsub2n $a $b $n] $s $n];\ -};\ -\ -proc vcomb2n { a b c d n } {\ - return [vadd2n [vscalen $b $a $n] [vscale $d $c $n] $n];\ -};\ -\ -proc vcomb3n { a b c d e f n } {\ - return [vadd3n [vscalen $b $a $n] [vscale $d $c $n] [vscale $f $e $n] $n];\ -};\ -\ -proc vjoin1n { b c d n } {\ - return [vcomb2n 1 $b $c $d $n];\ -};\ -\ -proc vjoin2n { b c d e f n } {\ - return [vcomb3n 1 $b $c $d $e $f $n];\ -};\ -\ -proc vjoin3n { b c d e f g h n } {\ - return [vadd2n $b [vcomb3n $c $d $e $f $g $h $n] $n];\ -};\ -\ -proc vblend2n { b c d e n } {\ - return [vcomb2n $c $b $e $d $n];\ -};\ -"; - -/* - * Local Variables: - * mode: C - * tab-width: 8 - * indent-tabs-mode: t - * c-file-style: "stroustrup" - * End: - * ex: shiftwidth=4 tabstop=8 - */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-10-05 05:18:32
|
Revision: 32846 http://brlcad.svn.sourceforge.net/brlcad/?rev=32846&view=rev Author: brlcad Date: 2008-10-05 05:18:11 +0000 (Sun, 05 Oct 2008) Log Message: ----------- remove arb.c since the sole routine it provides is unused and doesn't really belong in here anyways. Modified Paths: -------------- brlcad/trunk/src/mged/Makefile.am Removed Paths: ------------- brlcad/trunk/src/mged/arb.c Modified: brlcad/trunk/src/mged/Makefile.am =================================================================== --- brlcad/trunk/src/mged/Makefile.am 2008-10-05 05:14:35 UTC (rev 32845) +++ brlcad/trunk/src/mged/Makefile.am 2008-10-05 05:18:11 UTC (rev 32846) @@ -190,7 +190,6 @@ EXTRA_DIST = \ $(man_MANS) \ - arb.c \ bool_rewrite.c \ comb_bool_parse.y \ comb_bool_scan.l \ Deleted: brlcad/trunk/src/mged/arb.c =================================================================== --- brlcad/trunk/src/mged/arb.c 2008-10-05 05:14:35 UTC (rev 32845) +++ brlcad/trunk/src/mged/arb.c 2008-10-05 05:18:11 UTC (rev 32846) @@ -1,78 +0,0 @@ -/* A R B . C - * BRL-CAD - * - * Copyright (c) 1985-2008 United States Government as represented by - * the U.S. Army Research Laboratory. - * - * This program 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 program 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 arb.c - * - */ - -#include "common.h" - -#include <stdio.h> -#include <math.h> - -#include "bio.h" -#include "vmath.h" -#include "db.h" -#include "raytrace.h" -#include "./mged.h" - -void -dbpr_arb(struct solidrec *sp, register struct directory *dp) -{ - int i; - char *s; - - if ( (i=sp->s_cgtype) < 0 ) - i = -i; - switch ( i ) { - case ARB4: - s="ARB4"; - break; - case ARB5: - s="ARB5"; - break; - case RAW: - case ARB6: - s="ARB6"; - break; - case ARB7: - s="ARB7"; - break; - case ARB8: - s="ARB8"; - break; - default: - s="??"; - break; - } - - bu_log("%s: ARB8 (%s)\n", dp->d_namep, s ); - - /* more in edsol.c/pr_solid, called from do_list */ -} - -/* - * Local Variables: - * mode: C - * tab-width: 8 - * indent-tabs-mode: t - * c-file-style: "stroustrup" - * End: - * ex: shiftwidth=4 tabstop=8 - */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2008-11-19 18:58:02
|
Revision: 33212 http://brlcad.svn.sourceforge.net/brlcad/?rev=33212&view=rev Author: starseeker Date: 2008-11-19 18:57:59 +0000 (Wed, 19 Nov 2008) Log Message: ----------- Starting on hyp editing support in MGED Modified Paths: -------------- brlcad/trunk/src/mged/edsol.c brlcad/trunk/src/mged/sedit.h brlcad/trunk/src/mged/tedit.c Modified: brlcad/trunk/src/mged/edsol.c =================================================================== --- brlcad/trunk/src/mged/edsol.c 2008-11-19 17:50:32 UTC (rev 33211) +++ brlcad/trunk/src/mged/edsol.c 2008-11-19 18:57:59 UTC (rev 33212) @@ -51,7 +51,7 @@ static void arb8_edge(int arg), ars_ed(int arg), ell_ed(int arg), tgc_ed(int arg), tor_ed(int arg), spline_ed(int arg); static void nmg_ed(int arg), pipe_ed(int arg), vol_ed(int arg), ebm_ed(int arg), dsp_ed(int arg), cline_ed(int arg), bot_ed(int arg), extr_ed(int arg); -static void rpc_ed(int arg), rhc_ed(int arg), part_ed(int arg), epa_ed(int arg), ehy_ed(int arg), eto_ed(int arg); +static void rpc_ed(int arg), rhc_ed(int arg), part_ed(int arg), epa_ed(int arg), ehy_ed(int arg), eto_ed(int arg), hyp_ed(int arg); static void superell_ed(int arg), metaball_ed(int arg); static void arb7_edge(int arg), arb6_edge(int arg), arb5_edge(int arg), arb4_point(int arg); @@ -223,6 +223,12 @@ #define MENU_METABALL_PT_FLDSTR 124 #define MENU_METABALL_DEL_PT 125 #define MENU_METABALL_ADD_PT 126 +#define MENU_HYP_H 127 +#define MENU_HYP_SCALE_A 128 +#define MENU_HYP_SCALE_B 129 +#define MENU_HYP_C 130 +#define MENU_HYP_ROT_H 131 +#define MENU_HYP_ROT_A 132 struct menu_item cline_menu[] = { { "CLINE MENU", (void (*)())NULL, 0 }, @@ -566,6 +572,17 @@ { "", (void (*)())NULL, 0 } }; +struct menu_item hyp_menu[] = { + { "HYPERBOLID MENU", (void (*)())NULL, 0 }, + { "Set H", hyp_ed, MENU_HYP_H }, + { "Set A", hyp_ed, MENU_HYP_SCALE_A }, + { "Set B", hyp_ed, MENU_HYP_SCALE_B }, + { "Set c", hyp_ed, MENU_HYP_C }, + { "Rotate H", hyp_ed, MENU_HYP_ROT_H }, + { "Rotate A", hyp_ed, MENU_HYP_ROT_A }, + { "", (void (*)())NULL, 0 } +}; + struct menu_item pipe_menu[] = { { "PIPE MENU", (void (*)())NULL, 0 }, { "Select Point", pipe_ed, MENU_PIPE_SELECT }, @@ -1038,6 +1055,25 @@ } static void +hyp_ed(int arg) +{ + es_menu = arg; + switch ( arg ) { + case MENU_HYP_ROT_H: + es_edflag = ECMD_HYP_ROT_H; + break; + case MENU_HYP_ROT_A: + es_edflag = ECMD_HYP_ROT_A; + break; + default: + es_edflag = PSCALE; + break; + } + set_e_axes_pos(1); + return; +} + +static void ell_ed(int arg) { es_menu = arg; @@ -2043,6 +2079,16 @@ *strp = "V"; break; } + case ID_HYP: + { + struct rt_hyp_internal *hyp = + (struct rt_hyp_internal *)ip->idb_ptr; + RT_HYP_CK_MAGIC( hyp ); + + VMOVE( mpt, hyp->hyp_V ); + *strp = "V"; + break; + } case ID_ETO: { struct rt_eto_internal *eto = @@ -2641,6 +2687,9 @@ case ID_EHY: mmenu_set_all( MENU_L1, ehy_menu ); break; + case ID_HYP: + mmenu_set_all( MENU_L1, hyp_menu ); + break; case ID_ETO: mmenu_set_all( MENU_L1, eto_menu ); break; @@ -4316,6 +4365,113 @@ } break; + case ECMD_HYP_ROT_H: + /* rotate hyperolid height vector */ + { + struct rt_hyp_internal *hyp = + (struct rt_hyp_internal *)es_int.idb_ptr; + + RT_HYP_CK_MAGIC(hyp); + if (inpara) { + static mat_t invsolr; + /* + * Keyboard parameters: absolute x,y,z rotations, + * in degrees. First, cancel any existing rotations, + * then perform new rotation + */ + bn_mat_inv( invsolr, acc_rot_sol ); + + /* Build completely new rotation change */ + MAT_IDN( modelchanges ); + bn_mat_angles(modelchanges, + es_para[0], + es_para[1], + es_para[2]); + /* Borrow incr_change matrix here */ + bn_mat_mul( incr_change, modelchanges, invsolr ); + MAT_COPY(acc_rot_sol, modelchanges); + + /* Apply new rotation to solid */ + /* Clear out solid rotation */ + MAT_IDN( modelchanges ); + } else { + /* Apply incremental changes already in incr_change */ + } + + if (mged_variables->mv_context) { + /* calculate rotations about keypoint */ + bn_mat_xform_about_pt( edit, incr_change, es_keypoint ); + + /* We want our final matrix (mat) to xform the original solid + * to the position of this instance of the solid, perform the + * current edit operations, then xform back. + * mat = es_invmat * edit * es_mat + */ + bn_mat_mul( mat1, edit, es_mat ); + bn_mat_mul( mat, es_invmat, mat1 ); + + MAT4X3VEC(hyp->hyp_H, mat, hyp->hyp_H); + } else { + MAT4X3VEC(hyp->hyp_H, incr_change, hyp->hyp_H); + } + } + MAT_IDN( incr_change ); + break; + + case ECMD_HYP_ROT_A: + /* rotate hyperolid height vector */ + { + struct rt_hyp_internal *hyp = + (struct rt_hyp_internal *)es_int.idb_ptr; + + RT_HYP_CK_MAGIC(hyp); + if (inpara) { + static mat_t invsolr; + /* + * Keyboard parameters: absolute x,y,z rotations, + * in degrees. First, cancel any existing rotations, + * then perform new rotation + */ + bn_mat_inv( invsolr, acc_rot_sol ); + + /* Build completely new rotation change */ + MAT_IDN( modelchanges ); + bn_mat_angles(modelchanges, + es_para[0], + es_para[1], + es_para[2]); + /* Borrow incr_change matrix here */ + bn_mat_mul( incr_change, modelchanges, invsolr ); + MAT_COPY(acc_rot_sol, modelchanges); + + /* Apply new rotation to solid */ + /* Clear out solid rotation */ + MAT_IDN( modelchanges ); + } else { + /* Apply incremental changes already in incr_change */ + } + + if (mged_variables->mv_context) { + /* calculate rotations about keypoint */ + bn_mat_xform_about_pt( edit, incr_change, es_keypoint ); + + /* We want our final matrix (mat) to xform the original solid + * to the position of this instance of the solid, perform the + * current edit operations, then xform back. + * mat = es_invmat * edit * es_mat + */ + bn_mat_mul( mat1, edit, es_mat ); + bn_mat_mul( mat, es_invmat, mat1 ); + +/* MAT4X3VEC(hyp->hyp_A, mat, hyp->hyp_A);*/ + } else { +/* MAT4X3VEC(hyp->hyp_A, incr_change, hyp->hyp_A);*/ + } + } + MAT_IDN( incr_change ); + break; + + case ECMD_ETO_ROT_C: /* rotate ellipse semi-major axis vector */ { @@ -8518,6 +8674,20 @@ } break; + case ID_HYP: + { + struct rt_hyp_internal *hyp = + (struct rt_hyp_internal *)es_int.idb_ptr; + fastf_t ch, cv, dh, dv, cmag, phi; + vect_t Au, Nu; + + RT_HYP_CK_MAGIC(hyp); + + MAT4X3PNT( pos_view, xform, hyp->hyp_V ); + POINT_LABEL( pos_view, 'V' ); + } + break; + case ID_ETO: { struct rt_eto_internal *eto = @@ -9145,6 +9315,9 @@ case ID_EHY: mip = ehy_menu; break; + case ID_HYP: + mip = hyp_menu; + break; case ID_ETO: mip = eto_menu; break; Modified: brlcad/trunk/src/mged/sedit.h =================================================================== --- brlcad/trunk/src/mged/sedit.h 2008-11-19 17:50:32 UTC (rev 33211) +++ brlcad/trunk/src/mged/sedit.h 2008-11-19 18:57:59 UTC (rev 33212) @@ -138,6 +138,9 @@ #define ECMD_METABALL_PT_ADD 89 /* add a metaball control point */ #define ECMD_METABALL_RMET 90 /* set the metaball render method */ +#define ECMD_HYP_ROT_H 91 +#define ECMD_HYP_ROT_A 92 + #define SEDIT_ROTATE (state == ST_S_EDIT && \ (es_edflag == SROT || \ es_edflag == ECMD_TGC_ROT_H || \ Modified: brlcad/trunk/src/mged/tedit.c =================================================================== --- brlcad/trunk/src/mged/tedit.c 2008-11-19 17:50:32 UTC (rev 33211) +++ brlcad/trunk/src/mged/tedit.c 2008-11-19 18:57:59 UTC (rev 33212) @@ -173,6 +173,7 @@ struct rt_rhc_internal *rhc; struct rt_epa_internal *epa; struct rt_ehy_internal *ehy; + struct rt_hyp_internal *hyp; struct rt_eto_internal *eto; struct rt_part_internal *part; struct rt_superell_internal *superell; @@ -268,6 +269,9 @@ (void)fprintf( fp, "Semi-minor length: %.9f%s", ehy->ehy_r2 * base2local, eol); (void)fprintf( fp, "Dist to asymptotes: %.9f%s", ehy->ehy_c * base2local, eol); break; + case ID_HYP: + hyp = (struct rt_hyp_internal *)es_int.idb_ptr; + break; case ID_ETO: eto = (struct rt_eto_internal *)es_int.idb_ptr; (void)fprintf( fp, "Vertex: %.9f %.9f %.9f%s", V3BASE2LOCAL( eto->eto_V ), eol); @@ -339,6 +343,7 @@ struct rt_rhc_internal *rhc; struct rt_epa_internal *epa; struct rt_ehy_internal *ehy; + struct rt_hyp_internal *hyp; struct rt_eto_internal *eto; struct rt_part_internal *part; struct rt_superell_internal *superell; @@ -766,6 +771,32 @@ (void)sscanf( str, "%lf", &a ); ehy->ehy_c = a * local2base; break; + case ID_HYP: + hyp = (struct rt_hyp_internal *)es_int.idb_ptr; + if ( (str=Get_next_line( fp )) == NULL ) + { + ret_val = 1; + break; + } + (void)sscanf( str, "%lf %lf %lf", &a, &b, &c ); + VSET( hyp->hyp_V, a, b, c ); + VSCALE( hyp->hyp_V, hyp->hyp_V, local2base ); + + if ( (str=Get_next_line( fp )) == NULL ) + { + ret_val = 1; + break; + } + (void)sscanf( str, "%lf %lf %lf", &a, &b, &c ); + VSET( hyp->hyp_H, a, b, c ); + VSCALE( hyp->hyp_H, hyp->hyp_H, local2base ); + + if ( (str=Get_next_line( fp )) == NULL ) + { + ret_val = 1; + break; + } + break; case ID_ETO: eto = (struct rt_eto_internal *)es_int.idb_ptr; if ( (str=Get_next_line( fp )) == NULL ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-11-19 19:20:11
|
Revision: 33216 http://brlcad.svn.sourceforge.net/brlcad/?rev=33216&view=rev Author: brlcad Date: 2008-11-19 19:20:09 +0000 (Wed, 19 Nov 2008) Log Message: ----------- move the mged_ttol and mged_tol declarations into mged.h so we don't have to declare them everywhere. Modified Paths: -------------- brlcad/trunk/src/mged/anal.c brlcad/trunk/src/mged/chgmodel.c brlcad/trunk/src/mged/chgtree.c brlcad/trunk/src/mged/chgview.c brlcad/trunk/src/mged/cmd.c brlcad/trunk/src/mged/dodraw.c brlcad/trunk/src/mged/edarb.c brlcad/trunk/src/mged/edars.c brlcad/trunk/src/mged/edpipe.c brlcad/trunk/src/mged/edsol.c brlcad/trunk/src/mged/facedef.c brlcad/trunk/src/mged/inside.c brlcad/trunk/src/mged/mged.h brlcad/trunk/src/mged/tedit.c brlcad/trunk/src/mged/utility1.c Modified: brlcad/trunk/src/mged/anal.c =================================================================== --- brlcad/trunk/src/mged/anal.c 2008-11-19 19:18:46 UTC (rev 33215) +++ brlcad/trunk/src/mged/anal.c 2008-11-19 19:20:09 UTC (rev 33216) @@ -41,7 +41,6 @@ #define GALLONS_TO_MM3 3785411.784 extern struct rt_db_internal es_int; -extern struct bn_tol mged_tol; static void do_anal(struct bu_vls *vp, const struct rt_db_internal *ip); static void arb_anal(struct bu_vls *vp, const struct rt_db_internal *ip); Modified: brlcad/trunk/src/mged/chgmodel.c =================================================================== --- brlcad/trunk/src/mged/chgmodel.c 2008-11-19 19:18:46 UTC (rev 33215) +++ brlcad/trunk/src/mged/chgmodel.c 2008-11-19 19:20:09 UTC (rev 33216) @@ -48,8 +48,6 @@ #include "./cmd.h" -extern struct bn_tol mged_tol; - void set_tran(); void aexists(char *name); Modified: brlcad/trunk/src/mged/chgtree.c =================================================================== --- brlcad/trunk/src/mged/chgtree.c 2008-11-19 19:18:46 UTC (rev 33215) +++ brlcad/trunk/src/mged/chgtree.c 2008-11-19 19:20:09 UTC (rev 33216) @@ -49,8 +49,6 @@ extern struct db_tree_state mged_initial_tree_state; -extern struct bn_tol mged_tol; -extern struct rt_tess_tol mged_ttol; extern int classic_mged; static char *really_delete="tk_messageBox -icon question -title {Are you sure?}\ Modified: brlcad/trunk/src/mged/chgview.c =================================================================== --- brlcad/trunk/src/mged/chgview.c 2008-11-19 19:18:46 UTC (rev 33215) +++ brlcad/trunk/src/mged/chgview.c 2008-11-19 19:20:09 UTC (rev 33216) @@ -70,7 +70,6 @@ extern vect_t curr_e_axes_pos; extern long nvectors; -extern struct bn_tol mged_tol; extern vect_t e_axes_pos; fastf_t ar_scale_factor = GED_MAX / ABS_ROT_FACTOR; Modified: brlcad/trunk/src/mged/cmd.c =================================================================== --- brlcad/trunk/src/mged/cmd.c 2008-11-19 19:18:46 UTC (rev 33215) +++ brlcad/trunk/src/mged/cmd.c 2008-11-19 19:20:09 UTC (rev 33216) @@ -73,9 +73,6 @@ extern int db_upgrade; extern int db_version; -extern struct rt_tess_tol mged_ttol; -extern struct bn_tol mged_tol; - int glob_compat_mode = 1; int output_as_return = 1; Tk_Window tkwin = NULL; Modified: brlcad/trunk/src/mged/dodraw.c =================================================================== --- brlcad/trunk/src/mged/dodraw.c 2008-11-19 19:18:46 UTC (rev 33215) +++ brlcad/trunk/src/mged/dodraw.c 2008-11-19 19:20:09 UTC (rev 33216) @@ -109,8 +109,6 @@ int mged_wireframe_color[3]; static struct model *mged_nmg_model; -extern struct bn_tol mged_tol; -extern struct rt_tess_tol mged_ttol; /* * M G E D _ P L O T _ A N I M _ U P C A L L _ H A N D L E R Modified: brlcad/trunk/src/mged/edarb.c =================================================================== --- brlcad/trunk/src/mged/edarb.c 2008-11-19 19:18:46 UTC (rev 33215) +++ brlcad/trunk/src/mged/edarb.c 2008-11-19 19:20:09 UTC (rev 33216) @@ -45,7 +45,6 @@ extern struct rt_db_internal es_int; extern struct rt_db_internal es_int_orig; -extern struct bn_tol mged_tol; /* * E D I T A R B Modified: brlcad/trunk/src/mged/edars.c =================================================================== --- brlcad/trunk/src/mged/edars.c 2008-11-19 19:18:46 UTC (rev 33215) +++ brlcad/trunk/src/mged/edars.c 2008-11-19 19:20:09 UTC (rev 33216) @@ -46,7 +46,6 @@ #include "./sedit.h" #include "./mged_dm.h" -extern struct bn_tol mged_tol; void find_nearest_ars_pt( Modified: brlcad/trunk/src/mged/edpipe.c =================================================================== --- brlcad/trunk/src/mged/edpipe.c 2008-11-19 19:18:46 UTC (rev 33215) +++ brlcad/trunk/src/mged/edpipe.c 2008-11-19 19:20:09 UTC (rev 33216) @@ -46,7 +46,6 @@ #include "./sedit.h" #include "./mged_dm.h" -extern struct bn_tol mged_tol; void split_pipept(struct bu_list *pipe_hd, struct wdb_pipept *ps, fastf_t *new_pt) Modified: brlcad/trunk/src/mged/edsol.c =================================================================== --- brlcad/trunk/src/mged/edsol.c 2008-11-19 19:18:46 UTC (rev 33215) +++ brlcad/trunk/src/mged/edsol.c 2008-11-19 19:20:09 UTC (rev 33216) @@ -47,9 +47,6 @@ #include "./mged_dm.h" -extern struct bn_tol mged_tol; - - static void arb8_edge(int arg), ars_ed(int arg), ell_ed(int arg), tgc_ed(int arg), tor_ed(int arg), spline_ed(int arg); static void nmg_ed(int arg), pipe_ed(int arg), vol_ed(int arg), ebm_ed(int arg), dsp_ed(int arg), cline_ed(int arg), bot_ed(int arg), extr_ed(int arg); static void rpc_ed(int arg), rhc_ed(int arg), part_ed(int arg), epa_ed(int arg), ehy_ed(int arg), eto_ed(int arg), hyp_ed(int arg); Modified: brlcad/trunk/src/mged/facedef.c =================================================================== --- brlcad/trunk/src/mged/facedef.c 2008-11-19 19:18:46 UTC (rev 33215) +++ brlcad/trunk/src/mged/facedef.c 2008-11-19 19:20:09 UTC (rev 33216) @@ -38,10 +38,9 @@ #include "./mged.h" #include "./sedit.h" + extern struct rt_db_internal es_int; -extern struct bn_tol mged_tol; - char *p_rotfb[] = { "Enter rot, fb angles: ", "Enter fb angle: ", Modified: brlcad/trunk/src/mged/inside.c =================================================================== --- brlcad/trunk/src/mged/inside.c 2008-11-19 19:18:46 UTC (rev 33215) +++ brlcad/trunk/src/mged/inside.c 2008-11-19 19:20:09 UTC (rev 33216) @@ -47,8 +47,6 @@ #include "./cmd.h" extern struct rt_db_internal es_int; -extern struct bn_tol mged_tol; - extern char **promp; /* pointer to a pointer to a char */ static char *p_arb4[] = { Modified: brlcad/trunk/src/mged/mged.h =================================================================== --- brlcad/trunk/src/mged/mged.h 2008-11-19 19:18:46 UTC (rev 33215) +++ brlcad/trunk/src/mged/mged.h 2008-11-19 19:20:09 UTC (rev 33216) @@ -114,6 +114,10 @@ extern double mged_rel_tol; /* rel surface tolerance */ extern double mged_nrm_tol; /* surface normal tolerance */ +extern struct bn_tol mged_tol; /* calculation tolerance */ +extern struct rt_tess_tol mged_ttol; /* XXX needs to replace mged_abs_tol, et.al. */ + + /* default region codes defined in mover.c */ extern int item_default; extern int air_default; Modified: brlcad/trunk/src/mged/tedit.c =================================================================== --- brlcad/trunk/src/mged/tedit.c 2008-11-19 19:18:46 UTC (rev 33215) +++ brlcad/trunk/src/mged/tedit.c 2008-11-19 19:20:09 UTC (rev 33216) @@ -61,7 +61,6 @@ extern struct rt_db_internal es_int; extern struct rt_db_internal es_int_orig; -extern struct bn_tol mged_tol; static char tmpfil[MAXPATHLEN] = {0}; Modified: brlcad/trunk/src/mged/utility1.c =================================================================== --- brlcad/trunk/src/mged/utility1.c 2008-11-19 19:18:46 UTC (rev 33215) +++ brlcad/trunk/src/mged/utility1.c 2008-11-19 19:20:09 UTC (rev 33216) @@ -55,8 +55,6 @@ #include "./cmd.h" -extern struct bn_tol mged_tol; - int readcodes(), writecodes(); int loadcodes(), printcodes(FILE *fp, struct directory *dp, int pathpos); void tables(), edcodes(), changes(), prfield(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-11-19 19:48:03
|
Revision: 33219 http://brlcad.svn.sourceforge.net/brlcad/?rev=33219&view=rev Author: brlcad Date: 2008-11-19 19:48:00 +0000 (Wed, 19 Nov 2008) Log Message: ----------- more dead code removal, removing the DO_NEW_EDIT_MATS and DO_DISPLAY_LISTS else case sections. Modified Paths: -------------- brlcad/trunk/src/mged/attach.c brlcad/trunk/src/mged/chgmodel.c brlcad/trunk/src/mged/chgview.c brlcad/trunk/src/mged/dodraw.c brlcad/trunk/src/mged/dozoom.c brlcad/trunk/src/mged/mged.c brlcad/trunk/src/mged/mged_dm.h Modified: brlcad/trunk/src/mged/attach.c =================================================================== --- brlcad/trunk/src/mged/attach.c 2008-11-19 19:43:04 UTC (rev 33218) +++ brlcad/trunk/src/mged/attach.c 2008-11-19 19:48:00 UTC (rev 33219) @@ -501,14 +501,12 @@ Tcl_AppendResult(interp, "ATTACHING ", dmp->dm_name, " (", dmp->dm_lname, ")\n", (char *)NULL); -#ifdef DO_DISPLAY_LISTS share_dlist(curr_dm_list); if (displaylist && mged_variables->mv_dlist && !dlist_state->dl_active) { createDLists(&dgop->dgo_headSolid); dlist_state->dl_active = 1; } -#endif DM_SET_WIN_BOUNDS(dmp, windowbounds); mged_fb_open(); Modified: brlcad/trunk/src/mged/chgmodel.c =================================================================== --- brlcad/trunk/src/mged/chgmodel.c 2008-11-19 19:43:04 UTC (rev 33218) +++ brlcad/trunk/src/mged/chgmodel.c 2008-11-19 19:48:00 UTC (rev 33219) @@ -620,11 +620,7 @@ */ wrt_point(modelchanges, temp, modelchanges, point); -#ifdef DO_NEW_EDIT_MATS new_edit_mats(); -#else - new_mats(); -#endif return TCL_OK; } @@ -744,11 +740,7 @@ MAT4X3PNT(point, modelchanges, temp); wrt_point(modelchanges, incr, modelchanges, point); -#ifdef DO_NEW_EDIT_MATS new_edit_mats(); -#else - new_mats(); -#endif return TCL_OK; } @@ -817,11 +809,7 @@ MAT_DELTAS_VEC(incr, model_incr); MAT_COPY(old, modelchanges); bn_mat_mul(modelchanges, incr, old); -#ifdef DO_NEW_EDIT_MATS new_edit_mats(); -#else - new_mats(); -#endif return TCL_OK; } @@ -1164,11 +1152,7 @@ */ wrt_point_direc(modelchanges, temp, modelchanges, point, direc); -#ifdef DO_NEW_EDIT_MATS new_edit_mats(); -#else - new_mats(); -#endif return TCL_OK; } Modified: brlcad/trunk/src/mged/chgview.c =================================================================== --- brlcad/trunk/src/mged/chgview.c 2008-11-19 19:43:04 UTC (rev 33218) +++ brlcad/trunk/src/mged/chgview.c 2008-11-19 19:48:00 UTC (rev 33219) @@ -859,11 +859,9 @@ if (state != ST_VIEW) button(BE_REJECT); -#ifdef DO_DISPLAY_LISTS freeDListsAll(BU_LIST_FIRST(solid, &dgop->dgo_headSolid)->s_dlist, BU_LIST_LAST(solid, &dgop->dgo_headSolid)->s_dlist - BU_LIST_FIRST(solid, &dgop->dgo_headSolid)->s_dlist + 1); -#endif dgo_zap_cmd(dgop, interp); @@ -1437,9 +1435,7 @@ nsp = BU_LIST_PNEXT(solid, sp); if ( db_full_path_subset( &sp->s_fullpath, &subpath ) ) { -#ifdef DO_DISPLAY_LISTS freeDListsAll(sp->s_dlist, 1); -#endif if (state != ST_VIEW && illump == sp) button(BE_REJECT); @@ -1495,10 +1491,7 @@ nsp = BU_LIST_PNEXT(solid, sp); if ( db_full_path_subset( &sp->s_fullpath, &subpath ) ) { - -#ifdef DO_DISPLAY_LISTS freeDListsAll(sp->s_dlist, 1); -#endif if (state != ST_VIEW && illump == sp) button( BE_REJECT ); Modified: brlcad/trunk/src/mged/dodraw.c =================================================================== --- brlcad/trunk/src/mged/dodraw.c 2008-11-19 19:43:04 UTC (rev 33218) +++ brlcad/trunk/src/mged/dodraw.c 2008-11-19 19:48:00 UTC (rev 33219) @@ -900,9 +900,7 @@ sp->s_regionid = tsp->ts_regionid; } -#ifdef DO_DISPLAY_LISTS createDListALL(sp); -#endif /* Solid is successfully drawn */ if ( !existing_sp ) { @@ -1184,15 +1182,6 @@ /* Need to enter phony name in directory structure */ dp = db_diradd( dbip, name, RT_DIR_PHONY_ADDR, 0, DIR_SOLID, &type ); -#if 0 - /* XXX need to get this going. */ - path.fp_names[0] = dp; - state.ts_mater.ma_color[0] = ((rgb>>16) & 0xFF) / 255.0 - state.ts_mater.ma_color[1] = ((rgb>> 8) & 0xFF) / 255.0 - state.ts_mater.ma_color[2] = ((rgb ) & 0xFF) / 255.0 - drawH_part2( 0, vhead, path, &state, SOLID_NULL ); -#else - /* Obtain a fresh solid structure, and fill it in */ GET_SOLID(sp, &MGED_FreeSolid.l); @@ -1221,10 +1210,8 @@ /* Solid successfully drawn, add to linked list of solid structs */ BU_LIST_APPEND(dgop->dgo_headSolid.back, &sp->l); -#ifdef DO_DISPLAY_LISTS createDListALL(sp); -#endif -#endif + return(0); /* OK */ } Modified: brlcad/trunk/src/mged/dozoom.c =================================================================== --- brlcad/trunk/src/mged/dozoom.c 2008-11-19 19:43:04 UTC (rev 33218) +++ brlcad/trunk/src/mged/dozoom.c 2008-11-19 19:48:00 UTC (rev 33219) @@ -282,8 +282,6 @@ } } - -#ifdef DO_DISPLAY_LISTS if (displaylist && mged_variables->mv_dlist) { DM_DRAWDLIST(dmp, sp->s_dlist); sp->s_flag = UP; @@ -294,12 +292,6 @@ ndrawn++; } } -#else - if (DM_DRAW_VLIST(dmp, (struct bn_vlist *)&sp->s_vlist) == TCL_OK) { - sp->s_flag = UP; - ndrawn++; - } -#endif } /* @@ -594,7 +586,6 @@ DM_SET_LINE_ATTR(dmp, mged_variables->mv_linewidth, linestyle); } -#ifdef DO_DISPLAY_LISTS if (displaylist && mged_variables->mv_dlist) { DM_DRAWDLIST(dmp, sp->s_dlist); sp->s_flag = UP; @@ -606,12 +597,6 @@ ndrawn++; } } -#else - if (DM_DRAW_VLIST(dmp, (struct bn_vlist *)&sp->s_vlist) == TCL_OK) { - sp->s_flag = UP; - ndrawn++; - } -#endif } /* @@ -622,7 +607,6 @@ curr_dm_list = save_dm_list; } -#ifdef DO_DISPLAY_LISTS /* * Create Display List */ @@ -719,7 +703,6 @@ dlp->dml_dlist_state->dl_flag = 0; } } -#endif /* * Local Variables: Modified: brlcad/trunk/src/mged/mged.c =================================================================== --- brlcad/trunk/src/mged/mged.c 2008-11-19 19:43:04 UTC (rev 33218) +++ brlcad/trunk/src/mged/mged.c 2008-11-19 19:48:00 UTC (rev 33219) @@ -2341,7 +2341,7 @@ vo_update(view_state->vs_vop, interp, 0); } -#ifdef DO_NEW_EDIT_MATS + void new_edit_mats(void) { @@ -2361,7 +2361,6 @@ curr_dm_list = save_dm_list; } -#endif void mged_view_obj_callback(genptr_t clientData, Modified: brlcad/trunk/src/mged/mged_dm.h =================================================================== --- brlcad/trunk/src/mged/mged_dm.h 2008-11-19 19:43:04 UTC (rev 33218) +++ brlcad/trunk/src/mged/mged_dm.h 2008-11-19 19:48:00 UTC (rev 33219) @@ -38,13 +38,7 @@ */ #include "./mgedtcl.h" -#define DO_NEW_EDIT_MATS -#define DO_DISPLAY_LISTS -#if 0 -#define DO_SINGLE_DISPLAY_LIST -#endif - #define MGED_DISPLAY_VAR "mged_display" /* +-2048 to +-1 */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-11-19 19:53:31
|
Revision: 33221 http://brlcad.svn.sourceforge.net/brlcad/?rev=33221&view=rev Author: brlcad Date: 2008-11-19 19:53:29 +0000 (Wed, 19 Nov 2008) Log Message: ----------- more dead code removal Modified Paths: -------------- brlcad/trunk/src/mged/buttons.c brlcad/trunk/src/mged/chgtree.c Modified: brlcad/trunk/src/mged/buttons.c =================================================================== --- brlcad/trunk/src/mged/buttons.c 2008-11-19 19:50:50 UTC (rev 33220) +++ brlcad/trunk/src/mged/buttons.c 2008-11-19 19:53:29 UTC (rev 33221) @@ -837,30 +837,7 @@ FOR_ALL_DISPLAYS(p, &head_dm_list.l) { curr_dm_list = p; -#if 0 - if (to == ST_VIEW) { - mat_t o_toViewcenter; - fastf_t o_Viewscale; - - /* save toViewcenter and Viewscale */ - MAT_COPY(o_toViewcenter, view_state->vs_toViewcenter); - o_Viewscale = view_state->vs_Viewscale; - - /* get new orig_pos */ - size_reset(); - MAT_DELTAS_GET_NEG(view_state->vs_orig_pos, view_state->vs_toViewcenter); - - /* restore old toViewcenter and Viewscale */ - MAT_COPY(view_state->vs_toViewcenter, o_toViewcenter); - view_state->vs_Viewscale = o_Viewscale; - } -#endif new_mats(); - -#if 0 - /* recompute absolute_tran */ - set_absolute_tran(); -#endif } curr_dm_list = save_dm_list; Modified: brlcad/trunk/src/mged/chgtree.c =================================================================== --- brlcad/trunk/src/mged/chgtree.c 2008-11-19 19:50:50 UTC (rev 33220) +++ brlcad/trunk/src/mged/chgtree.c 2008-11-19 19:53:29 UTC (rev 33221) @@ -383,11 +383,6 @@ db_full_path_init( &both ); db_dup_full_path( &both, &lhs ); db_append_full_path( &both, &rhs ); -#if 0 - db_pr_full_path( "lhs ", &lhs ); - db_pr_full_path( "rhs ", &rhs ); - db_pr_full_path( "both", &both); -#endif /* Patterned after ill_common() ... */ illump = BU_LIST_NEXT(solid, &dgop->dgo_headSolid);/* any valid solid would do */ @@ -413,9 +408,6 @@ (void)chg_state( ST_O_PICK, ST_O_PATH, "internal change of state"); /* Select the matrix */ -#if 0 - bu_log("matpick %d\n", lhs.fp_len); -#endif sprintf( number, "%d", lhs.fp_len ); new_argv[0] = "matpick"; new_argv[1] = number; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2008-12-22 15:25:32
|
Revision: 33411 http://brlcad.svn.sourceforge.net/brlcad/?rev=33411&view=rev Author: bob1961 Date: 2008-12-22 15:25:18 +0000 (Mon, 22 Dec 2008) Log Message: ----------- Initial modifications to make libged commands available to MGED. The first test case exposes the gqa command. Modified Paths: -------------- brlcad/trunk/src/mged/cmd.c brlcad/trunk/src/mged/mged.c brlcad/trunk/src/mged/mged.h brlcad/trunk/src/mged/setup.c Modified: brlcad/trunk/src/mged/cmd.c =================================================================== --- brlcad/trunk/src/mged/cmd.c 2008-12-22 15:22:40 UTC (rev 33410) +++ brlcad/trunk/src/mged/cmd.c 2008-12-22 15:25:18 UTC (rev 33411) @@ -3043,6 +3043,27 @@ } int +cmd_gqa(ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv) +{ + int ret; + Tcl_DString ds; + + Tcl_DStringInit(&ds); + + ret = ged_gqa(gedp, argc, argv); + Tcl_DStringAppend(&ds, bu_vls_addr(&gedp->ged_result_str), -1); + Tcl_DStringResult(interp, &ds); + + if (ret == BRLCAD_OK) + return TCL_OK; + + return TCL_ERROR; +} + +int cmd_stub(ClientData clientData, Tcl_Interp *interp, int argc, Modified: brlcad/trunk/src/mged/mged.c =================================================================== --- brlcad/trunk/src/mged/mged.c 2008-12-22 15:22:40 UTC (rev 33410) +++ brlcad/trunk/src/mged/mged.c 2008-12-22 15:25:18 UTC (rev 33411) @@ -71,6 +71,7 @@ #include "mater.h" #include "libtermio.h" #include "db.h" +#include "ged.h" /* private */ #include "./mged.h" @@ -146,6 +147,7 @@ int pipe_out[2]; int pipe_err[2]; +struct ged *gedp = GED_NULL; struct db_i *dbip = DBI_NULL; /* database instance pointer */ struct rt_wdb *wdbp = RT_WDB_NULL; struct dg_obj *dgop = GED_DGO_NULL; @@ -2484,13 +2486,13 @@ int argc, char **argv) { - struct db_i *save_dbip = DBI_NULL; - struct mater *save_materp = MATER_NULL; - struct bu_vls vls; - struct bu_vls msg; /* use this to hold returned message */ - int create_new_db = 0; + struct ged *save_gedp; + struct db_i *save_dbip = DBI_NULL; + struct mater *save_materp = MATER_NULL; + struct bu_vls vls; + struct bu_vls msg; /* use this to hold returned message */ + int create_new_db = 0; - if ( argc <= 1 ) { /* Invoked without args, return name of current database */ @@ -2524,6 +2526,7 @@ return TCL_ERROR; } + save_gedp = gedp; save_dbip = dbip; dbip = DBI_NULL; save_materp = rt_material_head(); @@ -2539,6 +2542,7 @@ */ if (bu_file_exists(argv[1])) { /* need to reset things before returning */ + gedp = save_gedp; dbip = save_dbip; rt_new_material_head(save_materp); @@ -2592,6 +2596,7 @@ /* not initializing mged */ if (argc == 2) { /* need to reset this before returning */ + gedp = save_gedp; dbip = save_dbip; rt_new_material_head(save_materp); Tcl_AppendResult(interp, MORE_ARGS_STR, "Create new database (y|n)[n]? ", @@ -2603,6 +2608,7 @@ } if ( *argv[2] != 'y' && *argv[2] != 'Y' ) { + gedp = save_gedp; dbip = save_dbip; /* restore previous database */ rt_new_material_head(save_materp); bu_vls_free(&vls); @@ -2614,6 +2620,7 @@ /* File does not exist, and should be created */ if ((dbip = db_create(argv[1], db_version)) == DBI_NULL) { + gedp = save_gedp; dbip = save_dbip; /* restore previous database */ rt_new_material_head(save_materp); bu_vls_free(&vls); @@ -2647,6 +2654,7 @@ /* close out the old dbip */ if ( save_dbip ) { + struct ged *new_gedp; struct db_i *new_dbip; struct mater *new_materp; @@ -2654,6 +2662,7 @@ new_materp = rt_material_head(); /* activate the 'saved' values so we can cleanly close the previous db */ + gedp = save_gedp; dbip = save_dbip; rt_new_material_head(save_materp); @@ -2661,6 +2670,7 @@ f_closedb(clientData, interp, 1, NULL); /* restore to the new db just opened */ + gedp = new_gedp; dbip = new_dbip; rt_new_material_head(new_materp); } @@ -2687,6 +2697,9 @@ return TCL_ERROR; } + BU_GETSTRUCT(gedp, ged); + GED_INIT(gedp, wdbp); + /* increment use count for this db instance */ (void)db_clone_dbi(dbip, NULL); Modified: brlcad/trunk/src/mged/mged.h =================================================================== --- brlcad/trunk/src/mged/mged.h 2008-12-22 15:22:40 UTC (rev 33410) +++ brlcad/trunk/src/mged/mged.h 2008-12-22 15:25:18 UTC (rev 33411) @@ -90,6 +90,7 @@ * All GED files are stored in a fixed base unit (MM). * These factors convert database unit to local (or working) units. */ +extern struct ged *gedp; /* defined in mged.c */ extern struct db_i *dbip; /* defined in mged.c */ extern int dbih; /* defined in mged.c */ extern struct rt_wdb *wdbp; /* defined in mged.c */ @@ -560,6 +561,10 @@ char **argv, struct funtab in_functions[]); void mged_print_result(int status); +extern int cmd_gqa(ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv); /* color_scheme.c */ void cs_set_bg(void); Modified: brlcad/trunk/src/mged/setup.c =================================================================== --- brlcad/trunk/src/mged/setup.c 2008-12-22 15:22:40 UTC (rev 33410) +++ brlcad/trunk/src/mged/setup.c 2008-12-22 15:25:18 UTC (rev 33411) @@ -164,6 +164,7 @@ {"get_sed", f_get_sedit}, {"get_sed_menus", f_get_sedit_menus}, {"get_solid_keypoint", f_get_solid_keypoint}, + {"gqa", cmd_gqa}, {"grid2model_lu", f_grid2model_lu}, {"grid2view_lu", f_grid2view_lu}, #ifdef HIDELINE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2008-12-22 15:34:56
|
Revision: 33413 http://brlcad.svn.sourceforge.net/brlcad/?rev=33413&view=rev Author: bob1961 Date: 2008-12-22 15:34:42 +0000 (Mon, 22 Dec 2008) Log Message: ----------- Exposing libged's tire command. Modified Paths: -------------- brlcad/trunk/src/mged/cmd.c brlcad/trunk/src/mged/mged.h brlcad/trunk/src/mged/setup.c Modified: brlcad/trunk/src/mged/cmd.c =================================================================== --- brlcad/trunk/src/mged/cmd.c 2008-12-22 15:31:56 UTC (rev 33412) +++ brlcad/trunk/src/mged/cmd.c 2008-12-22 15:34:42 UTC (rev 33413) @@ -3064,6 +3064,27 @@ } int +cmd_tire(ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv) +{ + int ret; + Tcl_DString ds; + + Tcl_DStringInit(&ds); + + ret = ged_tire(gedp, argc, argv); + Tcl_DStringAppend(&ds, bu_vls_addr(&gedp->ged_result_str), -1); + Tcl_DStringResult(interp, &ds); + + if (ret == BRLCAD_OK) + return TCL_OK; + + return TCL_ERROR; +} + +int cmd_stub(ClientData clientData, Tcl_Interp *interp, int argc, Modified: brlcad/trunk/src/mged/mged.h =================================================================== --- brlcad/trunk/src/mged/mged.h 2008-12-22 15:31:56 UTC (rev 33412) +++ brlcad/trunk/src/mged/mged.h 2008-12-22 15:34:42 UTC (rev 33413) @@ -565,6 +565,10 @@ Tcl_Interp *interp, int argc, char **argv); +extern int cmd_tire(ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv); /* color_scheme.c */ void cs_set_bg(void); Modified: brlcad/trunk/src/mged/setup.c =================================================================== --- brlcad/trunk/src/mged/setup.c 2008-12-22 15:31:56 UTC (rev 33412) +++ brlcad/trunk/src/mged/setup.c 2008-12-22 15:34:42 UTC (rev 33413) @@ -332,6 +332,7 @@ {"t_muves", f_t_muves}, {"ted", f_tedit}, {"tie", f_tie}, + {"tire", cmd_tire}, {"title", cmd_title}, {"tol", cmd_tol}, {"top", bv_top}, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |