Revision: 57142
http://sourceforge.net/p/brlcad/code/57142
Author: indianlarry
Date: 2013-08-26 16:21:57 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
Added buffer to a vlist point in the 'bound_solid' functions otherwise single
point would have zero dimension and dozoom() would always consider a speck and
not draw
Modified Paths:
--------------
brlcad/trunk/src/libged/dg_obj.c
brlcad/trunk/src/libged/draw.c
brlcad/trunk/src/mged/dodraw.c
Modified: brlcad/trunk/src/libged/dg_obj.c
===================================================================
--- brlcad/trunk/src/libged/dg_obj.c 2013-08-26 13:43:26 UTC (rev 57141)
+++ brlcad/trunk/src/libged/dg_obj.c 2013-08-26 16:21:57 UTC (rev 57142)
@@ -3319,6 +3319,8 @@
switch (*cmd) {
case BN_VLIST_POLY_START:
case BN_VLIST_POLY_VERTNORM:
+ case BN_VLIST_TRI_START:
+ case BN_VLIST_TRI_VERTNORM:
/* Has normal vector, not location */
break;
case BN_VLIST_LINE_MOVE:
@@ -3326,6 +3328,9 @@
case BN_VLIST_POLY_MOVE:
case BN_VLIST_POLY_DRAW:
case BN_VLIST_POLY_END:
+ case BN_VLIST_TRI_MOVE:
+ case BN_VLIST_TRI_DRAW:
+ case BN_VLIST_TRI_END:
V_MIN(xmin, (*pt)[X]);
V_MAX(xmax, (*pt)[X]);
V_MIN(ymin, (*pt)[Y]);
@@ -3333,6 +3338,14 @@
V_MIN(zmin, (*pt)[Z]);
V_MAX(zmax, (*pt)[Z]);
break;
+ case BN_VLIST_POINT_DRAW:
+ V_MIN(xmin, (*pt)[X]-1.0);
+ V_MAX(xmax, (*pt)[X]+1.0);
+ V_MIN(ymin, (*pt)[Y]-1.0);
+ V_MAX(ymax, (*pt)[Y]+1.0);
+ V_MIN(zmin, (*pt)[Z]-1.0);
+ V_MAX(zmax, (*pt)[Z]+1.0);
+ break;
default: {
struct bu_vls tmp_vls;
Modified: brlcad/trunk/src/libged/draw.c
===================================================================
--- brlcad/trunk/src/libged/draw.c 2013-08-26 13:43:26 UTC (rev 57141)
+++ brlcad/trunk/src/libged/draw.c 2013-08-26 16:21:57 UTC (rev 57142)
@@ -253,7 +253,6 @@
case BN_VLIST_TRI_MOVE:
case BN_VLIST_TRI_DRAW:
case BN_VLIST_TRI_END:
- case BN_VLIST_POINT_DRAW:
V_MIN(xmin, (*pt)[X]);
V_MAX(xmax, (*pt)[X]);
V_MIN(ymin, (*pt)[Y]);
@@ -261,6 +260,14 @@
V_MIN(zmin, (*pt)[Z]);
V_MAX(zmax, (*pt)[Z]);
break;
+ case BN_VLIST_POINT_DRAW:
+ V_MIN(xmin, (*pt)[X]-1.0);
+ V_MAX(xmax, (*pt)[X]+1.0);
+ V_MIN(ymin, (*pt)[Y]-1.0);
+ V_MAX(ymax, (*pt)[Y]+1.0);
+ V_MIN(zmin, (*pt)[Z]-1.0);
+ V_MAX(zmax, (*pt)[Z]+1.0);
+ break;
default:
bu_vls_printf(gedp->ged_result_str, "unknown vlist op
%d\n", *cmd);
}
@@ -1582,6 +1589,7 @@
int last_opt=0;
struct bu_vls vls = BU_VLS_INIT_ZERO;
static const char *usage = "<[-R -C#/#/# -s] objects> | <-o -A attribute
name/value pairs>";
+ int64_t elapsetime;
GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
GED_CHECK_DRAWABLE(gedp, GED_ERROR);
@@ -1596,6 +1604,7 @@
return GED_HELP;
}
+ elapsetime = bu_gettime();
/* skip past cmd */
--argc;
++argv;
@@ -1763,7 +1772,19 @@
_ged_drawtrees(gedp, argc, argv, kind, (struct _ged_client_data
*)0);
}
}
+ elapsetime = bu_gettime() - elapsetime;
+ {
+ int seconds = elapsetime / 1000000;
+ int minutes = seconds / 60;
+ int hours = minutes / 60;
+ minutes = minutes % 60;
+ seconds = seconds %60;
+
+ bu_vls_printf(gedp->ged_result_str, "Elapse time:
%02d:%02d:%02d\n", hours, minutes,seconds);
+ return GED_HELP;
+ }
+
return GED_OK;
}
Modified: brlcad/trunk/src/mged/dodraw.c
===================================================================
--- brlcad/trunk/src/mged/dodraw.c 2013-08-26 13:43:26 UTC (rev 57141)
+++ brlcad/trunk/src/mged/dodraw.c 2013-08-26 16:21:57 UTC (rev 57142)
@@ -154,7 +154,6 @@
case BN_VLIST_TRI_MOVE:
case BN_VLIST_TRI_DRAW:
case BN_VLIST_TRI_END:
- case BN_VLIST_POINT_DRAW:
V_MIN(xmin, (*pt)[X]);
V_MAX(xmax, (*pt)[X]);
V_MIN(ymin, (*pt)[Y]);
@@ -162,6 +161,14 @@
V_MIN(zmin, (*pt)[Z]);
V_MAX(zmax, (*pt)[Z]);
break;
+ case BN_VLIST_POINT_DRAW:
+ V_MIN(xmin, (*pt)[X]-1.0);
+ V_MAX(xmax, (*pt)[X]+1.0);
+ V_MIN(ymin, (*pt)[Y]-1.0);
+ V_MAX(ymax, (*pt)[Y]+1.0);
+ V_MIN(zmin, (*pt)[Z]-1.0);
+ V_MAX(zmax, (*pt)[Z]+1.0);
+ break;
default:
{
struct bu_vls tmp_vls = BU_VLS_INIT_ZERO;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
