Revision: 52886
http://brlcad.svn.sourceforge.net/brlcad/?rev=52886&view=rev
Author: n_reed
Date: 2012-10-09 15:08:47 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
make sure connecting lines match up with ellipses
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/tgc/tgc.c
Modified: brlcad/trunk/src/librt/primitives/tgc/tgc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/tgc/tgc.c 2012-10-09 14:25:24 UTC (rev
52885)
+++ brlcad/trunk/src/librt/primitives/tgc/tgc.c 2012-10-09 15:08:47 UTC (rev
52886)
@@ -1863,7 +1863,7 @@
int
rt_tgc_adaptive_plot(struct rt_db_internal *ip, const struct rt_view_info
*info)
{
- fastf_t samples;
+ int samples;
struct rt_tgc_internal *tip;
struct ellipse ellipse1, ellipse2;
@@ -1873,9 +1873,12 @@
RT_TGC_CK_MAGIC(tip);
samples = sqrt(primitive_diagonal_samples(ip, info));
- if (samples < 6.0) {
- samples = 6.0;
+ if (samples % 2 != 0) {
+ ++samples;
}
+ if (samples < 6) {
+ samples = 6;
+ }
VMOVE(ellipse1.center, tip->v);
VMOVE(ellipse1.axis_a, tip->a);
@@ -1887,10 +1890,7 @@
VMOVE(ellipse2.axis_b, tip->d);
draw_ellipse(info->vhead, ellipse2, samples);
- samples /= 2.0;
- if (samples < 3.0) {
- samples = 3.0;
- }
+ samples /= 2;
draw_lines_between_ellipses(info->vhead, ellipse1, ellipse2, samples);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
