Revision: 54182
http://brlcad.svn.sourceforge.net/brlcad/?rev=54182&view=rev
Author: n_reed
Date: 2013-01-16 00:12:45 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
fix usage of 3D point macros on 2D points
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/sketch/sketch_tess.cpp
Modified: brlcad/trunk/src/librt/primitives/sketch/sketch_tess.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/sketch/sketch_tess.cpp 2013-01-15
22:04:32 UTC (rev 54181)
+++ brlcad/trunk/src/librt/primitives/sketch/sketch_tess.cpp 2013-01-16
00:12:45 UTC (rev 54182)
@@ -243,6 +243,12 @@
#define SKETCH_PT(idx) sketch_ip->verts[(idx)]
+#define DIST_PT2D_PT2D_SQ(_p1, _p2) \
+ (((_p2)[X] - (_p1)[X]) * ((_p2)[X] - (_p1)[X]) + \
+ ((_p2)[Y] - (_p1)[Y]) * ((_p2)[Y] - (_p1)[Y]))
+
+#define DIST_PT2D_PT2D(_p1, _p2) sqrt(DIST_PT2D_PT2D_SQ(_p1, _p2))
+
/**
* R T _ S K E T C H _ S U R F _ A R E A
*
@@ -298,13 +304,13 @@
csg = (struct carc_seg *)lng;
if (csg->radius < 0) {
// calculate full circle area
- carc_area += M_PI * DIST_PT_PT_SQ(SKETCH_PT(csg->start),
SKETCH_PT(csg->end));
+ carc_area += M_PI * DIST_PT2D_PT2D_SQ(SKETCH_PT(csg->start),
SKETCH_PT(csg->end));
} else {
fastf_t theta, side_ratio;
// calculate area for polygon edge
poly_area += V2CROSS(SKETCH_PT(csg->start),
SKETCH_PT(csg->end));
// calculate area for circular segment
- side_ratio = DIST_PT_PT(SKETCH_PT(csg->start),
SKETCH_PT(csg->end)) / (2.0 * csg->radius);
+ side_ratio = DIST_PT2D_PT2D(SKETCH_PT(csg->start),
SKETCH_PT(csg->end)) / (2.0 * csg->radius);
theta = asin(side_ratio);
carc_area += 0.5 * csg->radius * csg->radius * (theta -
side_ratio);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Master Java SE, Java EE, Eclipse, Spring, Hibernate, JavaScript, jQuery
and much more. Keep your Java skills current with LearnJavaNow -
200+ hours of step-by-step video tutorials by Java experts.
SALE $49.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122612
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
