Revision: 76603
http://sourceforge.net/p/brlcad/code/76603
Author: starseeker
Date: 2020-07-30 19:40:27 +0000 (Thu, 30 Jul 2020)
Log Message:
-----------
Reduce number of parameters passed to dl_add_path
Modified Paths:
--------------
brlcad/branches/bioh/src/libged/display_list.c
brlcad/branches/bioh/src/libged/ged_private.h
brlcad/branches/bioh/src/libged/ged_util.c
Modified: brlcad/branches/bioh/src/libged/display_list.c
===================================================================
--- brlcad/branches/bioh/src/libged/display_list.c 2020-07-30 19:10:07 UTC
(rev 76602)
+++ brlcad/branches/bioh/src/libged/display_list.c 2020-07-30 19:40:27 UTC
(rev 76603)
@@ -668,10 +668,10 @@
}
void
-dl_add_path(struct display_list *gdlp, int dashflag, fastf_t transparency, int
dmode, int hiddenLine, struct bu_list *vhead, const struct db_full_path *pathp,
struct db_tree_state *tsp, unsigned char *wireframe_color_override, void
(*callback)(struct solid *sp), struct solid *freesolid)
+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)
{
struct solid *sp;
- GET_SOLID(sp, &freesolid->l);
+ GET_SOLID(sp, &dgcdp->freesolid->l);
solid_append_vlist(sp, (struct bn_vlist *)vhead);
@@ -691,23 +691,21 @@
solid_set_color_info(sp, wireframe_color_override, tsp);
sp->s_dlist = 0;
- sp->s_transparency = transparency;
- sp->s_dmode = dmode;
- sp->s_hiddenLine = hiddenLine;
+ sp->s_transparency = dgcdp->transparency;
+ sp->s_dmode = dgcdp->dmode;
+ sp->s_hiddenLine = dgcdp->hiddenLine;
/* append solid to display list */
bu_semaphore_acquire(RT_SEM_MODEL);
- BU_LIST_APPEND(gdlp->dl_headSolid.back, &sp->l);
+ BU_LIST_APPEND(dgcdp->gdlp->dl_headSolid.back, &sp->l);
bu_semaphore_release(RT_SEM_MODEL);
- if (callback != GED_CREATE_VLIST_SOLID_CALLBACK_PTR_NULL) {
- (*callback)(sp);
+ if (dgcdp->gedp->ged_create_vlist_solid_callback !=
GED_CREATE_VLIST_SOLID_CALLBACK_PTR_NULL) {
+ (*dgcdp->gedp->ged_create_vlist_solid_callback)(sp);
}
}
-
-
static fastf_t
view_avg_size(struct bview *gvp)
{
Modified: brlcad/branches/bioh/src/libged/ged_private.h
===================================================================
--- brlcad/branches/bioh/src/libged/ged_private.h 2020-07-30 19:10:07 UTC
(rev 76602)
+++ brlcad/branches/bioh/src/libged/ged_private.h 2020-07-30 19:40:27 UTC
(rev 76603)
@@ -229,7 +229,7 @@
/* Returns a bu_ptbl of all solids referenced by the display list */
extern struct bu_ptbl *dl_get_solids(struct display_list *gdlp);
-GED_EXPORT extern void dl_add_path(struct display_list *gdlp, int dashflag,
fastf_t transparency, int dmode, int hiddenLine, struct bu_list *vhead, const
struct db_full_path *pathp, struct db_tree_state *tsp, unsigned char
*wireframe_color_override, void (*callback)(struct solid *), struct solid
*freesolid);
+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 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);
Modified: brlcad/branches/bioh/src/libged/ged_util.c
===================================================================
--- brlcad/branches/bioh/src/libged/ged_util.c 2020-07-30 19:10:07 UTC (rev
76602)
+++ brlcad/branches/bioh/src/libged/ged_util.c 2020-07-30 19:40:27 UTC (rev
76603)
@@ -1018,9 +1018,9 @@
wcolor[0] = (unsigned char)dgcdp->wireframe_color[0];
wcolor[1] = (unsigned char)dgcdp->wireframe_color[1];
wcolor[2] = (unsigned char)dgcdp->wireframe_color[2];
- dl_add_path(dgcdp->gdlp, dashflag, dgcdp->transparency, dgcdp->dmode,
dgcdp->hiddenLine, vhead, pathp, tsp, wcolor,
dgcdp->gedp->ged_create_vlist_solid_callback, dgcdp->freesolid);
+ dl_add_path(dashflag, vhead, pathp, tsp, wcolor, dgcdp);
} else {
- dl_add_path(dgcdp->gdlp, dashflag, dgcdp->transparency, dgcdp->dmode,
dgcdp->hiddenLine, vhead, pathp, tsp, NULL,
dgcdp->gedp->ged_create_vlist_solid_callback, dgcdp->freesolid);
+ dl_add_path(dashflag, vhead, pathp, tsp, NULL, dgcdp);
}
}
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
