Revision: 75269
http://sourceforge.net/p/brlcad/code/75269
Author: starseeker
Date: 2020-04-06 13:03:24 +0000 (Mon, 06 Apr 2020)
Log Message:
-----------
ws
Modified Paths:
--------------
brlcad/trunk/src/libdm/dm-generic.c
brlcad/trunk/src/mged/dozoom.c
Modified: brlcad/trunk/src/libdm/dm-generic.c
===================================================================
--- brlcad/trunk/src/libdm/dm-generic.c 2020-04-04 16:11:48 UTC (rev 75268)
+++ brlcad/trunk/src/libdm/dm-generic.c 2020-04-06 13:03:24 UTC (rev 75269)
@@ -836,7 +836,7 @@
* structure passed in here as "base" */
void
dm_generic_hook(const struct bu_structparse *sdp,
- const char *name, void *base, const char *value, void *data)
+ const char *name, void *base, const char *value, void *data)
{
if (data) {
struct dm_hook_data *hook= (struct dm_hook_data *)data;
@@ -850,7 +850,7 @@
int
dm_set_hook(const struct bu_structparse_map *map,
- const char *key, void *data, struct dm_hook_data *hook)
+ const char *key, void *data, struct dm_hook_data *hook)
{
if (UNLIKELY(!map || !key || !hook)) return -1;
hook->dm_hook = BU_STRUCTPARSE_FUNC_NULL;
@@ -889,36 +889,36 @@
* and into libdm. */
static int
dm_drawSolid(dm *dmp,
- struct solid *sp,
- short r,
- short g,
- short b,
- int draw_style,
- unsigned char *gdc)
+ struct solid *sp,
+ short r,
+ short g,
+ short b,
+ int draw_style,
+ unsigned char *gdc)
{
int ndrawn = 0;
if (sp->s_cflag) {
- if (!DM_SAME_COLOR(r, g, b, (short)gdc[0], (short)gdc[1],
(short)gdc[2])) {
- dm_set_fg(dmp, (short)gdc[0], (short)gdc[1], (short)gdc[2], 0,
sp->s_transparency);
- DM_COPY_COLOR(r, g, b, (short)gdc[0], (short)gdc[1],
(short)gdc[2]);
- }
+ if (!DM_SAME_COLOR(r, g, b, (short)gdc[0], (short)gdc[1],
(short)gdc[2])) {
+ dm_set_fg(dmp, (short)gdc[0], (short)gdc[1], (short)gdc[2], 0,
sp->s_transparency);
+ DM_COPY_COLOR(r, g, b, (short)gdc[0], (short)gdc[1], (short)gdc[2]);
+ }
} else {
- if (!DM_SAME_COLOR(r, g, b, (short)sp->s_color[0],
(short)sp->s_color[1], (short)sp->s_color[2])) {
- dm_set_fg(dmp, (short)sp->s_color[0], (short)sp->s_color[1],
(short)sp->s_color[2], 0, sp->s_transparency);
- DM_COPY_COLOR(r, g, b, (short)sp->s_color[0],
(short)sp->s_color[1], (short)sp->s_color[2]);
- }
+ if (!DM_SAME_COLOR(r, g, b, (short)sp->s_color[0],
(short)sp->s_color[1], (short)sp->s_color[2])) {
+ dm_set_fg(dmp, (short)sp->s_color[0], (short)sp->s_color[1],
(short)sp->s_color[2], 0, sp->s_transparency);
+ DM_COPY_COLOR(r, g, b, (short)sp->s_color[0],
(short)sp->s_color[1], (short)sp->s_color[2]);
+ }
}
if (dm_get_displaylist(dmp) && draw_style) {
- dm_draw_dlist(dmp, sp->s_dlist);
- sp->s_flag = UP;
- ndrawn++;
+ dm_draw_dlist(dmp, sp->s_dlist);
+ sp->s_flag = UP;
+ ndrawn++;
} else {
- if (dm_draw_vlist(dmp, (struct bn_vlist *)&sp->s_vlist) == BRLCAD_OK) {
- sp->s_flag = UP;
- ndrawn++;
- }
+ if (dm_draw_vlist(dmp, (struct bn_vlist *)&sp->s_vlist) == BRLCAD_OK) {
+ sp->s_flag = UP;
+ ndrawn++;
+ }
}
return ndrawn;
@@ -927,17 +927,17 @@
int
dm_draw_display_list(dm *dmp,
- struct bu_list *dl,
- fastf_t transparency_threshold,
- fastf_t inv_viewsize,
- short r, short g, short b,
- int line_width,
- int draw_style,
- int draw_edit,
- unsigned char *gdc,
- int solids_down,
- int mv_dlist
- )
+ struct bu_list *dl,
+ fastf_t transparency_threshold,
+ fastf_t inv_viewsize,
+ short r, short g, short b,
+ int line_width,
+ int draw_style,
+ int draw_edit,
+ unsigned char *gdc,
+ int solids_down,
+ int mv_dlist
+ )
{
struct display_list *gdlp;
struct display_list *next_gdlp;
Modified: brlcad/trunk/src/mged/dozoom.c
===================================================================
--- brlcad/trunk/src/mged/dozoom.c 2020-04-04 16:11:48 UTC (rev 75268)
+++ brlcad/trunk/src/mged/dozoom.c 2020-04-06 13:03:24 UTC (rev 75269)
@@ -164,8 +164,8 @@
/* First, draw opaque stuff */
ndrawn = dm_draw_display_list(DMP, GEDP->ged_gdp->gd_headDisplay, 1.0,
inv_viewsize,
- r, g, b, mged_variables->mv_linewidth, mged_variables->mv_dlist, 0,
- geometry_default_color, 1, mged_variables->mv_dlist);
+ r, g, b, mged_variables->mv_linewidth,
mged_variables->mv_dlist, 0,
+ geometry_default_color, 1,
mged_variables->mv_dlist);
/* The vectorThreshold stuff in libdm may turn the Tcl-crank causing
curr_dm_list to change. */
if (curr_dm_list != save_dm_list) curr_dm_list = save_dm_list;
@@ -180,8 +180,8 @@
/* Second, draw transparent stuff */
ndrawn = dm_draw_display_list(DMP, GEDP->ged_gdp->gd_headDisplay, 0.0,
inv_viewsize,
- r, g, b, mged_variables->mv_linewidth, mged_variables->mv_dlist, 0,
- geometry_default_color, 0, mged_variables->mv_dlist);
+ r, g, b, mged_variables->mv_linewidth,
mged_variables->mv_dlist, 0,
+ geometry_default_color, 0,
mged_variables->mv_dlist);
if (dm_get_transparency(DMP)) {
/* re-enable write of depth buffer */
@@ -197,9 +197,9 @@
/* draw predictor vlist */
if (mged_variables->mv_predictor) {
dm_set_fg(DMP,
- color_scheme->cs_predictor[0],
- color_scheme->cs_predictor[1],
- color_scheme->cs_predictor[2], 1, 1.0);
+ color_scheme->cs_predictor[0],
+ color_scheme->cs_predictor[1],
+ color_scheme->cs_predictor[2], 1, 1.0);
dm_draw_vlist(DMP, (struct bn_vlist *)&curr_dm_list->dml_p_vlist);
}
@@ -219,14 +219,14 @@
dm_loadmatrix(DMP, mat, which_eye);
inv_viewsize /= modelchanges[15];
dm_set_fg(DMP,
- color_scheme->cs_geo_hl[0],
- color_scheme->cs_geo_hl[1],
- color_scheme->cs_geo_hl[2], 1, 1.0);
+ color_scheme->cs_geo_hl[0],
+ color_scheme->cs_geo_hl[1],
+ color_scheme->cs_geo_hl[2], 1, 1.0);
ndrawn = dm_draw_display_list(DMP, GEDP->ged_gdp->gd_headDisplay, -1.0,
inv_viewsize,
- r, g, b, mged_variables->mv_linewidth, mged_variables->mv_dlist, 1,
- geometry_default_color, 0, mged_variables->mv_dlist);
+ r, g, b, mged_variables->mv_linewidth,
mged_variables->mv_dlist, 1,
+ geometry_default_color, 0,
mged_variables->mv_dlist);
curr_dm_list->dml_ndrawn += ndrawn;
@@ -271,8 +271,8 @@
FOR_ALL_DISPLAYS(dlp, &head_dm_list.l) {
if (dlp->dml_mapped &&
- dm_get_displaylist(dlp->dml_dmp) &&
- dlp->dml_mged_variables->mv_dlist) {
+ dm_get_displaylist(dlp->dml_dmp) &&
+ dlp->dml_mged_variables->mv_dlist) {
if (sp->s_dlist == 0)
sp->s_dlist = dm_gen_dlists(DMP, 1);
@@ -282,9 +282,9 @@
(void)dm_set_fg(DMP, 255, 255, 255, 0, sp->s_transparency);
else
(void)dm_set_fg(DMP,
- (unsigned char)sp->s_color[0],
- (unsigned char)sp->s_color[1],
- (unsigned char)sp->s_color[2], 0, sp->s_transparency);
+ (unsigned char)sp->s_color[0],
+ (unsigned char)sp->s_color[1],
+ (unsigned char)sp->s_color[2], 0,
sp->s_transparency);
(void)dm_draw_vlist(DMP, (struct bn_vlist *)&sp->s_vlist);
(void)dm_end_dlist(DMP);
}
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
