Revision: 76607
http://sourceforge.net/p/brlcad/code/76607
Author: starseeker
Date: 2020-07-31 02:16:09 +0000 (Fri, 31 Jul 2020)
Log Message:
-----------
Collapse more function parameters
Modified Paths:
--------------
brlcad/branches/bioh/include/ged/view.h
brlcad/branches/bioh/src/libged/bigE/bigE.c
brlcad/branches/bioh/src/libged/display_list.c
brlcad/branches/bioh/src/libged/draw/draw.c
brlcad/branches/bioh/src/libged/erase/erase.c
brlcad/branches/bioh/src/libged/gdiff/gdiff.c
brlcad/branches/bioh/src/libged/ged_private.h
brlcad/branches/bioh/src/libged/remove/remove.c
brlcad/branches/bioh/src/libged/rtcheck/rtcheck.c
brlcad/branches/bioh/src/libged/zap/zap.c
Modified: brlcad/branches/bioh/include/ged/view.h
===================================================================
--- brlcad/branches/bioh/include/ged/view.h 2020-07-31 01:43:25 UTC (rev
76606)
+++ brlcad/branches/bioh/include/ged/view.h 2020-07-31 02:16:09 UTC (rev
76607)
@@ -64,12 +64,7 @@
/* defined in display_list.c */
GED_EXPORT void dl_set_iflag(struct bu_list *hdlp, int iflag);
GED_EXPORT extern void dl_color_soltab(struct bu_list *hdlp);
-GED_EXPORT extern void dl_erasePathFromDisplay(struct bu_list *hdlp,
- struct db_i *dbip,
- void (*callback)(unsigned int,
int),
- const char *path,
- int allow_split,
- struct solid *freesolid);
+GED_EXPORT extern void dl_erasePathFromDisplay(struct ged *gedp, const char
*path, int allow_split);
GED_EXPORT extern struct display_list *dl_addToDisplay(struct bu_list *hdlp,
struct db_i *dbip, const char *name);
GED_EXPORT extern int invent_solid(struct ged *gedp, char *name, struct
bu_list *vhead, long int rgb, int copy, fastf_t transparency, int dmode, int
csoltab);
Modified: brlcad/branches/bioh/src/libged/bigE/bigE.c
===================================================================
--- brlcad/branches/bioh/src/libged/bigE/bigE.c 2020-07-31 01:43:25 UTC (rev
76606)
+++ brlcad/branches/bioh/src/libged/bigE/bigE.c 2020-07-31 02:16:09 UTC (rev
76607)
@@ -2053,7 +2053,7 @@
av[1] = (char *)0;
for (i = 0; i < argc; ++i) {
- dl_erasePathFromDisplay(gedp->ged_gdp->gd_headDisplay,
gedp->ged_wdbp->dbip, gedp->ged_free_vlist_callback, argv[i], 0,
gedp->freesolid);
+ dl_erasePathFromDisplay(gedp, argv[i], 0);
dgcdp->gdlp = dl_addToDisplay(gedp->ged_gdp->gd_headDisplay,
gedp->ged_wdbp->dbip, argv[i]);
BU_ALLOC(dgcdp->ap, struct application);
Modified: brlcad/branches/bioh/src/libged/display_list.c
===================================================================
--- brlcad/branches/bioh/src/libged/display_list.c 2020-07-31 01:43:25 UTC
(rev 76606)
+++ brlcad/branches/bioh/src/libged/display_list.c 2020-07-31 02:16:09 UTC
(rev 76607)
@@ -204,10 +204,12 @@
*
*/
void
-dl_erasePathFromDisplay(struct bu_list *hdlp,
- struct db_i *dbip, void (*callback)(unsigned int, int),
- const char *path, int allow_split, struct solid *freesolid)
+dl_erasePathFromDisplay(struct ged *gedp, const char *path, int allow_split)
{
+ ged_free_vlist_callback_ptr callback = gedp->ged_free_vlist_callback;
+ struct bu_list *hdlp = gedp->ged_gdp->gd_headDisplay;
+ struct db_i *dbip = gedp->ged_wdbp->dbip;
+ struct solid *freesolid = gedp->freesolid;
struct display_list *gdlp;
struct display_list *next_gdlp;
struct display_list *last_gdlp;
@@ -364,7 +366,7 @@
}
if (BU_STR_EQUAL(tok, name)) {
- _dl_freeDisplayListItem(dbip, gedp->ged_free_vlist_callback,
gdlp, freesolid);
+ _dl_freeDisplayListItem(gedp, gdlp);
found = 1;
break;
@@ -441,15 +443,15 @@
* Erase/remove display list item from headDisplay if path is a subset of
item's path.
*/
void
-_dl_eraseAllPathsFromDisplay(struct bu_list *hdlp, struct db_i *dbip,
- void (*callback)(unsigned int, int),
- const char *path,
- const int skip_first,
- struct solid *freesolid)
+_dl_eraseAllPathsFromDisplay(struct ged *gedp, const char *path, const int
skip_first)
{
struct display_list *gdlp;
struct display_list *next_gdlp;
struct db_full_path fullpath, subpath;
+ ged_free_vlist_callback_ptr callback = gedp->ged_free_vlist_callback;
+ struct solid *freesolid = gedp->freesolid;
+ struct bu_list *hdlp = gedp->ged_gdp->gd_headDisplay;
+ struct db_i *dbip = gedp->ged_wdbp->dbip;
if (db_string_to_path(&subpath, dbip, path) == 0) {
gdlp = BU_LIST_NEXT(display_list, hdlp);
@@ -473,7 +475,7 @@
if (db_string_to_path(&fullpath, dbip, bu_vls_addr(&gdlp->dl_path))
== 0) {
if (db_full_path_subset(&fullpath, &subpath, skip_first)) {
- _dl_freeDisplayListItem(dbip, callback, gdlp, freesolid);
+ _dl_freeDisplayListItem(gedp, gdlp);
} else if (_dl_eraseFirstSubpath(hdlp, dbip, callback, gdlp,
&subpath, skip_first, freesolid)) {
gdlp = BU_LIST_NEXT(display_list, hdlp);
db_free_full_path(&fullpath);
@@ -492,10 +494,11 @@
void
-_dl_freeDisplayListItem (struct db_i *dbip,
- void (*callback)(unsigned int, int),
- struct display_list *gdlp, struct solid *freesolid)
+_dl_freeDisplayListItem (struct ged *gedp, struct display_list *gdlp)
{
+ struct db_i *dbip = gedp->ged_wdbp->dbip;
+ struct solid *freesolid = gedp->freesolid;
+ ged_free_vlist_callback_ptr callback = gedp->ged_free_vlist_callback;
struct solid *sp;
struct directory *dp;
@@ -1149,7 +1152,7 @@
* Name exists from some other overlay,
* zap any associated solids
*/
- dl_erasePathFromDisplay(hdlp, dbip, gedp->ged_free_vlist_callback,
name, 0, freesolid);
+ dl_erasePathFromDisplay(gedp, name, 0);
}
/* Need to enter phony name in directory structure */
dp = db_diradd(dbip, name, RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void
*)&type);
@@ -1280,8 +1283,11 @@
}
void
-dl_zap(struct bu_list *hdlp, struct db_i *dbip, void (*callback)(unsigned int,
int), struct solid *freesolid)
+dl_zap(struct ged *gedp, struct solid *freesolid)
{
+ ged_free_vlist_callback_ptr callback = gedp->ged_free_vlist_callback;
+ struct bu_list *hdlp = gedp->ged_gdp->gd_headDisplay;
+ struct db_i *dbip = gedp->ged_wdbp->dbip;
struct solid *sp = SOLID_NULL;
struct display_list *gdlp = NULL;
struct bu_ptbl dls = BU_PTBL_INIT_ZERO;
Modified: brlcad/branches/bioh/src/libged/draw/draw.c
===================================================================
--- brlcad/branches/bioh/src/libged/draw/draw.c 2020-07-31 01:43:25 UTC (rev
76606)
+++ brlcad/branches/bioh/src/libged/draw/draw.c 2020-07-31 02:16:09 UTC (rev
76607)
@@ -1134,7 +1134,7 @@
continue;
}
- dl_erasePathFromDisplay(gedp->ged_gdp->gd_headDisplay,
gedp->ged_wdbp->dbip, gedp->ged_free_vlist_callback, new_argv[i], 0,
gedp->freesolid);
+ dl_erasePathFromDisplay(gedp, new_argv[i], 0);
}
drawtrees_retval = _ged_drawtrees(gedp, new_argc, (const char
**)new_argv, kind, (struct _ged_client_data *)0);
@@ -1168,7 +1168,7 @@
continue;
}
- dl_erasePathFromDisplay(gedp->ged_gdp->gd_headDisplay,
gedp->ged_wdbp->dbip, gedp->ged_free_vlist_callback, argv[i], 0,
gedp->freesolid);
+ dl_erasePathFromDisplay(gedp, argv[i], 0);
}
/* if our display is non-empty add -R to keep current view */
Modified: brlcad/branches/bioh/src/libged/erase/erase.c
===================================================================
--- brlcad/branches/bioh/src/libged/erase/erase.c 2020-07-31 01:43:25 UTC
(rev 76606)
+++ brlcad/branches/bioh/src/libged/erase/erase.c 2020-07-31 02:16:09 UTC
(rev 76607)
@@ -74,7 +74,7 @@
if (strchr(argv[i], 'r')) {
for (i = 1; i < (size_t)argc; ++i)
- _dl_eraseAllPathsFromDisplay(gedp->ged_gdp->gd_headDisplay,
gedp->ged_wdbp->dbip, gedp->ged_free_vlist_callback, argv[i], 0,
gedp->freesolid);
+ _dl_eraseAllPathsFromDisplay(gedp, argv[i], 0);
return GED_OK;
}
@@ -166,11 +166,11 @@
if (new_argv[i][0] == '-')
continue;
- dl_erasePathFromDisplay(gedp->ged_gdp->gd_headDisplay,
gedp->ged_wdbp->dbip, gedp->ged_free_vlist_callback, new_argv[i], 1,
gedp->freesolid);
+ dl_erasePathFromDisplay(gedp, new_argv[i], 1);
}
} else {
for (i = 0; i < (size_t)argc; ++i)
- dl_erasePathFromDisplay(gedp->ged_gdp->gd_headDisplay,
gedp->ged_wdbp->dbip, gedp->ged_free_vlist_callback, argv[i], 1,
gedp->freesolid);
+ dl_erasePathFromDisplay(gedp, argv[i], 1);
}
return GED_OK;
Modified: brlcad/branches/bioh/src/libged/gdiff/gdiff.c
===================================================================
--- brlcad/branches/bioh/src/libged/gdiff/gdiff.c 2020-07-31 01:43:25 UTC
(rev 76606)
+++ brlcad/branches/bioh/src/libged/gdiff/gdiff.c 2020-07-31 02:16:09 UTC
(rev 76607)
@@ -177,11 +177,11 @@
/* Clear any previous diff drawing */
if (db_lookup(gedp->ged_wdbp->dbip, "diff_visualff", LOOKUP_QUIET)
!= RT_DIR_NULL)
- dl_erasePathFromDisplay(gedp->ged_gdp->gd_headDisplay,
gedp->ged_wdbp->dbip, gedp->ged_free_vlist_callback, "diff_visualff", 1,
gedp->freesolid);
+ dl_erasePathFromDisplay(gedp, "diff_visualff", 1);
if (db_lookup(gedp->ged_wdbp->dbip, "diff_visualff0000",
LOOKUP_QUIET) != RT_DIR_NULL)
- dl_erasePathFromDisplay(gedp->ged_gdp->gd_headDisplay,
gedp->ged_wdbp->dbip, gedp->ged_free_vlist_callback, "diff_visualff0000", 1,
gedp->freesolid);
+ dl_erasePathFromDisplay(gedp, "diff_visualff0000", 1);
if (db_lookup(gedp->ged_wdbp->dbip, "diff_visualffffff",
LOOKUP_QUIET) != RT_DIR_NULL)
- dl_erasePathFromDisplay(gedp->ged_gdp->gd_headDisplay,
gedp->ged_wdbp->dbip, gedp->ged_free_vlist_callback, "diff_visualffffff", 1,
gedp->freesolid);
+ dl_erasePathFromDisplay(gedp, "diff_visualffffff", 1);
/* Draw left-only lines */
if (view_left) {
Modified: brlcad/branches/bioh/src/libged/ged_private.h
===================================================================
--- brlcad/branches/bioh/src/libged/ged_private.h 2020-07-31 01:43:25 UTC
(rev 76606)
+++ brlcad/branches/bioh/src/libged/ged_private.h 2020-07-31 02:16:09 UTC
(rev 76607)
@@ -213,16 +213,9 @@
int validate);
/* defined in display_list.c */
-GED_EXPORT extern void _dl_eraseAllNamesFromDisplay(struct ged *gedp,
- const char *name,
- const int skip_first);
-GED_EXPORT extern void _dl_eraseAllPathsFromDisplay(struct bu_list *hdlp,
struct db_i *dbip,
- void (*callback)(unsigned int, int),
- const char *path,
- const int skip_first, struct solid
*freesolid);
-extern void _dl_freeDisplayListItem(struct db_i *dbip,
- void (*callback)(unsigned int, int),
- struct display_list *gdlp, struct solid
*freesolid);
+GED_EXPORT extern void _dl_eraseAllNamesFromDisplay(struct ged *gedp, const
char *name, const int skip_first);
+GED_EXPORT extern void _dl_eraseAllPathsFromDisplay(struct ged *gedp, const
char *path, const int skip_first);
+extern void _dl_freeDisplayListItem(struct ged *gedp, struct display_list
*gdlp);
extern int headsolid_splitGDL(struct bu_list *hdlp, struct db_i *dbip, struct
display_list *gdlp, struct db_full_path *path);
GED_EXPORT extern int dl_bounding_sph(struct bu_list *hdlp, vect_t *min,
vect_t *max, int pflag);
/* Returns a bu_ptbl of all solids referenced by the display list */
@@ -235,7 +228,7 @@
GED_EXPORT int dl_set_illum(struct display_list *gdlp, const char *obj, int
illum);
GED_EXPORT void dl_set_flag(struct bu_list *hdlp, int flag);
GED_EXPORT void dl_set_wflag(struct bu_list *hdlp, int wflag);
-GED_EXPORT void dl_zap(struct bu_list *hdlp, struct db_i *dbip, void
(*callback)(unsigned int, int), struct solid *freesolid);
+GED_EXPORT void dl_zap(struct ged *gedp, struct solid *freesolid);
GED_EXPORT int dl_how(struct bu_list *hdlp, struct bu_vls *vls, struct
directory **dpp, int both);
GED_EXPORT void dl_plot(struct bu_list *hdlp, FILE *fp, mat_t model2view, int
floating, mat_t center, fastf_t scale, int Three_D, int Z_clip);
GED_EXPORT void dl_png(struct bu_list *hdlp, mat_t model2view, fastf_t
perspective, vect_t eye_pos, size_t size, size_t half_size, unsigned char
**image);
Modified: brlcad/branches/bioh/src/libged/remove/remove.c
===================================================================
--- brlcad/branches/bioh/src/libged/remove/remove.c 2020-07-31 01:43:25 UTC
(rev 76606)
+++ brlcad/branches/bioh/src/libged/remove/remove.c 2020-07-31 02:16:09 UTC
(rev 76607)
@@ -89,7 +89,7 @@
struct bu_vls path = BU_VLS_INIT_ZERO;
bu_vls_printf(&path, "%s/%s", dp->d_namep, argv[i]);
- _dl_eraseAllPathsFromDisplay(gedp->ged_gdp->gd_headDisplay,
gedp->ged_wdbp->dbip, gedp->ged_free_vlist_callback, bu_vls_addr(&path), 0,
gedp->freesolid);
+ _dl_eraseAllPathsFromDisplay(gedp, bu_vls_addr(&path), 0);
bu_vls_free(&path);
bu_vls_printf(gedp->ged_result_str, "deleted %s/%s\n", dp->d_namep,
argv[i]);
num_deleted++;
Modified: brlcad/branches/bioh/src/libged/rtcheck/rtcheck.c
===================================================================
--- brlcad/branches/bioh/src/libged/rtcheck/rtcheck.c 2020-07-31 01:43:25 UTC
(rev 76606)
+++ brlcad/branches/bioh/src/libged/rtcheck/rtcheck.c 2020-07-31 02:16:09 UTC
(rev 76607)
@@ -118,8 +118,7 @@
const char *sname_obj = "OVERLAPSffff00";
struct directory *dp;
if ((dp = db_lookup(rtcp->gedp->ged_wdbp->dbip, sname_obj,
LOOKUP_QUIET)) != RT_DIR_NULL) {
- dl_erasePathFromDisplay(rtcp->gedp->ged_gdp->gd_headDisplay,
rtcp->gedp->ged_wdbp->dbip,
- rtcp->gedp->ged_free_vlist_callback, sname_obj, 0,
rtcp->gedp->freesolid);
+ dl_erasePathFromDisplay(rtcp->gedp, sname_obj, 0);
}
}
Modified: brlcad/branches/bioh/src/libged/zap/zap.c
===================================================================
--- brlcad/branches/bioh/src/libged/zap/zap.c 2020-07-31 01:43:25 UTC (rev
76606)
+++ brlcad/branches/bioh/src/libged/zap/zap.c 2020-07-31 02:16:09 UTC (rev
76607)
@@ -53,7 +53,7 @@
return GED_ERROR;
}
- dl_zap(gedp->ged_gdp->gd_headDisplay, gedp->ged_wdbp->dbip,
gedp->ged_free_vlist_callback, gedp->freesolid);
+ dl_zap(gedp, gedp->freesolid);
return GED_OK;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
