Revision: 76606
http://sourceforge.net/p/brlcad/code/76606
Author: starseeker
Date: 2020-07-31 01:43:25 +0000 (Fri, 31 Jul 2020)
Log Message:
-----------
reduce parameter count
Modified Paths:
--------------
brlcad/branches/bioh/src/libged/display_list.c
brlcad/branches/bioh/src/libged/draw/draw.c
brlcad/branches/bioh/src/libged/ged_private.h
brlcad/branches/bioh/src/libged/kill/kill.c
brlcad/branches/bioh/src/libged/killrefs/killrefs.c
brlcad/branches/bioh/src/libged/killtree/killtree.c
brlcad/branches/bioh/src/mged/dodraw.c
Modified: brlcad/branches/bioh/src/libged/display_list.c
===================================================================
--- brlcad/branches/bioh/src/libged/display_list.c 2020-07-30 21:37:40 UTC
(rev 76605)
+++ brlcad/branches/bioh/src/libged/display_list.c 2020-07-31 01:43:25 UTC
(rev 76606)
@@ -334,9 +334,11 @@
*
*/
void
-_dl_eraseAllNamesFromDisplay(struct bu_list *hdlp, struct db_i *dbip,
- void (*callback)(unsigned int, int), const char *name, const
int skip_first, struct solid *freesolid)
+_dl_eraseAllNamesFromDisplay(struct ged *gedp, const char *name, const int
skip_first)
{
+ 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;
@@ -362,7 +364,7 @@
}
if (BU_STR_EQUAL(tok, name)) {
- _dl_freeDisplayListItem(dbip, callback, gdlp, freesolid);
+ _dl_freeDisplayListItem(dbip, gedp->ged_free_vlist_callback,
gdlp, freesolid);
found = 1;
break;
@@ -376,7 +378,7 @@
struct db_full_path subpath;
if (db_string_to_path(&subpath, dbip, name) == 0) {
- eraseAllSubpathsFromSolidList(gdlp, &subpath, callback,
skip_first, freesolid);
+ eraseAllSubpathsFromSolidList(gdlp, &subpath,
gedp->ged_free_vlist_callback, skip_first, freesolid);
db_free_full_path(&subpath);
}
}
@@ -929,8 +931,11 @@
int
-dl_redraw(struct display_list *gdlp, struct db_i *dbip, struct db_tree_state
*tsp, struct bview *gvp, void (*callback)(struct display_list *), int
skip_subtractions)
+dl_redraw(struct display_list *gdlp, struct ged *gedp, int skip_subtractions)
{
+ struct db_i *dbip = gedp->ged_wdbp->dbip;
+ struct db_tree_state *tsp = &gedp->ged_wdbp->wdb_initial_tree_state;
+ struct bview *gvp = gedp->ged_gvp;
int ret = 0;
struct solid *sp;
for (BU_LIST_FOR(sp, solid, &gdlp->dl_headSolid)) {
@@ -938,8 +943,7 @@
ret += redraw_solid(sp, dbip, tsp, gvp);
}
}
- if (callback != GED_CREATE_VLIST_CALLBACK_PTR_NULL)
- (*callback)(gdlp);
+ ged_create_vlist_cb(gedp, gdlp);
return ret;
}
Modified: brlcad/branches/bioh/src/libged/draw/draw.c
===================================================================
--- brlcad/branches/bioh/src/libged/draw/draw.c 2020-07-30 21:37:40 UTC (rev
76605)
+++ brlcad/branches/bioh/src/libged/draw/draw.c 2020-07-31 01:43:25 UTC (rev
76606)
@@ -903,7 +903,7 @@
continue;
}
- ret = dl_redraw(gdlp, gedp->ged_wdbp->dbip,
&gedp->ged_wdbp->wdb_initial_tree_state, gedp->ged_gvp,
gedp->ged_create_vlist_callback, dgcdp.draw_non_subtract_only);
+ ret = dl_redraw(gdlp, gedp, dgcdp.draw_non_subtract_only);
if (ret < 0) {
/* restore view bot threshold */
if (gedp && gedp->ged_gvp)
gedp->ged_gvp->gv_bot_threshold = threshold_cached;
@@ -1246,7 +1246,7 @@
/* redraw everything */
for (BU_LIST_FOR(gdlp, display_list, gedp->ged_gdp->gd_headDisplay))
{
- ret = dl_redraw(gdlp, gedp->ged_wdbp->dbip,
&gedp->ged_wdbp->wdb_initial_tree_state, gedp->ged_gvp,
gedp->ged_create_vlist_callback, 0);
+ ret = dl_redraw(gdlp, gedp, 0);
if (ret < 0) {
bu_vls_printf(gedp->ged_result_str, "%s: redraw failure\n",
argv[0]);
return GED_ERROR;
@@ -1282,7 +1282,7 @@
found_path = 1;
db_free_full_path(&dl_path);
- ret = dl_redraw(gdlp, gedp->ged_wdbp->dbip,
&gedp->ged_wdbp->wdb_initial_tree_state, gedp->ged_gvp,
gedp->ged_create_vlist_callback, 0);
+ ret = dl_redraw(gdlp, gedp, 0);
if (ret < 0) {
bu_vls_printf(gedp->ged_result_str,
"%s: %s redraw failure\n", argv[0], argv[i]);
Modified: brlcad/branches/bioh/src/libged/ged_private.h
===================================================================
--- brlcad/branches/bioh/src/libged/ged_private.h 2020-07-30 21:37:40 UTC
(rev 76605)
+++ brlcad/branches/bioh/src/libged/ged_private.h 2020-07-31 01:43:25 UTC
(rev 76606)
@@ -213,10 +213,9 @@
int validate);
/* defined in display_list.c */
-GED_EXPORT extern void _dl_eraseAllNamesFromDisplay(struct bu_list *hdlp,
struct db_i *dbip,
- void (*callback)(unsigned int, int),
+GED_EXPORT extern void _dl_eraseAllNamesFromDisplay(struct ged *gedp,
const char *name,
- const int skip_first, struct solid
*freesolid);
+ 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,
@@ -231,7 +230,7 @@
GED_EXPORT extern void dl_add_path(int dashflag, struct bu_list *vhead, const
struct db_full_path *pathp, struct db_tree_state *tsp, unsigned char
*wireframe_color_override, struct _ged_client_data *dgcdp);
-GED_EXPORT extern int dl_redraw(struct display_list *gdlp, struct db_i *dbip,
struct db_tree_state *tsp, struct bview *gvp, void (*callback)(struct
display_list *), int skip_subtractions);
+GED_EXPORT extern int dl_redraw(struct display_list *gdlp, struct ged *gedp,
int skip_subtractions);
GED_EXPORT extern union tree * append_solid_to_display_list(struct
db_tree_state *tsp, const struct db_full_path *pathp, struct rt_db_internal
*ip, void *client_data);
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);
Modified: brlcad/branches/bioh/src/libged/kill/kill.c
===================================================================
--- brlcad/branches/bioh/src/libged/kill/kill.c 2020-07-30 21:37:40 UTC (rev
76605)
+++ brlcad/branches/bioh/src/libged/kill/kill.c 2020-07-31 01:43:25 UTC (rev
76606)
@@ -107,7 +107,7 @@
if (is_phony)
continue;
- _dl_eraseAllNamesFromDisplay(gedp->ged_gdp->gd_headDisplay,
gedp->ged_wdbp->dbip, gedp->ged_free_vlist_callback, argv[i], 0,
gedp->freesolid);
+ _dl_eraseAllNamesFromDisplay(gedp, argv[i], 0);
if (db_delete(gedp->ged_wdbp->dbip, dp) != 0 ||
db_dirdelete(gedp->ged_wdbp->dbip, dp) != 0) {
/* Abort kill processing on first error */
Modified: brlcad/branches/bioh/src/libged/killrefs/killrefs.c
===================================================================
--- brlcad/branches/bioh/src/libged/killrefs/killrefs.c 2020-07-30 21:37:40 UTC
(rev 76605)
+++ brlcad/branches/bioh/src/libged/killrefs/killrefs.c 2020-07-31 01:43:25 UTC
(rev 76606)
@@ -69,7 +69,7 @@
if (!nflag && !gedp->ged_internal_call) {
for (k = 1; k < argc; k++)
- _dl_eraseAllNamesFromDisplay(gedp->ged_gdp->gd_headDisplay,
gedp->ged_wdbp->dbip, gedp->ged_free_vlist_callback, argv[k], 1,
gedp->freesolid);
+ _dl_eraseAllNamesFromDisplay(gedp, argv[k], 1);
}
ret = GED_OK;
Modified: brlcad/branches/bioh/src/libged/killtree/killtree.c
===================================================================
--- brlcad/branches/bioh/src/libged/killtree/killtree.c 2020-07-30 21:37:40 UTC
(rev 76605)
+++ brlcad/branches/bioh/src/libged/killtree/killtree.c 2020-07-31 01:43:25 UTC
(rev 76606)
@@ -111,7 +111,7 @@
bu_vls_printf(gktdp->gedp->ged_result_str, "%s ", dp->d_namep);
}
} else {
- _dl_eraseAllNamesFromDisplay(gktdp->gedp->ged_gdp->gd_headDisplay,
gktdp->gedp->ged_wdbp->dbip, gktdp->gedp->ged_free_vlist_callback, dp->d_namep,
0, gktdp->gedp->freesolid);
+ _dl_eraseAllNamesFromDisplay(gktdp->gedp, dp->d_namep, 0);
bu_vls_printf(gktdp->gedp->ged_result_str, "KILL %s: %s\n",
(dp->d_flags & RT_DIR_COMB) ? "COMB" : "Solid",
Modified: brlcad/branches/bioh/src/mged/dodraw.c
===================================================================
--- brlcad/branches/bioh/src/mged/dodraw.c 2020-07-30 21:37:40 UTC (rev
76605)
+++ brlcad/branches/bioh/src/mged/dodraw.c 2020-07-31 01:43:25 UTC (rev
76606)
@@ -61,7 +61,6 @@
if (BU_LIST_IS_EMPTY(&(vbp->head[i]))) continue;
snprintf(namebuf, sizeof(namebuf), "%s%lx", shortname, vbp->rgb[i]);
- //mged_invent_solid(GEDP->ged_gdp->gd_headDisplay, DBIP,
createDListSolid, GEDP->ged_free_vlist_callback, namebuf, &vbp->head[i],
vbp->rgb[i], copy, 1.0, 0, GEDP->freesolid, 0);
invent_solid(GEDP, namebuf, &vbp->head[i], vbp->rgb[i], copy, 1.0, 0,
0);
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
