Revision: 75480
http://sourceforge.net/p/brlcad/code/75480
Author: starseeker
Date: 2020-04-21 10:53:07 +0000 (Tue, 21 Apr 2020)
Log Message:
-----------
Cherrypick r75470 - fix for transparency issue with awareness of solid editing
wireframes
Modified Paths:
--------------
brlcad/branches/RELEASE/src/libdm/dm-generic.c
brlcad/branches/RELEASE/src/mged/dozoom.c
Property Changed:
----------------
brlcad/branches/RELEASE/
Index: brlcad/branches/RELEASE
===================================================================
--- brlcad/branches/RELEASE 2020-04-21 00:13:24 UTC (rev 75479)
+++ brlcad/branches/RELEASE 2020-04-21 10:53:07 UTC (rev 75480)
Property changes on: brlcad/branches/RELEASE
___________________________________________________________________
Modified: svn:mergeinfo
## -6,4 +6,4 ##
/brlcad/branches/opencl:65867-66137
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
-/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-74976,74981,74991,75056,75325,75375,75377-75378,75387
\ No newline at end of property
+/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-74976,74981,74991,75056,75325,75375,75377-75378,75387,75470
\ No newline at end of property
Modified: brlcad/branches/RELEASE/src/libdm/dm-generic.c
===================================================================
--- brlcad/branches/RELEASE/src/libdm/dm-generic.c 2020-04-21 00:13:24 UTC
(rev 75479)
+++ brlcad/branches/RELEASE/src/libdm/dm-generic.c 2020-04-21 10:53:07 UTC
(rev 75480)
@@ -944,6 +944,8 @@
struct solid *sp;
fastf_t ratio;
int ndrawn = 0;
+ int opaque = 0;
+ int opaque_only = EQUAL(transparency_threshold, 1.0);
gdlp = BU_LIST_NEXT(display_list, dl);
while (BU_LIST_NOT_HEAD(gdlp, dl)) {
@@ -956,8 +958,17 @@
if ((sp->s_iflag == UP && !draw_edit) || (sp->s_iflag != UP &&
draw_edit))
continue;
- if (!((sp->s_transparency > transparency_threshold) ||
(EQUAL(sp->s_transparency, transparency_threshold))))
- continue;
+ opaque = EQUAL(sp->s_transparency, 1.0);
+ if (opaque_only) {
+ if (!opaque) {
+ continue;
+ }
+ } else {
+ /* transparent only */
+ if (opaque || !(sp->s_transparency > transparency_threshold ||
EQUAL(sp->s_transparency, transparency_threshold))) {
+ continue;
+ }
+ }
if (dm_get_bound_flag(dmp)) {
ratio = sp->s_size * inv_viewsize;
Modified: brlcad/branches/RELEASE/src/mged/dozoom.c
===================================================================
--- brlcad/branches/RELEASE/src/mged/dozoom.c 2020-04-21 00:13:24 UTC (rev
75479)
+++ brlcad/branches/RELEASE/src/mged/dozoom.c 2020-04-21 10:53:07 UTC (rev
75480)
@@ -35,10 +35,6 @@
#include "./sedit.h"
#include "./mged_dm.h"
-#if defined(HAVE_NEXTAFTER) && !defined(HAVE_DECL_NEXTAFTER)
-extern double nextafter(double x, double y);
-#endif
-
mat_t perspective_mat;
mat_t incr_change;
mat_t modelchanges;
@@ -182,7 +178,7 @@
/* Second, draw transparent stuff */
- ndrawn = dm_draw_display_list(DMP, GEDP->ged_gdp->gd_headDisplay,
nextafter(1.0, 0.0), inv_viewsize,
+ 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);
@@ -191,7 +187,7 @@
} else {
- ndrawn = dm_draw_display_list(DMP, GEDP->ged_gdp->gd_headDisplay, 0.0,
inv_viewsize,
+ 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);
@@ -233,7 +229,7 @@
color_scheme->cs_geo_hl[2], 1, 1.0);
- ndrawn = dm_draw_display_list(DMP, GEDP->ged_gdp->gd_headDisplay, -1.0,
inv_viewsize,
+ 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);
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
