Revision: 70701
http://sourceforge.net/p/brlcad/code/70701
Author: starseeker
Date: 2018-02-13 14:47:51 +0000 (Tue, 13 Feb 2018)
Log Message:
-----------
Put the original NIRT c files back to their original state, except for renaming
main - library renaming should avoid conflicts.
Modified Paths:
--------------
brlcad/trunk/src/nirt/bsphere.c
brlcad/trunk/src/nirt/command.c
brlcad/trunk/src/nirt/conversion.c
brlcad/trunk/src/nirt/if.c
brlcad/trunk/src/nirt/interact.c
brlcad/trunk/src/nirt/nirt.c
brlcad/trunk/src/nirt/nirt.h
brlcad/trunk/src/nirt/parse_fmt.c
brlcad/trunk/src/nirt/read_mat.c
brlcad/trunk/src/nirt/usrfmt.h
Modified: brlcad/trunk/src/nirt/bsphere.c
===================================================================
--- brlcad/trunk/src/nirt/bsphere.c 2018-02-13 14:39:25 UTC (rev 70700)
+++ brlcad/trunk/src/nirt/bsphere.c 2018-02-13 14:47:51 UTC (rev 70701)
@@ -38,7 +38,7 @@
fastf_t bsphere_diameter = (fastf_t)-1.0;
void
-old_set_diameter(struct rt_i *rtip)
+set_diameter(struct rt_i *rtip)
{
vect_t diag;
Modified: brlcad/trunk/src/nirt/command.c
===================================================================
--- brlcad/trunk/src/nirt/command.c 2018-02-13 14:39:25 UTC (rev 70700)
+++ brlcad/trunk/src/nirt/command.c 2018-02-13 14:47:51 UTC (rev 70701)
@@ -62,7 +62,7 @@
void
-old_bot_minpieces(char *buffer, com_table *UNUSED(ctp), struct rt_i
*UNUSED(rtip))
+bot_minpieces(char *buffer, com_table *UNUSED(ctp), struct rt_i *UNUSED(rtip))
{
long new_lvalue;
int i=0;
@@ -88,7 +88,7 @@
}
void
-old_az_el(char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
+az_el(char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
{
double az = 0.0;
double el = 0.0;
@@ -147,11 +147,11 @@
}
azimuth() = az;
elevation() = el;
- old_ae2dir();
+ ae2dir();
}
void
-old_grid_coor(char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
+grid_coor(char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
{
double g = 0.0;
vect_t Gr = VINIT_ZERO;
@@ -200,7 +200,7 @@
/* if there is no dist coor, set default */
grid(HORZ) = Gr[HORZ] * local2base;
grid(VERT) = Gr[VERT] * local2base;
- old_grid2targ();
+ grid2targ();
return;
}
@@ -226,11 +226,11 @@
grid(HORZ) = Gr[HORZ] * local2base;
grid(VERT) = Gr[VERT] * local2base;
grid(DIST) = Gr[DIST] * local2base;
- old_grid2targ();
+ grid2targ();
}
void
-old_target_coor(char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
+target_coor(char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
{
double tg = 0.0;
vect_t Tar = VINIT_ZERO; /* Target x, y and z */
@@ -298,11 +298,11 @@
target(X) = Tar[X] * local2base;
target(Y) = Tar[Y] * local2base;
target(Z) = Tar[Z] * local2base;
- old_targ2grid();
+ targ2grid();
}
void
-old_dir_vect(char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
+dir_vect(char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
{
double dr = 0.0;
vect_t Dir = VINIT_ZERO; /* Direction vector x, y and z */
@@ -369,11 +369,11 @@
direct(X) = Dir[X];
direct(Y) = Dir[Y];
direct(Z) = Dir[Z];
- old_dir2ae();
+ dir2ae();
}
void
-old_quit()
+quit()
{
if (silent_flag != SILENT_YES)
(void) fputs("Quitting...\n", stdout);
@@ -381,7 +381,7 @@
}
void
-old_show_menu()
+show_menu()
{
com_table *ctp;
@@ -390,12 +390,12 @@
}
void
-old_shoot(char *UNUSED(buffer), com_table *UNUSED(ctp), struct rt_i *rtip)
+shoot(char *UNUSED(buffer), com_table *UNUSED(ctp), struct rt_i *rtip)
{
int i;
double bov = 0.0; /* back out value */
- extern void old_init_ovlp();
+ extern void init_ovlp();
if (!rtip)
return;
@@ -402,7 +402,7 @@
if (need_prep) {
rt_clean(rtip);
- old_do_rt_gettrees(rtip, NULL, 0, &need_prep);
+ do_rt_gettrees(rtip, NULL, 0, &need_prep);
}
if (do_backout) {
@@ -419,7 +419,7 @@
}
if (bsphere_diameter < 0)
- old_set_diameter(rtip);
+ set_diameter(rtip);
/*
* calculate the distance from a plane normal to the ray direction
through the center of
@@ -454,7 +454,7 @@
V3ARGS(ap.a_ray.r_dir));
}
- old_init_ovlp();
+ init_ovlp();
(void) rt_shootray(&ap);
/* Restore pre-backout target values */
@@ -467,7 +467,7 @@
}
void
-old_use_air(char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
+use_air(char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
{
int new_use = 0; /* current position on the *buffer */
char response[128];
@@ -514,7 +514,7 @@
bu_log("Building the directory...");
if ((my_rtip = rt_dirbuild(db_name, db_title, TITLE_LEN)) == RTI_NULL) {
bu_log("Could not load file %s\n", db_name);
- old_printusage();
+ printusage();
bu_exit(1, NULL);
}
rti_tab[new_use] = my_rtip;
@@ -522,15 +522,15 @@
my_rtip->rti_save_overlaps = (overlap_claims > 0);
bu_log("Prepping the geometry...");
- old_do_rt_gettrees(my_rtip, NULL, 0, &need_prep);
+ do_rt_gettrees(my_rtip, NULL, 0, &need_prep);
}
ap.a_rt_i = rti_tab[new_use];
ap.a_resource = &res_tab[new_use];
- old_set_diameter(ap.a_rt_i);
+ set_diameter(ap.a_rt_i);
}
void
-old_nirt_units(char *buffer, com_table *ctp, struct rt_i *rtip)
+nirt_units(char *buffer, com_table *ctp, struct rt_i *rtip)
{
double tmp_dbl;
int i = 0; /* current position on the *buffer */
@@ -565,7 +565,7 @@
}
void
-old_do_overlap_claims(char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
+do_overlap_claims(char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
{
int i = 0; /* current position on the *buffer */
int j;
@@ -602,7 +602,7 @@
}
void
-old_cm_attr(char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
+cm_attr(char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
{
while (isascii(*buffer) && isspace((int)*buffer)) buffer++;
@@ -612,20 +612,20 @@
}
if (! bu_strncmp(buffer, "-p", 2)) {
- old_attrib_print();
+ attrib_print();
return;
}
if (! bu_strncmp(buffer, "-f", 2)) {
- old_attrib_flush();
+ attrib_flush();
return;
}
- old_attrib_add(buffer, &need_prep);
+ attrib_add(buffer, &need_prep);
}
void
-old_cm_debug(char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
+cm_debug(char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
{
char *cp = buffer;
@@ -648,7 +648,7 @@
}
void
-old_cm_libdebug(char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
+cm_libdebug(char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
{
char *cp = buffer;
@@ -674,7 +674,7 @@
}
void
-old_backout(char *buffer, com_table *UNUSED(ctp), struct rt_i *UNUSED(rtip))
+backout(char *buffer, com_table *UNUSED(ctp), struct rt_i *UNUSED(rtip))
{
while (isspace((int)*buffer))
Modified: brlcad/trunk/src/nirt/conversion.c
===================================================================
--- brlcad/trunk/src/nirt/conversion.c 2018-02-13 14:39:25 UTC (rev 70700)
+++ brlcad/trunk/src/nirt/conversion.c 2018-02-13 14:47:51 UTC (rev 70701)
@@ -37,7 +37,7 @@
extern outval ValTab[];
void
-old_dir2ae(void)
+dir2ae(void)
{
double square;
int zeroes = ZERO(direct(Y)) && ZERO(direct(X));
@@ -50,7 +50,7 @@
void
-old_grid2targ(void)
+grid2targ(void)
{
double ar = azimuth() * DEG2RAD;
double er = elevation() * DEG2RAD;
@@ -67,7 +67,7 @@
void
-old_targ2grid(void)
+targ2grid(void)
{
double ar = azimuth() * DEG2RAD;
double er = elevation() * DEG2RAD;
@@ -84,7 +84,7 @@
void
-old_ae2dir(void)
+ae2dir(void)
{
double ar = azimuth() * DEG2RAD;
double er = elevation() * DEG2RAD;
Modified: brlcad/trunk/src/nirt/if.c
===================================================================
--- brlcad/trunk/src/nirt/if.c 2018-02-13 14:39:25 UTC (rev 70700)
+++ brlcad/trunk/src/nirt/if.c 2018-02-13 14:47:51 UTC (rev 70701)
@@ -50,18 +50,18 @@
extern double local2base;
overlap ovlp_list;
-overlap *old_find_ovlp(struct partition *pp);
-void old_del_ovlp(overlap *op);
-void old_init_ovlp(void);
+overlap *find_ovlp(struct partition *pp);
+void del_ovlp(overlap *op);
+void init_ovlp(void);
int
-old_if_hit(struct application *ap, struct partition *part_head, struct seg
*UNUSED(finished_segs))
+if_hit(struct application *ap, struct partition *part_head, struct seg
*UNUSED(finished_segs))
{
char regionPN[512] = {0};
const char *val;
fastf_t ar = azimuth() * DEG2RAD;
fastf_t er = elevation() * DEG2RAD;
- fastf_t old_get_obliq(fastf_t *ray, fastf_t *normal);
+ fastf_t get_obliq(fastf_t *ray, fastf_t *normal);
int i;
int need_to_free = 0; /* Clean up the bu_vls? */
int part_nm = 0;
@@ -73,8 +73,8 @@
struct bu_vls claimant_list = BU_VLS_INIT_ZERO; /* Names of the
claiming regions */
struct bu_vls attr_vls = BU_VLS_INIT_ZERO;
- old_report(FMT_RAY);
- old_report(FMT_HEAD);
+ report(FMT_RAY);
+ report(FMT_HEAD);
if (overlap_claims == OVLP_REBUILD_FASTGEN)
rt_rebuild_overlaps(part_head, ap, 1);
else if (overlap_claims == OVLP_REBUILD_ALL)
@@ -138,7 +138,7 @@
part->pt_regionp->reg_los;
if (part_nm > 1) {
ValTab[VTI_GAP_LOS].value.fval = g_entry(D) - r_entry(D);
- if (ValTab[VTI_GAP_LOS].value.fval > 0) old_report(FMT_GAP);
+ if (ValTab[VTI_GAP_LOS].value.fval > 0) report(FMT_GAP);
}
bu_strlcpy(regionPN, part->pt_regionp->reg_name, sizeof(regionPN));
@@ -149,9 +149,9 @@
ValTab[VTI_SURF_NUM_IN].value.ival = part->pt_inhit->hit_surfno;
ValTab[VTI_SURF_NUM_OUT].value.ival = part->pt_outhit->hit_surfno;
ValTab[VTI_OBLIQ_IN].value.fval =
- old_get_obliq(ap->a_ray.r_dir, inormal);
+ get_obliq(ap->a_ray.r_dir, inormal);
ValTab[VTI_OBLIQ_OUT].value.fval =
- old_get_obliq(ap->a_ray.r_dir, onormal);
+ get_obliq(ap->a_ray.r_dir, onormal);
if (part->pt_overlap_reg == 0) {
ValTab[VTI_CLAIMANT_COUNT].value.ival = 1;
@@ -200,7 +200,7 @@
ValTab[VTI_ATTRIBUTES].value.sval = bu_vls_addr(&attr_vls);
/* Do the printing for this partition */
- old_report(FMT_PART);
+ report(FMT_PART);
if (need_to_free) {
bu_vls_free(&claimant_list);
@@ -208,7 +208,7 @@
need_to_free = 0;
}
- while ((ovp = old_find_ovlp(part)) != OVERLAP_NULL) {
+ while ((ovp = find_ovlp(part)) != OVERLAP_NULL) {
#ifdef NIRT_OVLP_PATH
ValTab[VTI_OV_REG1_NAME].value.sval = ovp->reg1->reg_name;
ValTab[VTI_OV_REG2_NAME].value.sval = ovp->reg2->reg_name;
@@ -236,7 +236,7 @@
ov_entry(D) = target(D) - ovp->in_dist;
ov_exit(D) = target(D) - ovp->out_dist;
ValTab[VTI_OV_LOS].value.fval = ov_entry(D) - ov_exit(D);
- old_report(FMT_OVLP);
+ report(FMT_OVLP);
#ifndef NIRT_OVLP_PATH
bu_free((void *)copy_ovlp_reg1, "copy_ovlp_reg1");
@@ -243,10 +243,10 @@
bu_free((void *)copy_ovlp_reg2, "copy_ovlp_reg2");
#endif
- old_del_ovlp(ovp);
+ del_ovlp(ovp);
}
}
- old_report(FMT_FOOT);
+ report(FMT_FOOT);
if (ovlp_list.forw != &ovlp_list) {
fprintf(stderr, "Previously unreported overlaps. Shouldn't happen\n");
@@ -264,10 +264,10 @@
int
-old_if_miss(struct application *UNUSED(ap))
+if_miss(struct application *UNUSED(ap))
{
- old_report(FMT_RAY);
- old_report(FMT_MISS);
+ report(FMT_RAY);
+ report(FMT_MISS);
return MISS;
}
@@ -280,7 +280,7 @@
*
*/
int
-old_if_overlap(struct application *ap, struct partition *pp, struct region
*reg1, struct region *reg2, struct partition *InputHdp)
+if_overlap(struct application *ap, struct partition *pp, struct region *reg1,
struct region *reg2, struct partition *InputHdp)
{
overlap *new_ovlp;
@@ -309,7 +309,7 @@
fastf_t
-old_get_obliq(fastf_t *ray, fastf_t *normal)
+get_obliq(fastf_t *ray, fastf_t *normal)
{
fastf_t cos_obl;
fastf_t obliquity;
@@ -340,7 +340,7 @@
overlap *
-old_find_ovlp(struct partition *pp)
+find_ovlp(struct partition *pp)
{
overlap *op;
@@ -356,7 +356,7 @@
void
-old_del_ovlp(overlap *op)
+del_ovlp(overlap *op)
{
op->forw->backw = op->backw;
op->backw->forw = op->forw;
@@ -365,7 +365,7 @@
void
-old_init_ovlp(void)
+init_ovlp(void)
{
ovlp_list.forw = ovlp_list.backw = &ovlp_list;
}
Modified: brlcad/trunk/src/nirt/interact.c
===================================================================
--- brlcad/trunk/src/nirt/interact.c 2018-02-13 14:39:25 UTC (rev 70700)
+++ brlcad/trunk/src/nirt/interact.c 2018-02-13 14:47:51 UTC (rev 70701)
@@ -85,7 +85,7 @@
* the key word, the command is executed.
*/
void
-old_interact(int input_source, void *sPtr, struct rt_i *rtip)
+interact(int input_source, void *sPtr, struct rt_i *rtip)
{
int Ch; /* individual characters of the input line */
int Prev_ch=0; /* previous character */
@@ -178,7 +178,7 @@
if (nirt_debug & DEBUG_INTERACT)
bu_log("Line buffer contains '%s'\n", line_buffer);
- ctp = old_get_comtab_ent(line_buffer, key_len);
+ ctp = get_comtab_ent(line_buffer, key_len);
if (ctp == CT_NULL) {
line_buffer[key_len] = '\0';
fprintf(stderr,
@@ -193,7 +193,7 @@
com_table *
-old_get_comtab_ent(char *pattern, int pat_len)
+get_comtab_ent(char *pattern, int pat_len)
{
com_table *ctp;
int len;
Modified: brlcad/trunk/src/nirt/nirt.c
===================================================================
--- brlcad/trunk/src/nirt/nirt.c 2018-02-13 14:39:25 UTC (rev 70700)
+++ brlcad/trunk/src/nirt/nirt.c 2018-02-13 14:47:51 UTC (rev 70701)
@@ -49,27 +49,27 @@
int need_prep = 1;
const com_table ComTab[] = {
- { "attr", old_cm_attr, "select attributes", "<-f(flush) | -p(print) |
attribute_name>" },
- { "ae", old_az_el, "set/query azimuth and elevation", "azimuth elevation"
},
- { "dir", old_dir_vect, "set/query direction vector", "x-component
y-component z-component" },
- { "hv", old_grid_coor, "set/query gridplane coordinates", "horz vert
[dist]" },
- { "xyz", old_target_coor, "set/query target coordinates", "X Y Z" },
- { "s", old_shoot, "shoot a ray at the target", NULL },
- { "backout", old_backout, "back out of model", NULL },
- { "useair", old_use_air, "set/query use of air", "<0|1|2|...>" },
- { "units", old_nirt_units, "set/query local units", "<mm|cm|m|in|ft>" },
- { "overlap_claims", old_do_overlap_claims, "set/query overlap
rebuilding/retention", "<0|1|2|3>" },
- { "fmt", old_format_output, "set/query output formats", "{rhpfmog} format
item item ..." },
- { "dest", old_direct_output, "set/query output destination", "file/pipe" },
- { "statefile", old_state_file, "set/query name of state file", "file" },
- { "dump", old_dump_state, "write current state of NIRT to the state file",
NULL },
- { "load", old_load_state, "read new state for NIRT from the state file",
NULL },
- { "print", old_print_item, "query an output item", "item" },
- { "bot_minpieces", old_bot_minpieces, "Get/Set value for rt_bot_minpieces
(0 means do not use pieces, default is 32)", "min_pieces" },
- { "libdebug", old_cm_libdebug, "set/query librt debug flags",
"hex_flag_value" },
- { "debug", old_cm_debug, "set/query nirt debug flags", "hex_flag_value" },
- { "q", old_quit, "quit", NULL },
- { "?", old_show_menu, "display this help menu", NULL },
+ { "attr", cm_attr, "select attributes", "<-f(flush) | -p(print) |
attribute_name>" },
+ { "ae", az_el, "set/query azimuth and elevation", "azimuth elevation" },
+ { "dir", dir_vect, "set/query direction vector", "x-component y-component
z-component" },
+ { "hv", grid_coor, "set/query gridplane coordinates", "horz vert [dist]" },
+ { "xyz", target_coor, "set/query target coordinates", "X Y Z" },
+ { "s", shoot, "shoot a ray at the target", NULL },
+ { "backout", backout, "back out of model", NULL },
+ { "useair", use_air, "set/query use of air", "<0|1|2|...>" },
+ { "units", nirt_units, "set/query local units", "<mm|cm|m|in|ft>" },
+ { "overlap_claims", do_overlap_claims, "set/query overlap
rebuilding/retention", "<0|1|2|3>" },
+ { "fmt", format_output, "set/query output formats", "{rhpfmog} format item
item ..." },
+ { "dest", direct_output, "set/query output destination", "file/pipe" },
+ { "statefile", state_file, "set/query name of state file", "file" },
+ { "dump", dump_state, "write current state of NIRT to the state file",
NULL },
+ { "load", load_state, "read new state for NIRT from the state file", NULL
},
+ { "print", print_item, "query an output item", "item" },
+ { "bot_minpieces", bot_minpieces, "Get/Set value for rt_bot_minpieces (0
means do not use pieces, default is 32)", "min_pieces" },
+ { "libdebug", cm_libdebug, "set/query librt debug flags", "hex_flag_value"
},
+ { "debug", cm_debug, "set/query nirt debug flags", "hex_flag_value" },
+ { "q", quit, "quit", NULL },
+ { "?", show_menu, "display this help menu", NULL },
{ (char *)NULL, NULL, (char *)NULL, (char *)NULL }
};
@@ -103,7 +103,7 @@
char *db_name;
-void old_printusage(void)
+void printusage(void)
{
bu_log("Usage: 'nirt [options] model.g objects...'\n");
bu_log("Options:\n");
@@ -177,7 +177,7 @@
}
void
-old_attrib_print(void)
+attrib_print(void)
{
int i;
@@ -191,7 +191,7 @@
* flush the list of desired attributes
*/
void
-old_attrib_flush(void)
+attrib_flush(void)
{
int i;
@@ -202,7 +202,7 @@
void
-old_attrib_add(char *a, int *prep)
+attrib_add(char *a, int *prep)
{
char *p;
@@ -281,7 +281,7 @@
* text is for the title line
*/
static void
-old_show_scripts(struct bu_list *sl, char *text)
+show_scripts(struct bu_list *sl, char *text)
{
int i;
struct script_rec *srp;
@@ -321,7 +321,7 @@
FILE *fPtr;
if (nirt_debug & DEBUG_SCRIPTS)
- old_show_scripts(sl, "before running them");
+ show_scripts(sl, "before running them");
while (BU_LIST_WHILE(srp, script_rec, sl)) {
BU_LIST_DEQUEUE(&(srp->l));
@@ -337,13 +337,13 @@
switch (srp->sr_type) {
case READING_STRING:
- old_interact(READING_STRING, cp, rtip);
+ interact(READING_STRING, cp, rtip);
break;
case READING_FILE:
if ((fPtr = fopen(cp, "rb")) == NULL) {
bu_log("Cannot open script file '%s'\n", cp);
} else {
- old_interact(READING_FILE, fPtr, rtip);
+ interact(READING_FILE, fPtr, rtip);
fclose(fPtr);
}
break;
@@ -354,7 +354,7 @@
}
if (nirt_debug & DEBUG_SCRIPTS)
- old_show_scripts(sl, "after running them");
+ show_scripts(sl, "after running them");
}
@@ -380,9 +380,9 @@
extern outval ValTab[];
/* from if.c, callback functions for overlap, hit, and miss shots */
- int old_if_overlap(struct application *, struct partition *, struct region
*, struct region *, struct partition *);
- int old_if_hit(struct application *, struct partition *, struct seg *);
- int old_if_miss(struct application *);
+ int if_overlap(struct application *, struct partition *, struct region *,
struct region *, struct partition *);
+ int if_hit(struct application *, struct partition *, struct seg *);
+ int if_miss(struct application *);
BU_LIST_INIT(&script_list);
@@ -401,7 +401,7 @@
if (bu_optopt == '?') Ch='h';
switch (Ch) {
case 'A':
- old_attrib_add(bu_optarg, &need_prep);
+ attrib_add(bu_optarg, &need_prep);
break;
case 'B':
rt_bot_minpieces = atoi(bu_optarg);
@@ -414,23 +414,23 @@
break;
case 'E':
if (nirt_debug & DEBUG_SCRIPTS)
- old_show_scripts(&script_list, "before erasure");
+ show_scripts(&script_list, "before erasure");
while (BU_LIST_WHILE(srp, script_rec, &script_list)) {
BU_LIST_DEQUEUE(&(srp->l));
free_script(srp);
}
if (nirt_debug & DEBUG_SCRIPTS)
- old_show_scripts(&script_list, "after erasure");
+ show_scripts(&script_list, "after erasure");
break;
case 'e':
enqueue_script(&script_list, READING_STRING, bu_optarg);
if (nirt_debug & DEBUG_SCRIPTS)
- old_show_scripts(&script_list, "after enqueueing a
literal");
+ show_scripts(&script_list, "after enqueueing a literal");
break;
case 'f':
enqueue_script(&script_list, READING_FILE, bu_optarg);
if (nirt_debug & DEBUG_SCRIPTS)
- old_show_scripts(&script_list, "after enqueueing a file
name");
+ show_scripts(&script_list, "after enqueueing a file name");
break;
case 'L':
listformats(NULL);
@@ -469,13 +469,13 @@
}
break;
default:
- old_printusage();
+ printusage();
bu_exit (Ch != 'h', NULL);
}
} /* end while getopt */
if (argc - bu_optind < 2) {
- old_printusage();
+ printusage();
return 1;
}
@@ -595,7 +595,7 @@
rtip->rti_save_overlaps = (overlap_claims > 0);
++bu_optind;
- old_do_rt_gettrees(rtip, argv + bu_optind, argc - bu_optind, &need_prep);
+ do_rt_gettrees(rtip, argv + bu_optind, argc - bu_optind, &need_prep);
/* Initialize the table of resource structures */
rt_init_resource(&res_tab, 0, rtip);
@@ -602,9 +602,9 @@
/* initialization of the application structure */
RT_APPLICATION_INIT(&ap);
- ap.a_hit = old_if_hit; /* branch to if_hit routine */
- ap.a_miss = old_if_miss; /* branch to if_miss routine */
- ap.a_overlap = old_if_overlap;/* branch to if_overlap routine */
+ ap.a_hit = if_hit; /* branch to if_hit routine */
+ ap.a_miss = if_miss; /* branch to if_miss routine */
+ ap.a_overlap = if_overlap;/* branch to if_overlap routine */
ap.a_logoverlap = rt_silent_logoverlap;
ap.a_onehit = 0; /* continue through shotline after hit */
ap.a_resource = &res_tab;
@@ -623,11 +623,11 @@
grid(HORZ) = 0.0;
grid(VERT) = 0.0;
grid(DIST) = 0.0;
- old_grid2targ();
- old_set_diameter(rtip);
+ grid2targ();
+ set_diameter(rtip);
/* initialize the output specification */
- old_default_ospec();
+ default_ospec();
/* initialize NIRT's local units */
base2local = rtip->rti_dbip->dbi_base2local;
@@ -652,8 +652,8 @@
}
/* Run the run-time configuration file, if it exists */
- if ((fPtr = old_fopenrc()) != NULL) {
- old_interact(READING_FILE, fPtr, rtip);
+ if ((fPtr = fopenrc()) != NULL) {
+ interact(READING_FILE, fPtr, rtip);
fclose(fPtr);
}
@@ -662,10 +662,10 @@
/* Perform the user interface */
if (mat_flag) {
- old_read_mat(rtip);
+ read_mat(rtip);
return 0;
} else {
- old_interact(READING_FILE, stdin, rtip);
+ interact(READING_FILE, stdin, rtip);
}
return 0;
@@ -673,7 +673,7 @@
void
-old_do_rt_gettrees(struct rt_i *my_rtip, char **object_name, int nm_objects,
int *prep)
+do_rt_gettrees(struct rt_i *my_rtip, char **object_name, int nm_objects, int
*prep)
{
static char **prev_names = 0;
static int prev_nm = 0;
Modified: brlcad/trunk/src/nirt/nirt.h
===================================================================
--- brlcad/trunk/src/nirt/nirt.h 2018-02-13 14:39:25 UTC (rev 70700)
+++ brlcad/trunk/src/nirt/nirt.h 2018-02-13 14:47:51 UTC (rev 70701)
@@ -111,45 +111,45 @@
__BEGIN_DECLS
-extern void old_ae2dir(void);
-extern void old_attrib_add(char *a, int *prep);
-extern void old_attrib_flush(void);
-extern void old_attrib_print(void);
-extern void old_az_el(char *buffer, com_table *ctp, struct rt_i *rtip);
-extern void old_backout(char *buffer, com_table *ctp, struct rt_i *rtip);
-extern void old_bot_minpieces(char *buffer, com_table *ctp, struct rt_i *rtip);
-extern int old_check_conv_spec(outitem *oip);
-extern void old_default_ospec(void);
-extern void old_dir2ae(void);
-extern void old_dir_vect(char *buffer, com_table *ctp, struct rt_i *rtip);
-extern void old_direct_output(const char* buffer, com_table* ctp, struct rt_i
*rtip);
-extern void old_do_overlap_claims();
-extern void old_do_rt_gettrees(struct rt_i *, char **object_name, int
nm_objects, int *do_prep);
-extern void old_dump_state(const char* buffer, com_table* ctp, struct rt_i
*rtip);
-extern void old_format_output(const char* buffer, com_table* ctp, struct rt_i
*rtip);
-extern com_table *old_get_comtab_ent(char *pattern, int pat_len);
-extern void old_grid2targ(void);
-extern void old_grid_coor(char *buffer, com_table *ctp, struct rt_i *rtip);
-extern void old_interact(int input_source, void *sPtr, struct rt_i *rtip);
-extern void old_load_state(char *buffer, com_table *ctp, struct rt_i *rtip);
-extern void old_nirt_units();
-extern void old_print_item(char *buffer, com_table *ctp, struct rt_i *rtip);
-extern void old_printusage(void);
-extern void old_quit();
-extern void old_read_mat(struct rt_i *rtip);
-extern void old_report(int outcom_type);
-extern void old_set_diameter(struct rt_i *);
-extern void old_shoot(char *buffer, com_table *ctp, struct rt_i *rtip);
-extern void old_show_menu();
-extern void old_state_file(const char* buffer, com_table* ctp, struct rt_i
*rtip);
-extern void old_targ2grid(void);
-extern void old_target_coor(char *buffer, com_table *ctp, struct rt_i *rtip);
-extern void old_use_air(char *buffer, com_table *ctp, struct rt_i *rtip);
+extern void ae2dir(void);
+extern void attrib_add(char *a, int *prep);
+extern void attrib_flush(void);
+extern void attrib_print(void);
+extern void az_el(char *buffer, com_table *ctp, struct rt_i *rtip);
+extern void backout(char *buffer, com_table *ctp, struct rt_i *rtip);
+extern void bot_minpieces(char *buffer, com_table *ctp, struct rt_i *rtip);
+extern int check_conv_spec(outitem *oip);
+extern void default_ospec(void);
+extern void dir2ae(void);
+extern void dir_vect(char *buffer, com_table *ctp, struct rt_i *rtip);
+extern void direct_output(const char* buffer, com_table* ctp, struct rt_i
*rtip);
+extern void do_overlap_claims();
+extern void do_rt_gettrees(struct rt_i *, char **object_name, int nm_objects,
int *do_prep);
+extern void dump_state(const char* buffer, com_table* ctp, struct rt_i *rtip);
+extern void format_output(const char* buffer, com_table* ctp, struct rt_i
*rtip);
+extern com_table *get_comtab_ent(char *pattern, int pat_len);
+extern void grid2targ(void);
+extern void grid_coor(char *buffer, com_table *ctp, struct rt_i *rtip);
+extern void interact(int input_source, void *sPtr, struct rt_i *rtip);
+extern void load_state(char *buffer, com_table *ctp, struct rt_i *rtip);
+extern void nirt_units();
+extern void print_item(char *buffer, com_table *ctp, struct rt_i *rtip);
+extern void printusage(void);
+extern void quit();
+extern void read_mat(struct rt_i *rtip);
+extern void report(int outcom_type);
+extern void set_diameter(struct rt_i *);
+extern void shoot(char *buffer, com_table *ctp, struct rt_i *rtip);
+extern void show_menu();
+extern void state_file(const char* buffer, com_table* ctp, struct rt_i *rtip);
+extern void targ2grid(void);
+extern void target_coor(char *buffer, com_table *ctp, struct rt_i *rtip);
+extern void use_air(char *buffer, com_table *ctp, struct rt_i *rtip);
/* main driver needs to get at these, even though they're command-specific */
-extern void old_cm_libdebug();
-extern void old_cm_debug();
-extern void old_cm_attr();
+extern void cm_libdebug();
+extern void cm_debug();
+extern void cm_attr();
__END_DECLS
Modified: brlcad/trunk/src/nirt/parse_fmt.c
===================================================================
--- brlcad/trunk/src/nirt/parse_fmt.c 2018-02-13 14:39:25 UTC (rev 70700)
+++ brlcad/trunk/src/nirt/parse_fmt.c 2018-02-13 14:47:51 UTC (rev 70701)
@@ -130,7 +130,7 @@
"\"\""
};
-void old_free_ospec(outitem *oil);
+void free_ospec(outitem *oil);
extern double base2local;
extern struct application ap;
@@ -140,7 +140,7 @@
void
-old_format_output (const char* buffer, com_table* ctp, struct rt_i
*UNUSED(rtip))
+format_output (const char* buffer, com_table* ctp, struct rt_i *UNUSED(rtip))
{
const char* bp = buffer; /* was + 1; */
int fmt_type = FMT_NONE;
@@ -147,8 +147,8 @@
int i;
int use_defaults = 0;
- void old_parse_fmt(const char* uoutspec, int outcom_type);
- void old_show_ospec(outitem *oil);
+ void parse_fmt(const char* uoutspec, int outcom_type);
+ void show_ospec(outitem *oil);
/* Handle no args, arg=='?', and obvious bad arg */
if (*bp != '\0')
@@ -189,7 +189,7 @@
if (fmt_type == FMT_NONE)
fprintf(stderr, "Error: No output-statement type specified\n");
else
- old_show_ospec(oi_list[fmt_type]);
+ show_ospec(oi_list[fmt_type]);
return;
case '"':
if (fmt_type == FMT_NONE) {
@@ -212,13 +212,13 @@
if (use_defaults) {
if (fmt_type == FMT_NONE) {
for (i = 0; i < FMT_NONE; ++i) {
- old_parse_fmt(def_fmt[i], i);
+ parse_fmt(def_fmt[i], i);
}
} else {
- old_parse_fmt(def_fmt[fmt_type], fmt_type);
+ parse_fmt(def_fmt[fmt_type], fmt_type);
}
} else {
- old_parse_fmt(bp, fmt_type);
+ parse_fmt(bp, fmt_type);
}
}
@@ -228,7 +228,7 @@
* outcom_type is the type of output command
*/
void
-old_parse_fmt(const char *uoutspec, int outcom_type)
+parse_fmt(const char *uoutspec, int outcom_type)
{
char *of; /* Format for current output item */
char *up;
@@ -369,12 +369,12 @@
return;
}
- old_check_conv_spec(oil);
+ check_conv_spec(oil);
/* We are now satisfied that oil is a valid list of output items,
* so it's time to install it as such
*/
- old_free_ospec(oi_list[outcom_type]);
+ free_ospec(oi_list[outcom_type]);
oi_list[outcom_type] = oil;
bu_free(mycopy, "Copy of user's output spec");
@@ -381,13 +381,13 @@
}
void
-old_default_ospec (void)
+default_ospec (void)
{
int i;
for (i = 0; i < FMT_NONE; ++i) {
oi_list[i] = OUTITEM_NULL;
- old_parse_fmt(def_fmt[i], i);
+ parse_fmt(def_fmt[i], i);
}
}
@@ -396,7 +396,7 @@
* oil is a list of output items
*/
void
-old_show_ospec (outitem *oil)
+show_ospec (outitem *oil)
{
outitem *oip; /* Pointer into list of output items */
char *c;
@@ -424,7 +424,7 @@
void
-old_report(int outcom_type)
+report(int outcom_type)
{
outitem *oip;
@@ -466,7 +466,7 @@
void
-old_print_item (char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
+print_item (char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
{
char *bp = buffer;
char *bp0;
@@ -532,7 +532,7 @@
}
FILE *
-old_fopenrc(void)
+fopenrc(void)
{
char *rc_file_name;
char *home;
@@ -552,7 +552,7 @@
}
int
-old_check_conv_spec(outitem *oip)
+check_conv_spec(outitem *oip)
{
char *cp;
int oi_type;
@@ -645,7 +645,7 @@
void
-old_direct_output(const char *buffer, com_table *ctp, struct rt_i
*UNUSED(rtip))
+direct_output(const char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
{
size_t i = 0; /* current position on the *buffer */
size_t j = 0; /* position of last non-whitespace char in the *buffer
*/
@@ -733,7 +733,7 @@
void
-old_state_file(const char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
+state_file(const char *buffer, com_table *ctp, struct rt_i *UNUSED(rtip))
{
int i = 0; /* current position on the *buffer */
static char *new_name;
@@ -769,7 +769,7 @@
void
-old_dump_state(const char *UNUSED(buffer), com_table *UNUSED(ctp), struct rt_i
*UNUSED(rtip))
+dump_state(const char *UNUSED(buffer), com_table *UNUSED(ctp), struct rt_i
*UNUSED(rtip))
{
char *c;
static const char fmt_char[] = {'r', 'h', 'p', 'f', 'm', 'o', 'g'};
@@ -817,7 +817,7 @@
void
-old_load_state(char *UNUSED(buffer), com_table *UNUSED(ctp), struct rt_i *rtip)
+load_state(char *UNUSED(buffer), com_table *UNUSED(ctp), struct rt_i *rtip)
{
FILE *sfPtr;
@@ -826,7 +826,7 @@
return;
}
bu_log("Loading NIRT state from file '%s'...", sf_name);
- old_interact(READING_FILE, sfPtr, rtip);
+ interact(READING_FILE, sfPtr, rtip);
bu_log("\n");
fclose(sfPtr);
}
@@ -836,7 +836,7 @@
* oil is a list of output items
*/
void
-old_free_ospec (outitem *oil)
+free_ospec (outitem *oil)
{
outitem *next = oil; /* Pointer to next output item */
outitem *oip; /* Pointer to output item to free */
Modified: brlcad/trunk/src/nirt/read_mat.c
===================================================================
--- brlcad/trunk/src/nirt/read_mat.c 2018-02-13 14:39:25 UTC (rev 70700)
+++ brlcad/trunk/src/nirt/read_mat.c 2018-02-13 14:47:51 UTC (rev 70701)
@@ -51,7 +51,7 @@
extern outval ValTab[];
extern int nirt_debug;
-void old_read_mat (struct rt_i *rtip)
+void read_mat (struct rt_i *rtip)
{
double scan[16] = MAT_INIT_ZERO;
char *buf;
@@ -110,10 +110,10 @@
direct(Y) = -m[9];
direct(Z) = -m[10];
- old_dir2ae();
+ dir2ae();
- old_targ2grid();
- old_shoot("", 0, rtip);
+ targ2grid();
+ shoot("", 0, rtip);
}
/*
Modified: brlcad/trunk/src/nirt/usrfmt.h
===================================================================
--- brlcad/trunk/src/nirt/usrfmt.h 2018-02-13 14:39:25 UTC (rev 70700)
+++ brlcad/trunk/src/nirt/usrfmt.h 2018-02-13 14:47:51 UTC (rev 70701)
@@ -64,7 +64,7 @@
struct ovlp_tag *backw;
} overlap;
-extern FILE *old_fopenrc(void);
+extern FILE *fopenrc(void);
/* Codes for output-item data types */
#define OIT_INT 0
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
