Thread: [brlcad-commits] SF.net SVN: brlcad:[32127] brlcad/trunk/src/librt/primitives

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 32127
          http://brlcad.svn.sourceforge.net/brlcad/?rev=32127&view=rev
Author:   pacman87
Date:     2008-07-30 06:21:54 +0000 (Wed, 30 Jul 2008)

Log Message:
-----------
change revolve to use a union instead of an xor when the -X and +X sides of a revolve overlap (ie, angle > 180).  also, modify norm() to give the proper vector direction when the start/end surface is hit on a point with a -X coordinate.

Modified Paths:
--------------
    brlcad/trunk/src/librt/primitives/revolve/revolve.c
    brlcad/trunk/src/librt/primitives/sketch/sketch.c

Modified: brlcad/trunk/src/librt/primitives/revolve/revolve.c
===================================================================

--- brlcad/trunk/src/librt/primitives/revolve/revolve.c	2008-07-30 05:31:09 UTC (rev 32126)
+++ brlcad/trunk/src/librt/primitives/revolve/revolve.c	2008-07-30 06:21:54 UTC (rev 32127)
@@ -231,7 +231,7 @@
 
     vect_t	dir;
     point_t	hit1, hit2;
-    point2d_t	pt, pt2;
+    point2d_t	pt, pt2, dist;
     fastf_t	a, b, c, disc, k1, k2, t1, t2, x, y;
     fastf_t	xmin, xmax, ymin, ymax;
     long	*lng;
@@ -256,8 +256,6 @@
     VMOVE( ur, vr );
     VUNITIZE( ur );
 
-
-
     if ( rev->ang < 2*M_PI ) {
 	VREVERSE( normS, rev->yUnit );	/* start normal */
 	start = ( VDOT( normS, rev->v3d ) - VDOT( normS, rp->r_pt ) ) / VDOT( normS, rp->r_dir );
@@ -276,12 +274,18 @@
 	}
 	
 	if ( rt_sketch_contains( rev->sk, pt ) ) {
-	    if ( nhits >= MAX_HITS ) return -1; /* too many hits */
-	    hitp = hits[nhits++];
-	    hitp->hit_magic = RT_HIT_MAGIC;
-	    hitp->hit_dist = start;
-	    hitp->hit_surfno = START_FACE;
-	    VJOIN1( hitp->hit_vpriv, pr, hitp->hit_dist, vr );
+	    pt[X] = -pt[X];
+	    if ( ( angle + M_PI < rev->ang || angle - M_PI > 0 ) 
+			&& rt_sketch_contains( rev->sk, pt ) ) {
+		/* skip it */
+	    } else {
+		if ( nhits >= MAX_HITS ) return -1; /* too many hits */
+		hitp = hits[nhits++];
+		hitp->hit_magic = RT_HIT_MAGIC;
+		hitp->hit_dist = start;
+		hitp->hit_surfno = (pt[X]>0) ? -START_FACE : START_FACE;
+		VJOIN1( hitp->hit_vpriv, pr, hitp->hit_dist, vr );
+	    }
 	}
 	
 	VJOIN1( hit1, pr, end, vr );
@@ -295,16 +299,23 @@
 	}
 	
 	if ( rt_sketch_contains( rev->sk, pt ) ) {
-	    if ( nhits >= MAX_HITS ) return -1; /* too many hits */
-	    hitp = hits[nhits++];
-	    hitp->hit_magic = RT_HIT_MAGIC;
-	    hitp->hit_dist = end;
-	    hitp->hit_surfno = END_FACE;
-	    VJOIN1( hitp->hit_vpriv, pr, hitp->hit_dist, vr );
+	    pt[X] = -pt[X];
+	    if ( ( angle + M_PI < rev->ang || angle - M_PI > 0 ) 
+			&& rt_sketch_contains( rev->sk, pt ) ) {
+		/* skip it */
+	    } else {
+		if ( nhits >= MAX_HITS ) return -1; /* too many hits */
+		hitp = hits[nhits++];
+		hitp->hit_magic = RT_HIT_MAGIC;
+		hitp->hit_dist = end;
+		hitp->hit_surfno = (pt[X]>0) ? -END_FACE : END_FACE;
+		VJOIN1( hitp->hit_vpriv, pr, hitp->hit_dist, vr );
+	    }
 	}
     }
 
     /* calculate hyperbola parameters */
+    /*  [ (x*x) / aa^2 ] - [ (y-h)^2 / bb^2 ] = 1  */
     VREVERSE( dp, pr);
     VSET( norm, ur[X], ur[Y], 0 );
 
@@ -319,6 +330,7 @@
 	V2MOVE( pt, rev->sk->verts[rev->ends[i]] );
 	pt2[Y] = pt[Y];
 	pt2[X] = aa*sqrt( (pt2[Y]-h)*(pt2[Y]-h)/(bb*bb) + 1 );
+	if ( pt[X] < 0 ) pt2[X] = -fabs(pt2[X]);
 	if ( fabs( pt2[X] ) < fabs( pt[X] ) ) {	/* valid hit */
 	    if ( nhits >= MAX_HITS ) return -1; /* too many hits */
 	    hitp = hits[nhits++];
@@ -326,6 +338,9 @@
 	    hitp->hit_dist = (pt2[Y] - pr[Z]) / vr[Z];
 	    hitp->hit_surfno = LINE_SEG;
 	    VJOIN1( hitp->hit_vpriv, pr, hitp->hit_dist, vr );
+	    hitp->hit_point[X] = pt2[X];
+	    hitp->hit_point[Y] = pt2[Y];
+	    hitp->hit_point[Z] = 0;
 
 	    angle = atan2( hitp->hit_vpriv[Y], hitp->hit_vpriv[X] );
 	    if ( pt[X] < 0 ) {
@@ -333,9 +348,14 @@
 	    } else if ( angle < 0 ) {
 		angle += 2*M_PI;
 	    }
+	    pt2[X] = -pt2[X];
 	    if ( angle > rev->ang ) nhits--;
-
-	    hitp->hit_vpriv[Z] = MAX_FASTF; /* slope = 0, so 1/slope => inf */
+	    else if ( ( angle + M_PI < rev->ang || angle - M_PI > 0 ) 
+			&& rt_sketch_contains( rev->sk, pt2 )
+			&& pt2[X] > 0 ) {
+		nhits--;
+	    }
+	    hitp->hit_vpriv[Z] = MAX_FASTF;	/* slope = 0, so 1/slope = inf */
 	}
     }
 
@@ -374,13 +394,22 @@
 			    } else if ( angle < 0 ) {
 				angle += 2*M_PI;
 			    }
+			    pt2[X] = -pt2[X];
 			    if ( angle < rev->ang ) {
-				hitp = hits[nhits++];
-				VMOVE( hitp->hit_vpriv, hit1 );
-				hitp->hit_vpriv[Z] = (pt2[X]<0) ? 1.0/m : -1.0/m;
-				hitp->hit_magic = RT_HIT_MAGIC;
-				hitp->hit_dist = k1;
-				hitp->hit_surfno = LINE_SEG;
+				if ( ( angle + M_PI < rev->ang || angle - M_PI > 0 ) 
+					&& rt_sketch_contains( rev->sk, pt2 ) ) {
+				    /* overlap, so ignore it */
+				} else {
+				    hitp = hits[nhits++];
+				    hitp->hit_point[X] = -pt2[X];
+				    hitp->hit_point[Y] = pt2[Y];
+				    hitp->hit_point[Z] = 0;
+				    VMOVE( hitp->hit_vpriv, hit1 );
+				    hitp->hit_vpriv[Z] = (pt2[X]>0) ? 1.0/m : -1.0/m;
+				    hitp->hit_magic = RT_HIT_MAGIC;
+				    hitp->hit_dist = k1;
+				    hitp->hit_surfno = LINE_SEG;
+				}
 			    }
 			}
 			if ( t2 > 0 && t2 < 1 ) {
@@ -393,13 +422,22 @@
 			    } else if ( angle < 0 ) {
 				angle += 2*M_PI;
 			    }
+			    pt2[X] = -pt2[X];
 			    if ( angle < rev->ang ) {
-				hitp = hits[nhits++];
-				VMOVE( hitp->hit_vpriv, hit2 );
-				hitp->hit_vpriv[Z] = (pt2[X]<0) ? 1.0/m : -1.0/m;
-				hitp->hit_magic = RT_HIT_MAGIC;
-				hitp->hit_dist = k2;
-				hitp->hit_surfno = LINE_SEG;
+				if ( ( angle + M_PI < rev->ang || angle - M_PI > 0 ) 
+					&& rt_sketch_contains( rev->sk, pt2 ) ) {
+				    /* overlap, so ignore it */
+				} else {
+				    hitp = hits[nhits++];
+				    hitp->hit_point[X] = -pt2[X];
+				    hitp->hit_point[Y] = pt2[Y];
+				    hitp->hit_point[Z] = 0;
+				    VMOVE( hitp->hit_vpriv, hit2 );
+				    hitp->hit_vpriv[Z] = (pt2[X]>0) ? 1.0/m : -1.0/m;
+				    hitp->hit_magic = RT_HIT_MAGIC;
+				    hitp->hit_dist = k2;
+				    hitp->hit_surfno = LINE_SEG;
+				}
 			    }
 			}
 		    }
@@ -417,13 +455,22 @@
 			} else if ( angle < 0 ) {
 			    angle += 2*M_PI;
 			}
+			pt2[X] = -pt2[X];
 			if ( angle < rev->ang ) {
-			    hitp = hits[nhits++];
-			    VMOVE( hitp->hit_vpriv, hit1 );
-			    hitp->hit_vpriv[Z] = (pt2[X]<0) ? 1.0/m : -1.0/m;
-			    hitp->hit_magic = RT_HIT_MAGIC;
-			    hitp->hit_dist = k1;
-			    hitp->hit_surfno = LINE_SEG;
+			    if ( ( angle + M_PI < rev->ang || angle - M_PI > 0 ) 
+					&& rt_sketch_contains( rev->sk, pt2 ) ) {
+				/* overlap, so ignore it */
+			    } else {
+				hitp = hits[nhits++];
+				hitp->hit_point[X] = -pt2[X];
+				hitp->hit_point[Y] = pt2[Y];
+				hitp->hit_point[Z] = 0;
+				VMOVE( hitp->hit_vpriv, hit1 );
+				hitp->hit_vpriv[Z] = (pt2[X]>0) ? 1.0/m : -1.0/m;;
+				hitp->hit_magic = RT_HIT_MAGIC;
+				hitp->hit_dist = k1;
+				hitp->hit_surfno = LINE_SEG;
+			    }
 			}
 		    }
 		}
@@ -450,7 +497,8 @@
 	    } else if ( angle < 0 ) {
 		angle += 2*M_PI;
 	    }
-	    bu_log("\tangle:\t%5.2f\n", angle*RAD2DEG);
+	    bu_log("\tangle:\t%5.2f\t ( %6.2f, %6.2f )\t%6.2f\t%2d\n", angle*RAD2DEG, 
+		hits[i]->hit_point[X], hits[i]->hit_point[Y], hits[i]->hit_dist, hits[i]->hit_surfno );
 	}
 	return -1;
     }
@@ -492,7 +540,6 @@
 	hits[out] = NULL;
 	BU_LIST_INSERT( &(seghead->l), &(segp->l) );
     }
-/*    if ( nhits ) bu_log( "nhits: %d\n", nhits ); */
     return nhits;
 
 }
@@ -533,12 +580,16 @@
 	case START_FACE:
 	    VREVERSE( hitp->hit_normal, rev->yUnit );
 	    break;
+	case -START_FACE:
+	    VMOVE( hitp->hit_normal, rev->yUnit );
+	    break;
 	case END_FACE:
 	    VCROSS( hitp->hit_normal, rev->zUnit, rev->rEnd );
 	    VUNITIZE( hitp->hit_normal );
 	    break;
-	case -1:
-	    VREVERSE( hitp->hit_normal, rp->r_dir );
+	case -END_FACE:
+	    VCROSS( hitp->hit_normal, rev->rEnd, rev->zUnit );
+	    VUNITIZE( hitp->hit_normal );
 	    break;
 	default:
 	    VSET( n, hitp->hit_vpriv[X], hitp->hit_vpriv[Y], 0 );
@@ -634,7 +685,7 @@
 
     vect_t	ell[16], cir[16], ucir[16], height, xdir, ydir, ux, uy, uz, rEnd, xEnd, yEnd;
     fastf_t	cos22_5 = 0.9238795325112867385,
-	cos67_5 = 0.3826834323650898373;
+		cos67_5 = 0.3826834323650898373;
     int 	*endcount;
     point_t	add, add2, add3;
 

Modified: brlcad/trunk/src/librt/primitives/sketch/sketch.c
===================================================================
--- brlcad/trunk/src/librt/primitives/sketch/sketch.c	2008-07-30 05:31:09 UTC (rev 32126)
+++ brlcad/trunk/src/librt/primitives/sketch/sketch.c	2008-07-30 06:21:54 UTC (rev 32127)
@@ -283,7 +283,7 @@
 		lsg = (struct line_seg *)lng;
 		V2MOVE( pt1, sk->verts[lsg->start] );
 		V2MOVE( pt2, sk->verts[lsg->end] );
-		if ( pt[Y] > FMAX( pt1[Y], pt2[Y] ) || pt[Y] <= FMIN( pt1[Y], pt2[Y] ) ) {
+		if ( pt[Y] > FMAX( pt1[Y], pt2[Y] ) || pt[Y] < FMIN( pt1[Y], pt2[Y] ) ) {
 		    continue;
 		}
 		isec[X] = pt1[X] + (isec[Y] - pt1[Y]) * ( (pt1[X] - pt2[X]) / (pt1[Y] - pt2[Y]) );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [brlcad-commits] SF.net SVN: brlcad:[32127] brlcad/trunk/src/librt/primitives

Open Source Solid Modeling CAD

brlcad-commits