Revision: 55619
http://sourceforge.net/p/brlcad/code/55619
Author: bob1961
Date: 2013-05-31 17:26:41 +0000 (Fri, 31 May 2013)
Log Message:
-----------
Initial min and max in pipe_elements_calculate(). Also removed the PIPE_MM
macro.
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/pipe/pipe.c
Modified: brlcad/trunk/src/librt/primitives/pipe/pipe.c
===================================================================
--- brlcad/trunk/src/librt/primitives/pipe/pipe.c 2013-05-31 16:56:12 UTC
(rev 55618)
+++ brlcad/trunk/src/librt/primitives/pipe/pipe.c 2013-05-31 17:26:41 UTC
(rev 55619)
@@ -134,8 +134,6 @@
};
-#define PIPE_MM(_v) VMINMAX((*min), (*max), _v)
-
#define PIPE_CONNECTING_ARCS 4 /* number of connecting arcs to draw between
points */
#define PIPE_CIRCLE_SEGS 16 /* number of segments used to plot a circle */
@@ -412,12 +410,12 @@
work[X] -= f;
work[Y] -= f;
work[Z] -= f;
- PIPE_MM(work);
+ VMINMAX(*min, *max, work);
VMOVE(work, bp->bend_bound_center);
work[X] += f;
work[Y] += f;
work[Z] += f;
- PIPE_MM(work);
+ VMINMAX(*min, *max, work);
if (head) {
BU_LIST_INSERT(head, &bp->l);
@@ -492,29 +490,29 @@
VSETALL(lp->pipe_max, -INFINITY);
VJOIN2(work, pt1, od1, v1, od1, v2);
- PIPE_MM(work);
+ VMINMAX(*min, *max, work);
VMINMAX(lp->pipe_min, lp->pipe_max, work);
VJOIN2(work, pt1, -od1, v1, od1, v2);
- PIPE_MM(work);
+ VMINMAX(*min, *max, work);
VMINMAX(lp->pipe_min, lp->pipe_max, work);
VJOIN2(work, pt1, od1, v1, -od1, v2);
- PIPE_MM(work);
+ VMINMAX(*min, *max, work);
VMINMAX(lp->pipe_min, lp->pipe_max, work);
VJOIN2(work, pt1, -od1, v1, -od1, v2);
- PIPE_MM(work);
+ VMINMAX(*min, *max, work);
VMINMAX(lp->pipe_min, lp->pipe_max, work);
VJOIN2(work, pt2, od2, v1, od2, v2);
- PIPE_MM(work);
+ VMINMAX(*min, *max, work);
VMINMAX(lp->pipe_min, lp->pipe_max, work);
VJOIN2(work, pt2, -od2, v1, od2, v2);
- PIPE_MM(work);
+ VMINMAX(*min, *max, work);
VMINMAX(lp->pipe_min, lp->pipe_max, work);
VJOIN2(work, pt2, od2, v1, -od2, v2);
- PIPE_MM(work);
+ VMINMAX(*min, *max, work);
VMINMAX(lp->pipe_min, lp->pipe_max, work);
VJOIN2(work, pt2, -od2, v1, -od2, v2);
- PIPE_MM(work);
+ VMINMAX(*min, *max, work);
VMINMAX(lp->pipe_min, lp->pipe_max, work);
if (head) {
@@ -538,6 +536,9 @@
pip = (struct rt_pipe_internal *)ip->idb_ptr;
RT_PIPE_CK_MAGIC(pip);
+ VSETALL(*min, INFINITY);
+ VSETALL(*max, -INFINITY);
+
if (BU_LIST_IS_EMPTY(&(pip->pipe_segs_head))) {
return;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite
It's a free troubleshooting tool designed for production
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap2
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
